Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into cmake

This commit is contained in:
Cosmin Stejerean 2023-08-02 12:38:01 -07:00
parent cf8deae0a6 6d745460b6
commit 97cf7c0a5b
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd vendored
View File

@ -9,8 +9,8 @@
</ContentProtection> </ContentProtection>
<Representation id="0" bandwidth="820260" codecs="dvh1.05.01" mimeType="video/mp4" sar="1:1"> <Representation id="0" bandwidth="820260" codecs="dvh1.05.01" mimeType="video/mp4" sar="1:1">
<BaseURL>sparks_dovi_5-video.mp4</BaseURL> <BaseURL>sparks_dovi_5-video.mp4</BaseURL>
<SegmentBase indexRange="1366-1445" timescale="60000"> <SegmentBase indexRange="1370-1449" timescale="60000">
<Initialization range="0-1365"/> <Initialization range="0-1369"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>
</AdaptationSet> </AdaptationSet>

BIN
packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 vendored
View File

Binary file not shown.

4
packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 vendored
View File

@ -3,10 +3,10 @@
## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test> ## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>
#EXT-X-TARGETDURATION:3 #EXT-X-TARGETDURATION:3
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1366@0" #EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1370@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:2.002, #EXTINF:2.002,
#EXT-X-BYTERANGE:185521@1446 #EXT-X-BYTERANGE:185521@1450
sparks_dovi_5-video.mp4 sparks_dovi_5-video.mp4
#EXTINF:2.002, #EXTINF:2.002,
#EXT-X-BYTERANGE:197565 #EXT-X-BYTERANGE:197565

8
packager/app/test/testdata/dolby-vision-profile-8-with-encryption/output.mpd vendored
View File

@ -9,8 +9,8 @@
</ContentProtection> </ContentProtection>
<Representation id="0" bandwidth="818598" codecs="hvc1.2.4.L90.90" mimeType="video/mp4" sar="1:1"> <Representation id="0" bandwidth="818598" codecs="hvc1.2.4.L90.90" mimeType="video/mp4" sar="1:1">
<BaseURL>sparks_dovi_8-video.mp4</BaseURL> <BaseURL>sparks_dovi_8-video.mp4</BaseURL>
<SegmentBase indexRange="1366-1445" timescale="60000"> <SegmentBase indexRange="1370-1449" timescale="60000">
<Initialization range="0-1365"/> <Initialization range="0-1369"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>
</AdaptationSet> </AdaptationSet>
@ -21,8 +21,8 @@
</ContentProtection> </ContentProtection>
<Representation id="1" bandwidth="818598" codecs="dvh1.08.01" mimeType="video/mp4" sar="1:1"> <Representation id="1" bandwidth="818598" codecs="dvh1.08.01" mimeType="video/mp4" sar="1:1">
<BaseURL>sparks_dovi_8-video.mp4</BaseURL> <BaseURL>sparks_dovi_8-video.mp4</BaseURL>
<SegmentBase indexRange="1366-1445" timescale="60000"> <SegmentBase indexRange="1370-1449" timescale="60000">
<Initialization range="0-1365"/> <Initialization range="0-1369"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>
</AdaptationSet> </AdaptationSet>

BIN
packager/app/test/testdata/dolby-vision-profile-8-with-encryption/sparks_dovi_8-video.mp4 vendored
View File

Binary file not shown.

4
packager/app/test/testdata/dolby-vision-profile-8-with-encryption/stream_0.m3u8 vendored
View File

@ -3,10 +3,10 @@
## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test> ## Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>
#EXT-X-TARGETDURATION:3 #EXT-X-TARGETDURATION:3
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1366@0" #EXT-X-MAP:URI="sparks_dovi_8-video.mp4",BYTERANGE="1370@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:2.002, #EXTINF:2.002,
#EXT-X-BYTERANGE:172013@1446 #EXT-X-BYTERANGE:172013@1450
sparks_dovi_8-video.mp4 sparks_dovi_8-video.mp4
#EXTINF:2.002, #EXTINF:2.002,
#EXT-X-BYTERANGE:189474 #EXT-X-BYTERANGE:189474

1
packager/media/base/fourccs.h
View File

@ -45,6 +45,7 @@ enum FourCC : uint32_t {
FOURCC_dac3 = 0x64616333, FOURCC_dac3 = 0x64616333,
FOURCC_dac4 = 0x64616334, FOURCC_dac4 = 0x64616334,
FOURCC_dash = 0x64617368, FOURCC_dash = 0x64617368,
FOURCC_dby1 = 0x64627931,
FOURCC_ddts = 0x64647473, FOURCC_ddts = 0x64647473,
FOURCC_dec3 = 0x64656333, FOURCC_dec3 = 0x64656333,
FOURCC_dfLa = 0x64664c61, FOURCC_dfLa = 0x64664c61,

4
packager/media/formats/mp4/mp4_muxer.cc
View File

@ -227,6 +227,10 @@ Status MP4Muxer::DelayInitializeMuxer() {
->h26x_stream_format()); ->h26x_stream_format());
if (codec_fourcc != FOURCC_NULL) if (codec_fourcc != FOURCC_NULL)
ftyp->compatible_brands.push_back(codec_fourcc); ftyp->compatible_brands.push_back(codec_fourcc);
// https://professional.dolby.com/siteassets/content-creation/dolby-vision-for-content-creators/dolby_vision_bitstreams_within_the_iso_base_media_file_format_dec2017.pdf
if (streams()[0].get()->codec_string().find("dvh") != std::string::npos)
ftyp->compatible_brands.push_back(FOURCC_dby1);
} }
// CMAF allows only one track/stream per file. // CMAF allows only one track/stream per file.