Prevent SourceBufferRange.waiting_for_keyframe_ from being lost on range merges.

Prevent SourceBufferRange.waiting_for_keyframe_ from being lost on range merges.


BUG=168682
TEST=SourceBufferStreamTest.OverlapSplitAndMergeWhileWaitingForMoreData


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175559

[scherkus (not reviewing), 2013-01-07 23:34:06]

lgtm w/ q

https://codereview.chromium.org/11785029/diff/1/media/filters/source_buffer_s...
File media/filters/source_buffer_stream.cc (right):

https://codereview.chromium.org/11785029/diff/1/media/filters/source_buffer_s...
media/filters/source_buffer_stream.cc:1502: if (range.next_buffer_index_ >= 0)
aside from not updating w_f_k_/n_k_t_, was there also a bug with
next_buffer_index_ potentially being -1? do we need a test for that too or
should it be a CHECK()?

[acolwell GONE FROM CHROMIUM, 2013-01-08 00:46:39]

https://codereview.chromium.org/11785029/diff/1/media/filters/source_buffer_s...
File media/filters/source_buffer_stream.cc (right):

https://codereview.chromium.org/11785029/diff/1/media/filters/source_buffer_s...
media/filters/source_buffer_stream.cc:1502: if (range.next_buffer_index_ >= 0)
On 2013/01/07 23:34:06, scherkus wrote:
> aside from not updating w_f_k_/n_k_t_, was there also a bug with
> next_buffer_index_ potentially being -1? do we need a test for that too or
> should it be a CHECK()?

The test exposes both problems. When waiting_for_keyframe_ is true the index was
negative. That is part of the reason why buffers were being returned out of
order when ranges were merged.

[commit-bot: I haz the power, 2013-01-08 00:48:22]

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

[commit-bot: I haz the power, 2013-01-08 02:08:52]

Retried try job too often on win_rel for step(s) browser_tests

[commit-bot: I haz the power, 2013-01-08 15:40:29]

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

[commit-bot: I haz the power, 2013-01-08 18:28:40]

Change committed as 175559