Merge remote-tracking branch 'origin/__stream' into __stream

# Conflicts:
#	app/config/collections.php
#	app/controllers/api/video.php
#	app/init.php
#	app/workers/transcoding.php
#	composer.lock
#	src/Appwrite/Event/Transcoding.php
#	src/Appwrite/Utopia/Response.php
#	tests/e2e/Services/Video/VideoCustomServerTest.php
This commit is contained in:
shimon
2022-06-27 16:08:17 +03:00
2 changed files with 30 additions and 1 deletions
+29
View File
@@ -0,0 +1,29 @@
<?php
return [
[
'id' => 1,
'name' => '360p',
'videoBitrate' => 890, //video bitrate in Kbps
'audioBitrate' => 64, //audio bitrate in Kbps
'width' => 640, //width resolution in px
'height' => 360, //height resolution in px
],
[
'id' => 2,
'name' => '576p',
'videoBitrate' => 2538,
'audioBitrate' => 128,
'width' => 1024,
'height' => 576,
],
[
'id' => 3,
'name' => '720p',
'videoBitrate' => 3551,
'audioBitrate' => 128,
'width' => 1280,
'height' => 720,
],
];
+1 -1
View File
@@ -149,7 +149,7 @@ App::post('/v1/projects')
'orders' => $index['orders'],
]);
}
var_dump($key);
$dbForProject->createCollection($key, $attributes, $indexes);
}