| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 bear-320x240.webm - WebM encode of bear.1280x720.mp4 resized to 320x240. | 5 bear-320x240.webm - WebM encode of bear.1280x720.mp4 resized to 320x240. | 
| 6 bear-320x240-video-only.webm - The video track of bear-320x240.webm. | 6 bear-320x240-video-only.webm - The video track of bear-320x240.webm. | 
| 7 bear-320x240-audio-only.webm - The audio track of bear-320x240.webm. | 7 bear-320x240-audio-only.webm - The audio track of bear-320x240.webm. | 
| 8 bear-vp9.webm - VP9 video only WebM file. | 8 bear-vp9.webm - VP9 video only WebM file. | 
| 9 bear-vp9-opus.webm - VP9 Video with Opus Audio. | 9 bear-vp9-opus.webm - VP9 Video with Opus Audio. | 
| 10 bear-vp8-webvtt.webm - WebM VP8 video with WebVTT subtitle track. | 10 bear-vp8-webvtt.webm - WebM VP8 video with WebVTT subtitle track. | 
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 83 bear-320x240-opus-av_enc-v.webm - bear-vp9-opus.webm with video track encrypted 
     using key ID [1] and key[2]. | 83 bear-320x240-opus-av_enc-v.webm - bear-vp9-opus.webm with video track encrypted 
     using key ID [1] and key[2]. | 
| 84 bear-640x360-a_frag-cenc.mp4 - A fragmented MP4 version of the audio track of be
     ar-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2]. | 84 bear-640x360-a_frag-cenc.mp4 - A fragmented MP4 version of the audio track of be
     ar-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2]. | 
| 85 bear-640x360-a_frag-cenc-key_rotation.mp4 - A fragmented MP4 version of the audi
     o track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2] wi
     th key rotation [3]. | 85 bear-640x360-a_frag-cenc-key_rotation.mp4 - A fragmented MP4 version of the audi
     o track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2] wi
     th key rotation [3]. | 
| 86 bear-640x360-v_frag-cenc.mp4 - A fragmented MP4 version of the video track of be
     ar-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2]  and with sampl
     e encryption auxiliary information in the beginning of mdat box. | 86 bear-640x360-v_frag-cenc.mp4 - A fragmented MP4 version of the video track of be
     ar-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2]  and with sampl
     e encryption auxiliary information in the beginning of mdat box. | 
| 87 bear-640x360-v_frag-cenc-senc.mp4 - Same as above, but with sample encryption in
     formation stored in SampleEncryption ('senc') box. | 87 bear-640x360-v_frag-cenc-senc.mp4 - Same as above, but with sample encryption in
     formation stored in SampleEncryption ('senc') box. | 
| 88 bear-640x360-v_frag-cenc-senc-no-saiz-saio.mp4 - Same as above, but without saiz
      and saio boxes. | 88 bear-640x360-v_frag-cenc-senc-no-saiz-saio.mp4 - Same as above, but without saiz
      and saio boxes. | 
| 89 bear-640x360-v_frag-cenc-key_rotation.mp4 - A fragmented MP4 version of the vide
     o track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2] wi
     th key rotation [3]. | 89 bear-640x360-v_frag-cenc-key_rotation.mp4 - A fragmented MP4 version of the vide
     o track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2] wi
     th key rotation [3]. | 
| 90 bear-a_enc-a.webm - bear-320x240-audio-only.webm encrypted using key ID [1] and 
     key [2]. | 90 bear-a_enc-a.webm - bear-320x240-audio-only.webm encrypted using key ID [1] and 
     key [2]. | 
| 91 frame_size_change-av_enc-v.webm - third_party/WebKit/LayoutTests/media/resources
     /frame_size_change.webm encrypted using key ID [1] and key [2]. | 91 frame_size_change-av_enc-v.webm - third_party/WebKit/LayoutTests/media/resources
     /frame_size_change.webm encrypted using key ID [1] and key [2]. | 
| 92 | 92 | 
|  | 93 bear-1280x720-hls.ts: produced using Apple's mediafilesegmenter tool with bear-1
     280x720.ts as input, with no encryption. | 
