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

Rename SAMPLE-AES-CENC to SAMPLE-AES-CTR 

Per the definition in the latest specification:
https://storage.googleapis.com/wvdocs/Widevine_DRM_HLS.pdf

Change-Id: Ic9b222c72ca8fbc4ae011e6557f2c4daaad2e624
This commit is contained in:
KongQun Yang 2018-01-11 18:09:06 -08:00
parent d8e3ca344c
commit 84f1f96f05
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/app/test/testdata/bear-640x360-a-mp4-cenc-ad_cues-golden.m3u8 vendored
View File

@ -4,7 +4,7 @@
#EXT-X-TARGETDURATION:2 #EXT-X-TARGETDURATION:2
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="967@0" #EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="967@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CENC,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:0.998, #EXTINF:0.998,
#EXT-X-BYTERANGE:16279@1035 #EXT-X-BYTERANGE:16279@1035
output_audio.mp4 output_audio.mp4

2
packager/app/test/testdata/bear-640x360-a-mp4-cenc-golden.m3u8 vendored
View File

@ -4,7 +4,7 @@
#EXT-X-TARGETDURATION:2 #EXT-X-TARGETDURATION:2
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="967@0" #EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="967@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CENC,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:0.998, #EXTINF:0.998,
#EXT-X-BYTERANGE:16279@1035 #EXT-X-BYTERANGE:16279@1035
output_audio.mp4 output_audio.mp4

2
packager/app/test/testdata/bear-640x360-ec3-a-mp4-cenc-golden.m3u8 vendored
View File

@ -4,7 +4,7 @@
#EXT-X-TARGETDURATION:2 #EXT-X-TARGETDURATION:2
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="909@0" #EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="909@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CENC,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:1.010, #EXTINF:1.010,
#EXT-X-BYTERANGE:24460@977 #EXT-X-BYTERANGE:24460@977
output_audio.mp4 output_audio.mp4

2
packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8 vendored
View File

@ -4,7 +4,7 @@
#EXT-X-TARGETDURATION:2 #EXT-X-TARGETDURATION:2
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0" #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CENC,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:1.001, #EXTINF:1.001,
#EXT-X-BYTERANGE:93805@1159 #EXT-X-BYTERANGE:93805@1159
output_video.mp4 output_video.mp4

2
packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8 vendored
View File

@ -4,7 +4,7 @@
#EXT-X-TARGETDURATION:2 #EXT-X-TARGETDURATION:2
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0" #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CENC,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:1.001, #EXTINF:1.001,
#EXT-X-BYTERANGE:99313@1159 #EXT-X-BYTERANGE:99313@1159
output_video.mp4 output_video.mp4

2
packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8 vendored
View File

@ -4,7 +4,7 @@
#EXT-X-TARGETDURATION:2 #EXT-X-TARGETDURATION:2
#EXT-X-PLAYLIST-TYPE:VOD #EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0" #EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0"
#EXT-X-KEY:METHOD=SAMPLE-AES-CENC,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
#EXTINF:1.001, #EXTINF:1.001,
#EXT-X-BYTERANGE:99313@1159 #EXT-X-BYTERANGE:99313@1159
output_video.mp4 output_video.mp4

2
packager/hls/base/media_playlist.cc
View File

@ -212,7 +212,7 @@ std::string EncryptionInfoEntry::ToString() {
} else if (method_ == MediaPlaylist::EncryptionMethod::kAes128) { } else if (method_ == MediaPlaylist::EncryptionMethod::kAes128) {
method_attribute = "METHOD=AES-128"; method_attribute = "METHOD=AES-128";
} else if (method_ == MediaPlaylist::EncryptionMethod::kSampleAesCenc) { } else if (method_ == MediaPlaylist::EncryptionMethod::kSampleAesCenc) {
method_attribute = "METHOD=SAMPLE-AES-CENC"; method_attribute = "METHOD=SAMPLE-AES-CTR";
} else { } else {
DCHECK(method_ == MediaPlaylist::EncryptionMethod::kNone); DCHECK(method_ == MediaPlaylist::EncryptionMethod::kNone);
method_attribute = "METHOD=NONE"; method_attribute = "METHOD=NONE";

2
packager/hls/base/media_playlist_unittest.cc
View File

@ -525,7 +525,7 @@ TEST_F(MediaPlaylistMultiSegmentTest, SampleAesCenc) {
"test\n" "test\n"
"#EXT-X-TARGETDURATION:30\n" "#EXT-X-TARGETDURATION:30\n"
"#EXT-X-PLAYLIST-TYPE:VOD\n" "#EXT-X-PLAYLIST-TYPE:VOD\n"
"#EXT-X-KEY:METHOD=SAMPLE-AES-CENC," "#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,"
"URI=\"http://example.com\",IV=0x12345678,KEYFORMATVERSIONS=\"1/2/4\"," "URI=\"http://example.com\",IV=0x12345678,KEYFORMATVERSIONS=\"1/2/4\","
"KEYFORMAT=\"com.widevine\"\n" "KEYFORMAT=\"com.widevine\"\n"
"#EXTINF:10.000,\n" "#EXTINF:10.000,\n"