Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Issue 10704142: Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime. (Closed)

Created:
8 years, 5 months ago by Ami GONE FROM CHROMIUM
Modified:
8 years, 5 months ago
Reviewers:
CC:
chromium-reviews, feature-media-reviews_chromium.org, pam+watch_chromium.org
Visibility:
Public.

Description

Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime. Avoids buffering bar disappearing/reappearing when the bytes are distributed unevenly throughout the media. THIS IS A MANUAL (not drover'd) MERGE. Due to preceding *unmerged* changes (esp r143106) to chunk_demuxer{,_unittest}.cc, the original CL doesn't apply cleanly to the 1180 branch. Instead these two files are omitted from the merge, and only enough bits are changed in chunk_demuxer.cc to allow compilation to proceed. Also, ranges.h needed IntersectionWith from the above unmerged CL added manually. BUG=133567, 131444 TBR=fischman@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=145966

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+146 lines, -6 lines) Patch
M media/base/data_source.h View 2 chunks +7 lines, -0 lines 0 comments Download
M media/base/demuxer_stream.h View 2 chunks +4 lines, -0 lines 0 comments Download
M media/base/mock_data_source_host.h View 1 chunk +2 lines, -0 lines 0 comments Download
M media/base/mock_demuxer_host.h View 1 chunk +2 lines, -0 lines 0 comments Download
M media/base/mock_filters.h View 1 chunk +1 line, -0 lines 0 comments Download
M media/base/pipeline.h View 2 chunks +3 lines, -0 lines 0 comments Download
M media/base/pipeline.cc View 2 chunks +12 lines, -0 lines 0 comments Download
M media/base/pipeline_unittest.cc View 2 chunks +13 lines, -0 lines 0 comments Download
M media/base/ranges.h View 5 chunks +41 lines, -1 line 0 comments Download
M media/filters/chunk_demuxer.cc View 2 chunks +7 lines, -0 lines 0 comments Download
M media/filters/dummy_demuxer.h View 1 chunk +1 line, -1 line 0 comments Download
M media/filters/dummy_demuxer.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M media/filters/ffmpeg_demuxer.h View 4 chunks +8 lines, -1 line 0 comments Download
M media/filters/ffmpeg_demuxer.cc View 5 chunks +37 lines, -3 lines 0 comments Download
M media/filters/ffmpeg_demuxer_unittest.cc View 1 chunk +1 line, -0 lines 0 comments Download
M media/media.gyp View 1 chunk +1 line, -0 lines 0 comments Download
M media/tools/seek_tester/seek_tester.cc View 1 chunk +2 lines, -0 lines 0 comments Download

Powered by Google App Engine
This is Rietveld 408576698