Fix ChunkDemuxer seeks that occur during a partially parsed cluster.

Fix ChunkDemuxer seeks that occur during a partially parsed cluster.


BUG=104160
TEST=ChunkDemuxerTest.TestSeekWhileParsingCluster, WebMParserTest.TestReset


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=115214

[scherkus (not reviewing), 2011-12-20 18:26:17]

LGTM w/ nits

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
File media/filters/chunk_demuxer_unittest.cc (right):

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
media/filters/chunk_demuxer_unittest.cc:203: EXPECT_CALL(*this,
OnRead(timestamp_in_ms));
alternatively I *think* you can declare a gmock matcher and do something like

MATCHER_P(HasTimestamp, timestamp_in_ms, "") {
  return !arg->IsEndOfStream() && arg->GetTimestamp().InMilliseconds() ==
timestamp_in_ms;
}

EXPECT_CALL(*this, ReadDone(HasTimestamp(timestamp_in_ms)));

http://code.google.com/p/googlemock/wiki/CheatSheet#Defining_Matchers

up to you whether you think it's worth it -- it'll amount to the same thing

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
media/filters/chunk_demuxer_unittest.cc:313: scoped_ptr<Cluster>
clusterA(cb.Finish());
clusterA -> cluster_a

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
media/filters/chunk_demuxer_unittest.cc:320: scoped_ptr<Cluster>
clusterB(cb.Finish());
ditto

[acolwell GONE FROM CHROMIUM, 2011-12-20 19:11:52]

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
File media/filters/chunk_demuxer_unittest.cc (right):

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
media/filters/chunk_demuxer_unittest.cc:203: EXPECT_CALL(*this,
OnRead(timestamp_in_ms));
On 2011/12/20 18:26:17, scherkus wrote:
> alternatively I *think* you can declare a gmock matcher and do something like
> 
> MATCHER_P(HasTimestamp, timestamp_in_ms, "") {
>   return !arg->IsEndOfStream() && arg->GetTimestamp().InMilliseconds() ==
> timestamp_in_ms;
> }
> 
> EXPECT_CALL(*this, ReadDone(HasTimestamp(timestamp_in_ms)));
> 
> http://code.google.com/p/googlemock/wiki/CheatSheet#Defining_Matchers
> 
> up to you whether you think it's worth it -- it'll amount to the same thing

Nice! Done.

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
media/filters/chunk_demuxer_unittest.cc:313: scoped_ptr<Cluster>
clusterA(cb.Finish());
On 2011/12/20 18:26:17, scherkus wrote:
> clusterA -> cluster_a

Done & fixed all other instances in this file.

http://codereview.chromium.org/9010001/diff/2001/media/filters/chunk_demuxer_...
media/filters/chunk_demuxer_unittest.cc:320: scoped_ptr<Cluster>
clusterB(cb.Finish());
On 2011/12/20 18:26:17, scherkus wrote:
> ditto
Done.

[commit-bot: I haz the power, 2011-12-20 20:59:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/acolwell@chromium.org/9010001/6001

[commit-bot: I haz the power, 2011-12-20 23:05:58]

Change committed as 115214