Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae

47 files changed, 14 insertions, 5 deletions

diff --git a/media/test/data/README b/media/test/data/README
index a7c3ce2149..6968d13d62 100644
--- a/media/test/data/README
+++ b/media/test/data/README
@@ -3,19 +3,21 @@
 // found in the LICENSE file.
 
 bear-320x240.webm - WebM encode of bear.1280x720.mp4 resized to 320x240.
+bear-320x240-video-only.webm - The video track of bear-320x240.webm.
+bear-320x240-audio-only.webm - The audio track of bear-320x240.webm.
 bear-vp9.webm - VP9 video only WebM file.
 bear-vp9-opus.webm - VP9 Video with Opus Audio.
 bear-vp8-webvtt.webm - WebM VP8 video with WebVTT subtitle track.
 bear-vp8a.webm - WebM VP8 video with alpha channel.
 bear-vp8a-odd-dimensions.webm - WebM VP8 video with alpha channel and odd dimensions.
 bear-opus.webm - Opus Audio only WebM file.
-bear-opus-end-trimming.webm - File to test end trimming. It has one byte 
-                              artificially added so that there is maximum 
-                              padding at the end. It is an Opus Audio only WebM 
+bear-opus-end-trimming.webm - File to test end trimming. It has one byte
+                              artificially added so that there is maximum
+                              padding at the end. It is an Opus Audio only WebM
                               file.
-no_streams.webm - Header, Info, & Tracks element from bear-320x240.webm slightly corrupted so it looks 
+no_streams.webm - Header, Info, & Tracks element from bear-320x240.webm slightly corrupted so it looks
                   like there are no tracks.
-nonzero-start-time.webm - Has the same headers as bear-320x240.webm but the first cluster of this file 
+nonzero-start-time.webm - Has the same headers as bear-320x240.webm but the first cluster of this file
                           is the second cluster of bear-320x240.webm. This creates the situation where
                           the media data doesn't start at time 0.
 bear-320x240-live.webm - bear-320x240.webm remuxed w/o a duration and using clusters with unknown sizes.
@@ -47,10 +49,17 @@ bear-320x240-av_enc-av.webm - bear-320x240.webm with audio & video encrypted usi
 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.
 bear-320x240-av_enc-av_clear-all.webm - Same as bear-320x240-av_enc-av.webm but with no frames encrypted.
 bear-640x360-av_enc-av.webm - bear-640x360.webm with audio & video encrypted using key ID [1] and key [2].
+bear-320x240-av_enc-v.webm - bear-320x240.webm with video track encrypted using key ID [1] and key [2].
+bear-320x240-av_enc-a.webm - bear-320x240.webm with audio track encrypted using key ID [1] and key [2].
+bear-320x240-v_enc-v.webm - bear-320x240-video-only.webm encrypted using key ID [1] and key [2].
+bear-320x240-v-vp9_enc-v.webm - bear-vp9.webm VP9 video only encrypted using key ID [1] and key [2].
 bear-640x360-a_frag-cenc.mp4 - A fragmented MP4 version of the audio track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2].
 bear-640x360-a_frag-cenc-key_rotation.mp4 - A fragmented MP4 version of the audio track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2] with key rotation [3].
 bear-640x360-v_frag-cenc.mp4 - A fragmented MP4 version of the video track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2].
 bear-640x360-v_frag-cenc-key_rotation.mp4 - A fragmented MP4 version of the video track of bear-640x360.mp4 encrypted (ISO CENC) using key ID [1] and key [2] with key rotation [3].
+bear-a_enc-a.webm - bear-320x240-audio-only.webm encrypted using key ID [1] and key [2].
+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].
+
 
 [1] 30313233343536373839303132333435
 [2] ebdd62f16814d27b68ef122afce4ae3c