|  | 94   mediafilesegmenter -t 10 -start-segments-with-iframe -f 'output_clear/' bear-1
     280x720.ts | 
|  | 95 | 
|  | 96 bear-1280x720-hls-sample-aes.ts: produced using Apple's mediafilesegmenter tool 
     also with bear-1280x720.ts as input, but with SAMPLE_AES encryption. | 
|  | 97   (Additional TS packets were constructed manually and prepended to convey the e
     ncryption metadata, notably key id and IV). | 
|  | 98   mediafilesegmenter -S -P -k 'key_iv.bin' -t 10 -start-segments-with-iframe -f 
     'output/' bear-1280x720.ts | 
| 93 | 99 | 
| 94 [1] 30313233343536373839303132333435 | 100 [1] 30313233343536373839303132333435 | 
| 95 [2] ebdd62f16814d27b68ef122afce4ae3c | 101 [2] ebdd62f16814d27b68ef122afce4ae3c | 
| 96 [3] KeyIds and Keys are created by left rotating key ID [1] and key [2] using | 102 [3] KeyIds and Keys are created by left rotating key ID [1] and key [2] using | 
| 97     std::rotate for every new crypto period. This is only for testing. The | 103     std::rotate for every new crypto period. This is only for testing. The | 
| 98     actual key rotation algorithm is often much more complicated. | 104     actual key rotation algorithm is often much more complicated. | 
| 99 [4] http://www.webmproject.org/docs/webm-encryption/#46-subsample-encrypted-bloc
     k-format | 105 [4] http://www.webmproject.org/docs/webm-encryption/#46-subsample-encrypted-bloc
     k-format | 
| 100 | 106 | 
| 101 // Container Tests (additional containers derived from bear.ogv) | 107 // Container Tests (additional containers derived from bear.ogv) | 
| 102 bear.ac3    -- created using "avconv -i bear.ogv -f ac3 -b 192k bear.ac3". | 108 bear.ac3    -- created using "avconv -i bear.ogv -f ac3 -b 192k bear.ac3". | 
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 272 | 278 | 
| 273 // Multi-track WebM file | 279 // Multi-track WebM file | 
| 274 media/test/data/multitrack-3video-2audio.webm | 280 media/test/data/multitrack-3video-2audio.webm | 
| 275     //Generated using following commands: | 281     //Generated using following commands: | 
| 276     ffmpeg -f lavfi -i color=c=red:size=320x240 -t 5 -c:v libvpx red.webm | 282     ffmpeg -f lavfi -i color=c=red:size=320x240 -t 5 -c:v libvpx red.webm | 
| 277     ffmpeg -f lavfi -i color=c=green:size=320x240 -t 5 -c:v libvpx green.webm | 283     ffmpeg -f lavfi -i color=c=green:size=320x240 -t 5 -c:v libvpx green.webm | 
| 278     ffmpeg -f lavfi -i color=c=blue:size=160x120 -t 10 -c:v libvpx blue.webm | 284     ffmpeg -f lavfi -i color=c=blue:size=160x120 -t 10 -c:v libvpx blue.webm | 
| 279     ffmpeg -f lavfi -i "sine=frequency=300:sample_rate=48000" -t 10 -c:v libvpx 
     a300hz.webm | 285     ffmpeg -f lavfi -i "sine=frequency=300:sample_rate=48000" -t 10 -c:v libvpx 
     a300hz.webm | 
| 280     ffmpeg -f lavfi -i "sine=frequency=500:sample_rate=48000" -t 5 -c:v libvpx a
     500hz.webm | 286     ffmpeg -f lavfi -i "sine=frequency=500:sample_rate=48000" -t 5 -c:v libvpx a
     500hz.webm | 
| 281     ffmpeg -i red.webm -i green.webm -i blue.webm -i a300hz.webm -i a500hz.webm 
     -map 0 -map 1 -map 2 -map 3 -map 4  multitrack-3video-2audio.webm | 287     ffmpeg -i red.webm -i green.webm -i blue.webm -i a300hz.webm -i a500hz.webm 
     -map 0 -map 1 -map 2 -map 3 -map 4  multitrack-3video-2audio.webm | 
| OLD | NEW | 
|---|