summaryrefslogtreecommitdiffstats
path: root/media/test
diff options
context:
space:
mode:
authoracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 17:25:42 +0000
committeracolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 17:25:42 +0000
commitac8b8781632ff70b10f4bb83826158290d5accf9 (patch)
tree22ba919016b9b55ceed8d88cf2edf69c9854d0d1 /media/test
parenta8e72141bdee8251279cb47a7e55cb70ab878dd3 (diff)
downloadchromium_src-ac8b8781632ff70b10f4bb83826158290d5accf9.zip
chromium_src-ac8b8781632ff70b10f4bb83826158290d5accf9.tar.gz
chromium_src-ac8b8781632ff70b10f4bb83826158290d5accf9.tar.bz2
Remux bear-640x360.webm so it is a valid WebM file & update the ChunkDemuxer tests that rely on it.
FFmpeg generated the existing file with negative timestamps at the beginning which violates the WebM spec. 26ms had to be added to all the timestamps in the file to make it valid. This slightly shifted the file layout and cluster boundaries so ChunkDemuxer tests needed to be updated. BUG=122913 Review URL: https://chromiumcodereview.appspot.com/10861030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/test')
-rw-r--r--media/test/data/bear-640x360-manifest.js14
-rw-r--r--media/test/data/bear-640x360.webmbin146010 -> 145975 bytes
2 files changed, 7 insertions, 7 deletions
diff --git a/media/test/data/bear-640x360-manifest.js b/media/test/data/bear-640x360-manifest.js
index 9f34488..d7787b0 100644
--- a/media/test/data/bear-640x360-manifest.js
+++ b/media/test/data/bear-640x360-manifest.js
@@ -4,13 +4,13 @@
{
duration: 2.740000,
type: 'video/webm; codecs="vp8, vorbis"',
- init: { offset: 0, size: 4459},
+ init: { offset: 0, size: 4340},
media: [
- { offset: 4459, size: 50714, timecode: 0.000000 },
- { offset: 55173, size: 19021, timecode: 0.477000 },
- { offset: 74194, size: 19810, timecode: 0.988000 },
- { offset: 94004, size: 21706, timecode: 1.496000 },
- { offset: 115710, size: 20249, timecode: 1.990000 },
- { offset: 135959, size: 9946, timecode: 2.489000 },
+ { offset: 4340, size: 50950, timecode: 0.000000},
+ { offset: 55290, size: 18785, timecode: 0.527000},
+ { offset: 74075, size: 19810, timecode: 1.014000},
+ { offset: 93885, size: 21706, timecode: 1.522000},
+ { offset: 115591, size: 20249, timecode: 2.016000},
+ { offset: 135840, size: 9946, timecode: 2.515000},
]
}
diff --git a/media/test/data/bear-640x360.webm b/media/test/data/bear-640x360.webm
index 67b8a926..02ae36c 100644
--- a/media/test/data/bear-640x360.webm
+++ b/media/test/data/bear-640x360.webm
Binary files differ