Skip to content
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Backend - Engine
Project overview
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
286
Merge Requests
38
CI / CD
Security & Compliance
Packages
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Backend - Engine
Commits
bf6f144e
Commit
bf6f144e
authored
1 hour ago
by
Mark Harding
Browse files
Options
Download
(fix): do not append with p for legacy support reasons
parent
dfd245ab
epic/transcoder-improvements
1 merge request
!414
WIP: New transcoder
Pipeline
#102010565
passed with stages
in 7 minutes and 5 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
14 deletions
+14
-14
Core/Media/Video/Transcoder/TranscodeProfiles/Webm_1080p.php
View file @
bf6f144e
...
...
@@ -25,5 +25,5 @@ class Webm_1080p extends AbstractTranscodeProfile
protected
$proOnly
=
true
;
/** @var string */
protected
$storageName
=
'1080
p
.webm'
;
protected
$storageName
=
'1080.webm'
;
}
This diff is collapsed.
Core/Media/Video/Transcoder/TranscodeProfiles/Webm_360p.php
View file @
bf6f144e
...
...
@@ -25,5 +25,5 @@ class Webm_360p extends AbstractTranscodeProfile
protected
$proOnly
=
false
;
/** @var string */
protected
$storageName
=
'360
p
.webm'
;
protected
$storageName
=
'360.webm'
;
}
This diff is collapsed.
Core/Media/Video/Transcoder/TranscodeProfiles/Webm_720p.php
View file @
bf6f144e
...
...
@@ -25,5 +25,5 @@ class Webm_720p extends AbstractTranscodeProfile
protected
$proOnly
=
false
;
/** @var string */
protected
$storageName
=
'720
p
.webm'
;
protected
$storageName
=
'720.webm'
;
}
This diff is collapsed.
Core/Media/Video/Transcoder/TranscodeProfiles/X264_1080p.php
View file @
bf6f144e
...
...
@@ -25,5 +25,5 @@ class X264_1080p extends AbstractTranscodeProfile
protected
$proOnly
=
true
;
/** @var string */
protected
$storageName
=
'1080
p
.mp4'
;
protected
$storageName
=
'1080.mp4'
;
}
This diff is collapsed.
Core/Media/Video/Transcoder/TranscodeProfiles/X264_360p.php
View file @
bf6f144e
...
...
@@ -25,5 +25,5 @@ class X264_360p extends AbstractTranscodeProfile
protected
$proOnly
=
false
;
/** @var string */
protected
$storageName
=
'360
p
.mp4'
;
protected
$storageName
=
'360.mp4'
;
}
This diff is collapsed.
Core/Media/Video/Transcoder/TranscodeProfiles/X264_720p.php
View file @
bf6f144e
...
...
@@ -25,5 +25,5 @@ class X264_720p extends AbstractTranscodeProfile
protected
$proOnly
=
false
;
/** @var string */
protected
$storageName
=
'720
p
.mp4'
;
protected
$storageName
=
'720.mp4'
;
}
This diff is collapsed.
Spec/Core/Media/Video/Transcoder/ManagerSpec.php
View file @
bf6f144e
...
...
@@ -162,9 +162,9 @@ class ManagerSpec extends ObjectBehavior
$this
->
transcodeStorage
->
ls
(
'123'
)
->
shouldBeCalled
()
->
willReturn
([
'/my-dir/123/360
p
.mp4'
,
'/my-dir/123/720
p
.mp4'
,
'/my-dir/123/360
p
.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
(
'360
p
.mp4'
);
->
getStorageName
(
'360.mp4'
);
}
}
This diff is collapsed.
Spec/Core/Media/Video/Transcoder/TranscodeExecutors/FFMpegExecutorSpec.php
View file @
bf6f144e
...
...
@@ -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-360
p
.mp4'
)
}),
'/tmp/fake-path-for-source-360.mp4'
)
->
shouldBeCalled
();
$this
->
transcodeStorage
->
add
(
$transcode
,
'/tmp/fake-path-for-source-360
p
.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-360
p
.mp4'
)
}),
'/tmp/fake-path-for-source-360.mp4'
)
->
shouldBeCalled
()
->
willThrow
(
new
\FFMpeg\Exception\RuntimeException
());
$this
->
transcodeStorage
->
add
(
$transcode
,
'/tmp/fake-path-for-source-360
p
.mp4'
)
$this
->
transcodeStorage
->
add
(
$transcode
,
'/tmp/fake-path-for-source-360.mp4'
)
->
shouldNotBeCalled
();
$transcode
->
setStatus
(
'failed'
)
...
...
This diff is collapsed.
Please
register
or
sign in
to comment