Commit bf6f144e authored by Mark Harding's avatar Mark Harding

(fix): do not append with p for legacy support reasons

1 merge request!414WIP: New transcoder
Pipeline #102010565 passed with stages
in 7 minutes and 5 seconds
......@@ -25,5 +25,5 @@ class Webm_1080p extends AbstractTranscodeProfile
protected $proOnly = true;
/** @var string */
protected $storageName = '1080p.webm';
protected $storageName = '1080.webm';
}
......@@ -25,5 +25,5 @@ class Webm_360p extends AbstractTranscodeProfile
protected $proOnly = false;
/** @var string */
protected $storageName = '360p.webm';
protected $storageName = '360.webm';
}
......@@ -25,5 +25,5 @@ class Webm_720p extends AbstractTranscodeProfile
protected $proOnly = false;
/** @var string */
protected $storageName = '720p.webm';
protected $storageName = '720.webm';
}
......@@ -25,5 +25,5 @@ class X264_1080p extends AbstractTranscodeProfile
protected $proOnly = true;
/** @var string */
protected $storageName = '1080p.mp4';
protected $storageName = '1080.mp4';
}
......@@ -25,5 +25,5 @@ class X264_360p extends AbstractTranscodeProfile
protected $proOnly = false;
/** @var string */
protected $storageName = '360p.mp4';
protected $storageName = '360.mp4';
}
......@@ -25,5 +25,5 @@ class X264_720p extends AbstractTranscodeProfile
protected $proOnly = false;
/** @var string */
protected $storageName = '720p.mp4';
protected $storageName = '720.mp4';
}
......@@ -162,9 +162,9 @@ class ManagerSpec extends ObjectBehavior
$this->transcodeStorage->ls('123')
->shouldBeCalled()
->willReturn([
'/my-dir/123/360p.mp4',
'/my-dir/123/720p.mp4',
'/my-dir/123/360p.webm',
'/my-dir/123/360.mp4',
'/my-dir/123/720.mp4',
'/my-dir/123/360.webm',
]);
$transcodes = $this->getList([
......@@ -173,6 +173,6 @@ class ManagerSpec extends ObjectBehavior
]);
$transcodes->shouldHaveCount(3);
$transcodes[0]->getProfile()
->getStorageName('360p.mp4');
->getStorageName('360.mp4');
}
}
......@@ -133,10 +133,10 @@ class FFMpegExecutorSpec extends ObjectBehavior
$ffmpegVideo->save(Argument::that(function ($format) {
return $format->getKiloBitRate() === 500
&& $format->getAudioKiloBitrate() === 80;
}), '/tmp/fake-path-for-source-360p.mp4')
}), '/tmp/fake-path-for-source-360.mp4')
->shouldBeCalled();
$this->transcodeStorage->add($transcode, '/tmp/fake-path-for-source-360p.mp4')
$this->transcodeStorage->add($transcode, '/tmp/fake-path-for-source-360.mp4')
->shouldBeCalled();
$transcode->setStatus('completed')
......@@ -186,11 +186,11 @@ class FFMpegExecutorSpec extends ObjectBehavior
$ffmpegVideo->save(Argument::that(function ($format) {
return $format->getKiloBitRate() === 500
&& $format->getAudioKiloBitrate() === 80;
}), '/tmp/fake-path-for-source-360p.mp4')
}), '/tmp/fake-path-for-source-360.mp4')
->shouldBeCalled()
->willThrow(new \FFMpeg\Exception\RuntimeException());
$this->transcodeStorage->add($transcode, '/tmp/fake-path-for-source-360p.mp4')
$this->transcodeStorage->add($transcode, '/tmp/fake-path-for-source-360.mp4')
->shouldNotBeCalled();
$transcode->setStatus('failed')
......
Please register or to comment