diff --git a/media/test/data/audio-start-time-only.webm b/media/test/data/audio-start-time-only.webm
new file mode 100644
index 0000000000..f3088c85bf
--- /dev/null
+++ b/media/test/data/audio-start-time-only.webm
diff --git a/media/test/data/bear-320x240-av_enc-a.webm b/media/test/data/bear-320x240-av_enc-a.webm
new file mode 100644
index 0000000000..d228e537e2
--- /dev/null
+++ b/media/test/data/bear-320x240-av_enc-a.webm
diff --git a/media/test/data/bear-320x240-av_enc-v.webm b/media/test/data/bear-320x240-av_enc-v.webm
new file mode 100644
index 0000000000..0aa6c63e88
--- /dev/null
+++ b/media/test/data/bear-320x240-av_enc-v.webm
diff --git a/media/test/data/bear-320x240-v-vp9_enc-v.webm b/media/test/data/bear-320x240-v-vp9_enc-v.webm
new file mode 100644
index 0000000000..c8f00293ae
--- /dev/null
+++ b/media/test/data/bear-320x240-v-vp9_enc-v.webm
diff --git a/media/test/data/bear-320x240-v_enc-v.webm b/media/test/data/bear-320x240-v_enc-v.webm
new file mode 100644
index 0000000000..f12f9ac29c
--- /dev/null
+++ b/media/test/data/bear-320x240-v_enc-v.webm
diff --git a/media/test/data/bear-a_enc-a.webm b/media/test/data/bear-a_enc-a.webm
new file mode 100644
index 0000000000..4d87b8eb3b
--- /dev/null
+++ b/media/test/data/bear-a_enc-a.webm
diff --git a/media/test/data/bear-opus.webm b/media/test/data/bear-opus.webm
new file mode 100644
index 0000000000..c198148814
--- /dev/null
+++ b/media/test/data/bear-opus.webm
diff --git a/media/test/data/bear-vp9-odd-dimensions.webm b/media/test/data/bear-vp9-odd-dimensions.webm
new file mode 100644
index 0000000000..4d65a906fa
--- /dev/null
+++ b/media/test/data/bear-vp9-odd-dimensions.webm
diff --git a/media/test/data/bear.flac b/media/test/data/bear.flac
index 6b0286c186..1db13f9193 100644
--- a/media/test/data/bear.flac
+++ b/media/test/data/bear.flac
diff --git a/media/test/data/bear.mp4 b/media/test/data/bear.mp4
new file mode 100644
index 0000000000..3763b59336
--- /dev/null
+++ b/media/test/data/bear.mp4
diff --git a/media/test/data/bear.webm b/media/test/data/bear.webm
new file mode 100644
index 0000000000..422df3f9d3
--- /dev/null
+++ b/media/test/data/bear.webm
diff --git a/media/test/data/bear_192kHz.wav b/media/test/data/bear_192kHz.wav
new file mode 100644
index 0000000000..20cbb4a954
--- /dev/null
+++ b/media/test/data/bear_192kHz.wav
diff --git a/media/test/data/bear_3kHz.wav b/media/test/data/bear_3kHz.wav
new file mode 100644
index 0000000000..d8d798b6b8
--- /dev/null
+++ b/media/test/data/bear_3kHz.wav
diff --git a/media/test/data/bear_alaw.wav b/media/test/data/bear_alaw.wav
new file mode 100644
index 0000000000..ef0d3dc915
--- /dev/null
+++ b/media/test/data/bear_alaw.wav
diff --git a/media/test/data/bear_divx_mp3.avi b/media/test/data/bear_divx_mp3.avi
new file mode 100644
index 0000000000..c6e1a313aa
--- /dev/null
+++ b/media/test/data/bear_divx_mp3.avi
diff --git a/media/test/data/bear_gsm_ms.wav b/media/test/data/bear_gsm_ms.wav
new file mode 100644
index 0000000000..138e90b114
--- /dev/null
+++ b/media/test/data/bear_gsm_ms.wav
diff --git a/media/test/data/bear_h264_aac.3gp b/media/test/data/bear_h264_aac.3gp
new file mode 100644
index 0000000000..761166b474
--- /dev/null
+++ b/media/test/data/bear_h264_aac.3gp
diff --git a/media/test/data/bear_mpeg4_amrnb.3gp b/media/test/data/bear_mpeg4_amrnb.3gp
new file mode 100644
index 0000000000..ced825c49a
--- /dev/null
+++ b/media/test/data/bear_mpeg4_amrnb.3gp
diff --git a/media/test/data/bear_mpeg4_mp3.avi b/media/test/data/bear_mpeg4_mp3.avi
new file mode 100644
index 0000000000..5c5be3d16d
--- /dev/null
+++ b/media/test/data/bear_mpeg4_mp3.avi
diff --git a/media/test/data/bear_mpeg4asp_mp3.avi b/media/test/data/bear_mpeg4asp_mp3.avi
new file mode 100644
index 0000000000..3131e2d3da
--- /dev/null
+++ b/media/test/data/bear_mpeg4asp_mp3.avi
diff --git a/media/test/data/bear_mulaw.wav b/media/test/data/bear_mulaw.wav
new file mode 100644
index 0000000000..3fd3607be5
--- /dev/null
+++ b/media/test/data/bear_mulaw.wav
diff --git a/media/test/data/bear_pcm.wav b/media/test/data/bear_pcm.wav
new file mode 100644
index 0000000000..1870eed0c5
--- /dev/null
+++ b/media/test/data/bear_pcm.wav
diff --git a/media/test/data/bear_pcm_s16be.mov b/media/test/data/bear_pcm_s16be.mov
new file mode 100644
index 0000000000..7076dd88ae
--- /dev/null
+++ b/media/test/data/bear_pcm_s16be.mov
diff --git a/media/test/data/bear_pcm_s24be.mov b/media/test/data/bear_pcm_s24be.mov
new file mode 100644
index 0000000000..b82be8df90
--- /dev/null
+++ b/media/test/data/bear_pcm_s24be.mov
diff --git a/media/test/data/bear_rotate_0.mp4 b/media/test/data/bear_rotate_0.mp4
new file mode 100644
index 0000000000..e3fb262c1b
--- /dev/null
+++ b/media/test/data/bear_rotate_0.mp4
diff --git a/media/test/data/bear_rotate_180.mp4 b/media/test/data/bear_rotate_180.mp4
new file mode 100644
index 0000000000..ec16d2a6e1
--- /dev/null
+++ b/media/test/data/bear_rotate_180.mp4
diff --git a/media/test/data/bear_rotate_270.mp4 b/media/test/data/bear_rotate_270.mp4
new file mode 100644
index 0000000000..8b585b3182
--- /dev/null
+++ b/media/test/data/bear_rotate_270.mp4
diff --git a/media/test/data/bear_rotate_90.mp4 b/media/test/data/bear_rotate_90.mp4
new file mode 100644
index 0000000000..c9216545a0
--- /dev/null
+++ b/media/test/data/bear_rotate_90.mp4
diff --git a/media/test/data/bear_silent.mp4 b/media/test/data/bear_silent.mp4
new file mode 100644
index 0000000000..aaf0a9f1cb
--- /dev/null
+++ b/media/test/data/bear_silent.mp4
diff --git a/media/test/data/bear_silent.ogv b/media/test/data/bear_silent.ogv
new file mode 100644
index 0000000000..923331831f
--- /dev/null
+++ b/media/test/data/bear_silent.ogv
diff --git a/media/test/data/bear_silent.webm b/media/test/data/bear_silent.webm
new file mode 100644
index 0000000000..85bf7d8848
--- /dev/null
+++ b/media/test/data/bear_silent.webm
diff --git a/media/test/data/blackwhite.png b/media/test/data/blackwhite.png
new file mode 100644
index 0000000000..e7d08ace48
--- /dev/null
+++ b/media/test/data/blackwhite.png
diff --git a/media/test/data/blackwhite_yuv420p.avi b/media/test/data/blackwhite_yuv420p.avi
new file mode 100644
index 0000000000..14c6f8be18
--- /dev/null
+++ b/media/test/data/blackwhite_yuv420p.avi
diff --git a/media/test/data/blackwhite_yuv420p.mp4 b/media/test/data/blackwhite_yuv420p.mp4
new file mode 100644
index 0000000000..aa6a49dfef
--- /dev/null
+++ b/media/test/data/blackwhite_yuv420p.mp4
diff --git a/media/test/data/blackwhite_yuv420p.ogv b/media/test/data/blackwhite_yuv420p.ogv
new file mode 100644
index 0000000000..e2fae13f15
--- /dev/null
+++ b/media/test/data/blackwhite_yuv420p.ogv
diff --git a/media/test/data/blackwhite_yuv420p.webm b/media/test/data/blackwhite_yuv420p.webm
new file mode 100644
index 0000000000..9713cbb301
--- /dev/null
+++ b/media/test/data/blackwhite_yuv420p.webm
diff --git a/media/test/data/blackwhite_yuv422p.mp4 b/media/test/data/blackwhite_yuv422p.mp4
new file mode 100644
index 0000000000..5804d284fc
--- /dev/null
+++ b/media/test/data/blackwhite_yuv422p.mp4
diff --git a/media/test/data/blackwhite_yuv422p.ogv b/media/test/data/blackwhite_yuv422p.ogv
new file mode 100644
index 0000000000..73a4eac0ef
--- /dev/null
+++ b/media/test/data/blackwhite_yuv422p.ogv
diff --git a/media/test/data/blackwhite_yuv444p.mp4 b/media/test/data/blackwhite_yuv444p.mp4
new file mode 100644
index 0000000000..28dfb5b818
--- /dev/null
+++ b/media/test/data/blackwhite_yuv444p.mp4
diff --git a/media/test/data/blackwhite_yuv444p.ogv b/media/test/data/blackwhite_yuv444p.ogv
new file mode 100644
index 0000000000..ba8ee17a14
--- /dev/null
+++ b/media/test/data/blackwhite_yuv444p.ogv
diff --git a/media/test/data/blackwhite_yuv444p.webm b/media/test/data/blackwhite_yuv444p.webm
new file mode 100644
index 0000000000..4d86c5a0b9
--- /dev/null
+++ b/media/test/data/blackwhite_yuv444p.webm
diff --git a/media/test/data/blackwhite_yuvj420p.mp4 b/media/test/data/blackwhite_yuvj420p.mp4
new file mode 100644
index 0000000000..c250d6cf46
--- /dev/null
+++ b/media/test/data/blackwhite_yuvj420p.mp4
diff --git a/media/test/data/frame_size_change-av_enc-v.webm b/media/test/data/frame_size_change-av_enc-v.webm
new file mode 100644
index 0000000000..200be551b3
--- /dev/null
+++ b/media/test/data/frame_size_change-av_enc-v.webm
diff --git a/media/test/data/sfx-opus-441.webm b/media/test/data/sfx-opus-441.webm
new file mode 100644
index 0000000000..dfeabce929
--- /dev/null
+++ b/media/test/data/sfx-opus-441.webm
diff --git a/media/test/data/sync2.ogv b/media/test/data/sync2.ogv
new file mode 100644
index 0000000000..6b328a24de
--- /dev/null
+++ b/media/test/data/sync2.ogv
diff --git a/media/test/data/tulip2.webm b/media/test/data/tulip2.webm
new file mode 100644
index 0000000000..a2774f607d
--- /dev/null
+++ b/media/test/data/tulip2.webm