diff options
| author | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 11:55:57 +0000 |
|---|---|---|
| committer | ycheo@chromium.org <ycheo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-26 11:55:57 +0000 |
| commit | 2027ec49f14aa8c82d2a627e036e9613792aee51 (patch) | |
| tree | e316737c15d28c6d9c457440ed7af4375d9bdc0b /media | |
| parent | f0459cd955b3757492bdba7105dc5d53f7f44542 (diff) | |
| download | chromium_src-2027ec49f14aa8c82d2a627e036e9613792aee51.zip chromium_src-2027ec49f14aa8c82d2a627e036e9613792aee51.tar.gz chromium_src-2027ec49f14aa8c82d2a627e036e9613792aee51.tar.bz2 | |
Fix GetRemovalRange_Range fails on Windows.
BUG=297564
Review URL: https://codereview.chromium.org/24572002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/source_buffer_stream.cc | 2 | ||||
| -rw-r--r-- | media/filters/source_buffer_stream_unittest.cc | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc index 0f46f71..8a797de8 100644 --- a/media/filters/source_buffer_stream.cc +++ b/media/filters/source_buffer_stream.cc @@ -1702,6 +1702,8 @@ int SourceBufferRange::GetRemovalGOP( int bytes_removed = 0; KeyframeMap::iterator gop_itr = GetFirstKeyframeAt(start_timestamp, false); + if (gop_itr == keyframe_map_.end()) + return 0; int keyframe_index = gop_itr->second - keyframe_map_index_base_; BufferQueue::iterator buffer_itr = buffers_.begin() + keyframe_index; KeyframeMap::iterator gop_end = keyframe_map_.end(); diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc index 14bae31..d0d4df2 100644 --- a/media/filters/source_buffer_stream_unittest.cc +++ b/media/filters/source_buffer_stream_unittest.cc @@ -2594,13 +2594,7 @@ TEST_F(SourceBufferStreamTest, GetRemovalRange_BytesToFree) { EXPECT_EQ(18, bytes_removed); } -// Disabled as test fails on windows: http://crbug.com/297564 . -#if defined(OS_WIN) -#define MAYBE_GetRemovalRange_Range DISABLED_GetRemovalRange_Range -#else -#define MAYBE_GetRemovalRange_Range GetRemovalRange_Range -#endif -TEST_F(SourceBufferStreamTest, MAYBE_GetRemovalRange_Range) { +TEST_F(SourceBufferStreamTest, GetRemovalRange_Range) { // Append 2 GOPs starting at 300ms, 30ms apart. NewSegmentAppend("300K 330 360 390K 420 450"); |