diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-16 11:17:03 +0100 |
| commit | a02191e04bc25c4935f804f2c080ae28663d096d (patch) | |
| tree | 3cf38961650b5734763e473336009287244306ac /media/test | |
| parent | 8bad47e0f7d0c250a0443923cceb52f4a4abcd40 (diff) | |
| download | chromium_org-a02191e04bc25c4935f804f2c080ae28663d096d.tar.gz | |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
Diffstat (limited to 'media/test')
| -rw-r--r-- | media/test/data/README | 1 | ||||
| -rw-r--r-- | media/test/data/bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4 | bin | 0 -> 1251 bytes |
2 files changed, 1 insertions, 0 deletions
diff --git a/media/test/data/README b/media/test/data/README index 9d8ddf398c..9a26660254 100644 --- a/media/test/data/README +++ b/media/test/data/README @@ -39,6 +39,7 @@ bear-1280x720-a_frag-cenc.mp4 - A fragmented MP4 version of the audio track of b bear-1280x720-a_frag-cenc_clear-all.mp4 - Same as bear-1280x720-a_frag-cenc.mp4 but no fragments are encrypted. bear-1280x720-v_frag-cenc.mp4 - A fragmented MP4 version of the video track of bear-1280x720.mp4 encrypted (ISO CENC) using key ID [1] and key [2]. bear-1280x720-v_frag-cenc_clear-all.mp4 - Same as bear-1280x720-v_frag-cenc.mp4 but no fragments are encrypted. +bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4 - An invalid file similar to bear-1280x720-a_frag-cenc.mp4 but has no saiz and saio boxes. To save space, it has only one encrypted sample. bear-320x240-16x9-aspect-av_enc-av.webm - bear-320x240-16x9-aspect.webm with audio & video encrypted using key ID [1] and key [2] bear-320x240-av_enc-av.webm - bear-320x240.webm with audio & video encrypted using key ID [1] and key [2]. bear-320x240-av_enc-av_clear-1s.webm - Same as bear-320x240-av_enc-av.webm but with no frames in the first second encrypted. diff --git a/media/test/data/bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4 b/media/test/data/bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4 Binary files differnew file mode 100644 index 0000000000..fb38ace904 --- /dev/null +++ b/media/test/data/bear-1280x720-a_frag-cenc_missing-saiz-saio.mp4 |