diff --git a/packager/app/test/testdata/bear-640x360-a-mp4-cenc-ad_cues-golden.m3u8 b/packager/app/test/testdata/bear-640x360-a-mp4-cenc-ad_cues-golden.m3u8 index 12f3f33190..7bf3defe68 100644 --- a/packager/app/test/testdata/bear-640x360-a-mp4-cenc-ad_cues-golden.m3u8 +++ b/packager/app/test/testdata/bear-640x360-a-mp4-cenc-ad_cues-golden.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #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, #EXT-X-BYTERANGE:16279@1035 output_audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-a-mp4-cenc-golden.m3u8 b/packager/app/test/testdata/bear-640x360-a-mp4-cenc-golden.m3u8 index ec19ad620b..a1b9dcb25b 100644 --- a/packager/app/test/testdata/bear-640x360-a-mp4-cenc-golden.m3u8 +++ b/packager/app/test/testdata/bear-640x360-a-mp4-cenc-golden.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #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, #EXT-X-BYTERANGE:16279@1035 output_audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-ec3-a-mp4-cenc-golden.m3u8 b/packager/app/test/testdata/bear-640x360-ec3-a-mp4-cenc-golden.m3u8 index 5fbfd3b795..031fab01da 100644 --- a/packager/app/test/testdata/bear-640x360-ec3-a-mp4-cenc-golden.m3u8 +++ b/packager/app/test/testdata/bear-640x360-ec3-a-mp4-cenc-golden.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #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, #EXT-X-BYTERANGE:24460@977 output_audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8 b/packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8 index 291c18376f..cdf5fa0ee4 100644 --- a/packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8 +++ b/packager/app/test/testdata/bear-640x360-ec3-v-mp4-cenc-golden.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #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, #EXT-X-BYTERANGE:93805@1159 output_video.mp4 diff --git a/packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8 b/packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8 index 1efedb9889..99442c7fdd 100644 --- a/packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8 +++ b/packager/app/test/testdata/bear-640x360-v-mp4-cenc-ad_cues-golden.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #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, #EXT-X-BYTERANGE:99313@1159 output_video.mp4 diff --git a/packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8 b/packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8 index ac1d7d58d8..2cfe6ed71d 100644 --- a/packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8 +++ b/packager/app/test/testdata/bear-640x360-v-mp4-cenc-golden.m3u8 @@ -4,7 +4,7 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #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, #EXT-X-BYTERANGE:99313@1159 output_video.mp4 diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc index e5d4644de6..11698dc8dc 100644 --- a/packager/hls/base/media_playlist.cc +++ b/packager/hls/base/media_playlist.cc @@ -212,7 +212,7 @@ std::string EncryptionInfoEntry::ToString() { } else if (method_ == MediaPlaylist::EncryptionMethod::kAes128) { method_attribute = "METHOD=AES-128"; } else if (method_ == MediaPlaylist::EncryptionMethod::kSampleAesCenc) { - method_attribute = "METHOD=SAMPLE-AES-CENC"; + method_attribute = "METHOD=SAMPLE-AES-CTR"; } else { DCHECK(method_ == MediaPlaylist::EncryptionMethod::kNone); method_attribute = "METHOD=NONE"; diff --git a/packager/hls/base/media_playlist_unittest.cc b/packager/hls/base/media_playlist_unittest.cc index 0a8be8ee09..eff9ebd33a 100644 --- a/packager/hls/base/media_playlist_unittest.cc +++ b/packager/hls/base/media_playlist_unittest.cc @@ -525,7 +525,7 @@ TEST_F(MediaPlaylistMultiSegmentTest, SampleAesCenc) { "test\n" "#EXT-X-TARGETDURATION:30\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\"," "KEYFORMAT=\"com.widevine\"\n" "#EXTINF:10.000,\n"