diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 00:04:49 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 00:04:49 +0000 |
| commit | 63ce73bc5679131f67ff23b14194580d2529ad4c (patch) | |
| tree | 29d0ed9c79a7ed9e06abaeb4f999e130cc4ab80f /media/webm/webm_cluster_parser.cc | |
| parent | 0449da83470395a5f618ae14dfaadda48821dae4 (diff) | |
| download | chromium_src-63ce73bc5679131f67ff23b14194580d2529ad4c.zip chromium_src-63ce73bc5679131f67ff23b14194580d2529ad4c.tar.gz chromium_src-63ce73bc5679131f67ff23b14194580d2529ad4c.tar.bz2 | |
Revert 115214 (caused media_unittests failure in FFmpegGlueTest,
suspiciously immediately after the code modified in this test.)
Fix ChunkDemuxer seeks that occur during a partially parsed cluster.
BUG=104160
TEST=ChunkDemuxerTest.TestSeekWhileParsingCluster, WebMParserTest.TestReset
Review URL: http://codereview.chromium.org/9010001
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/8989041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm/webm_cluster_parser.cc')
| -rw-r--r-- | media/webm/webm_cluster_parser.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc index fc64176..fd716b2 100644 --- a/media/webm/webm_cluster_parser.cc +++ b/media/webm/webm_cluster_parser.cc @@ -33,14 +33,6 @@ WebMClusterParser::WebMClusterParser(int64 timecode_scale, WebMClusterParser::~WebMClusterParser() {} -void WebMClusterParser::Reset() { - audio_buffers_.clear(); - video_buffers_.clear(); - last_block_timecode_ = -1; - cluster_timecode_ = -1; - parser_.Reset(); -} - int WebMClusterParser::Parse(const uint8* buf, int size) { audio_buffers_.clear(); video_buffers_.clear(); |