RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: use guardExDirect for live photo 

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/602/head
Varun Patil 2023-04-20 13:20:46 -07:00
parent 9ae10a68f1
commit 01c82dfe1b
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Controller/VideoController.php
View File

@ -198,18 +198,16 @@ class VideoController extends GenericApiController
// Transcode video if allowed
if ($transcode && !$this->config->getSystemValue('memories.vod.disable', true)) {
try {
// If video path not given, write to temp file
if (!$liveVideoPath) {
$liveVideoPath = self::postFile($transcode, $blob)['path'];
}
// If video path not given, write to temp file
if (!$liveVideoPath) {
$liveVideoPath = self::postFile($transcode, $blob)['path'];
}
// If this is H.264 it won't get transcoded anyway
if ($liveVideoPath && 200 === $this->getUpstream($transcode, $liveVideoPath, 'max.mov')) {
exit;
}
} catch (\Exception $e) {
// Transcoding failed, just return the original video
// If this is H.264 it won't get transcoded anyway
if ($liveVideoPath) {
return Util::guardExDirect(function ($out) use ($transcode, $liveVideoPath) {
$this->getUpstream($transcode, $liveVideoPath, 'max.mov');
});
}
}
@ -310,7 +308,19 @@ class VideoController extends GenericApiController
*
* @param mixed $blob
*/
private static function postFile(string $client, $blob)
private static function postFile(string $client, $blob) {
try {
return self::postFileInternal($client, $blob);
} catch (\Exception $e) {
if (BinExt::startGoVod()) { // If the server is down, try to start it
return self::postFileInternal($client, $blob);
}
throw $e;
}
}
private static function postFileInternal(string $client, $blob)
{
$url = BinExt::getGoVodUrl($client, '/create', 'ignore');