diff --git a/app/controllers/api/videos.php b/app/controllers/api/videos.php index 7ff7437291..47ac26f755 100644 --- a/app/controllers/api/videos.php +++ b/app/controllers/api/videos.php @@ -776,9 +776,9 @@ App::get('/v1/videos/:videoId/outputs/:output/renditions/:renditionId/streams/:s ->label('sdk.methodType', 'location') ->label('scope', 'videos.read') ->param('videoId', null, new UID(), 'Video unique ID.') - ->param('output', '', new WhiteList(['hls']), 'output name.') - ->param('renditionId', '', new UID(), 'Rendition unique ID.') - ->param('streamId', '', new Range(0, 10), 'Stream id.') + ->param('output', '', new WhiteList(['hls']), 'Output name.') + ->param('renditionId', null, new UID(), 'Rendition unique ID.') + ->param('streamId', '', new Range(0, 10), 'Stream ID.') ->inject('response') ->inject('dbForProject') ->inject('mode') @@ -852,14 +852,14 @@ App::get('/v1/videos/:videoId/outputs/:output/renditions/:renditionId/segments/: throw new Exception(Exception::VIDEO_RENDITION_SEGMENT_NOT_FOUND); } - $output = $deviceVideos->read($segment->getAttribute('path') . $segment->getAttribute('fileName')); + $data = $deviceVideos->read($segment->getAttribute('path') . $segment->getAttribute('fileName')); if ($output === 'hls') { $response->setContentType('video/MP2T') - ->send($output); + ->send($data); } else { $response->setContentType('video/iso.segment') - ->send($output); + ->send($data); } }); @@ -922,9 +922,9 @@ App::get('/v1/videos/:videoId/outputs/:output/subtitles/:subtitleId') $response->setContentType('application/x-mpegurl') ->send($template->render(false)); } else { - $output = $deviceVideos->read($deviceVideos->getPath($subtitle->getAttribute('videoId')) . '/' . $subtitle->getId() . '.vtt'); + $data = $deviceVideos->read($deviceVideos->getPath($subtitle->getAttribute('videoId')) . '/' . $subtitle->getId() . '.vtt'); $response->setContentType('text/vtt') - ->send($output); + ->send($data); } }); @@ -961,9 +961,9 @@ App::get('/v1/videos/:videoId/outputs/:output/subtitles/:subtitleId/segments/:se throw new Exception(Exception::VIDEO_SUBTITLE_SEGMENT_NOT_FOUND); } - $output = $deviceVideos->read($segment->getAttribute('path') . $segment->getAttribute('fileName')); + $data = $deviceVideos->read($segment->getAttribute('path') . $segment->getAttribute('fileName')); $response->setContentType('text/vtt') - ->send($output); + ->send($data); }); App::post('/v1/videos/profiles') diff --git a/app/init.php b/app/init.php index acd43713a6..ca3f06bc1e 100644 --- a/app/init.php +++ b/app/init.php @@ -889,7 +889,7 @@ App::setResource('project', function ($dbForConsole, $request, $console) { /** @var Utopia\Database\Document $console */ $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', 'console')); - //$projectId = '63f22d4b78b296b2d47d'; + //$projectId = '6408a2e6c8b85007caa1'; if ($projectId === 'console') { return $console; diff --git a/app/preload.php b/app/preload.php index a81f986637..82e1a69989 100644 --- a/app/preload.php +++ b/app/preload.php @@ -38,6 +38,7 @@ foreach ( realpath(__DIR__ . '/../vendor/utopia-php/cache'), realpath(__DIR__ . '/../vendor/alchemy'), realpath(__DIR__ . '/../vendor/php-ffmpeg'), + realpath(__DIR__ . '/../vendor/utopia-php/storage'), ] as $key => $value ) { if ($value !== false) { diff --git a/composer.lock b/composer.lock index 1681d84058..e2e198da3b 100644 --- a/composer.lock +++ b/composer.lock @@ -135,7 +135,7 @@ "source": { "type": "git", "url": "https://github.com/shimonewman/PHP-FFmpeg-video-streaming.git", - "reference": "a87c1648c7a967eb8f0e48450c0cbcaa8d3de52e" + "reference": "fc1c0f4c9ce9b2136e4180f0012002c38e032728" }, "require": { "php": "^7.2 || ^8.0", @@ -209,7 +209,7 @@ "video-streaming", "video-streaming" ], - "time": "2023-03-02T08:09:58+00:00" + "time": "2023-03-08T14:20:59+00:00" }, { "name": "appwrite/php-clamav", @@ -4444,16 +4444,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { @@ -4491,7 +4491,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -4499,7 +4499,7 @@ "type": "tidelift" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "nikic/php-parser",