diff options
author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 02:40:44 +0000 |
---|---|---|
committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-03 02:40:44 +0000 |
commit | 3443659f16b0737d2a6dd53e12733a8b2707ea54 (patch) | |
tree | e2d3ea3f2ae0b80b8032451fd243c331e8f0e731 | |
parent | b0f82e114f07d95015f920819847905145e66ba1 (diff) | |
download | chromium_src-3443659f16b0737d2a6dd53e12733a8b2707ea54.zip chromium_src-3443659f16b0737d2a6dd53e12733a8b2707ea54.tar.gz chromium_src-3443659f16b0737d2a6dd53e12733a8b2707ea54.tar.bz2 |
Fix live bug & renable ChunkDemuxerTest.TestWebMFile_LiveAudioAndVideo
BUG=136438
Review URL: https://chromiumcodereview.appspot.com/10823156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149788 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | media/filters/chunk_demuxer_unittest.cc | 4 | ||||
-rw-r--r-- | media/webm/webm_cluster_parser.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc index 71ebe9a..938f2f1d 100644 --- a/media/filters/chunk_demuxer_unittest.cc +++ b/media/filters/chunk_demuxer_unittest.cc @@ -1213,9 +1213,7 @@ TEST_F(ChunkDemuxerTest, TestWebMFile_AudioAndVideo) { base::TimeDelta::FromMilliseconds(2744))); } -// TODO(acolwell): Fix bear-320x240-live.webm so that all clusters begin with -// keyframes and reenable test. (crbug.com/136438) -TEST_F(ChunkDemuxerTest, DISABLED_TestWebMFile_LiveAudioAndVideo) { +TEST_F(ChunkDemuxerTest, TestWebMFile_LiveAudioAndVideo) { struct BufferTimestamps buffer_timestamps[] = { {0, 0}, {33, 3}, diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc index 3db1a65..cb7501e 100644 --- a/media/webm/webm_cluster_parser.cc +++ b/media/webm/webm_cluster_parser.cc @@ -58,7 +58,7 @@ int WebMClusterParser::Parse(const uint8* buf, int size) { int result = parser_.Parse(buf, size); - if (result <= 0) { + if (result < 0) { cluster_ended_ = false; return result; } |