Commit 68e89a94 authored by Jose Lopes's avatar Jose Lopes Committed by Commit Bot

media: Migrate InterbufferDistanceCB to repeating callback.

This is a repeating callback because SplitRange causes SourceBufferRange
to return a new instance of that same class, and both instances share
the callback:
* https://cs.chromium.org/chromium/src/media/filters/source_buffer_range.cc?rcl=e501b7156b763939111552df391c615761c3c1bf&l=273

This is part of the base::Callback migration.

Context: https://cs.chromium.org/chromium/src/docs/callback.md?rcl=9fcc3764aea8f97e9f6de4a9ee61d554e67edcda&l=40

Bug: 1007805
Change-Id: I9847d5ef4590bd86ec8b6c221884368d28181a6a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2080477
Commit-Queue: Jose Lopes <jabolopes@google.com>
Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatardanakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746726}
parent 3d1fc225
...@@ -17,15 +17,15 @@ SourceBufferRange::SourceBufferRange( ...@@ -17,15 +17,15 @@ SourceBufferRange::SourceBufferRange(
GapPolicy gap_policy, GapPolicy gap_policy,
const BufferQueue& new_buffers, const BufferQueue& new_buffers,
base::TimeDelta range_start_pts, base::TimeDelta range_start_pts,
const InterbufferDistanceCB& interbuffer_distance_cb) InterbufferDistanceCB interbuffer_distance_cb)
: gap_policy_(gap_policy), : gap_policy_(gap_policy),
next_buffer_index_(-1), next_buffer_index_(-1),
interbuffer_distance_cb_(interbuffer_distance_cb), interbuffer_distance_cb_(std::move(interbuffer_distance_cb)),
size_in_bytes_(0), size_in_bytes_(0),
range_start_pts_(range_start_pts), range_start_pts_(range_start_pts),
keyframe_map_index_base_(0) { keyframe_map_index_base_(0) {
DVLOG(3) << __func__; DVLOG(3) << __func__;
DCHECK(interbuffer_distance_cb); DCHECK(interbuffer_distance_cb_);
CHECK(!new_buffers.empty()); CHECK(!new_buffers.empty());
DCHECK(new_buffers.front()->is_key_frame()); DCHECK(new_buffers.front()->is_key_frame());
AppendBuffersToEnd(new_buffers, range_start_pts_); AppendBuffersToEnd(new_buffers, range_start_pts_);
......
...@@ -28,7 +28,7 @@ class MEDIA_EXPORT SourceBufferRange { ...@@ -28,7 +28,7 @@ class MEDIA_EXPORT SourceBufferRange {
// of which this range is a part. Used to estimate the duration of a buffer if // of which this range is a part. Used to estimate the duration of a buffer if
// its duration is not known, and in GetFudgeRoom() for determining whether a // its duration is not known, and in GetFudgeRoom() for determining whether a
// time or coded frame is close enough to be considered part of this range. // time or coded frame is close enough to be considered part of this range.
using InterbufferDistanceCB = base::Callback<base::TimeDelta()>; using InterbufferDistanceCB = base::RepeatingCallback<base::TimeDelta()>;
using BufferQueue = StreamParser::BufferQueue; using BufferQueue = StreamParser::BufferQueue;
...@@ -48,7 +48,7 @@ class MEDIA_EXPORT SourceBufferRange { ...@@ -48,7 +48,7 @@ class MEDIA_EXPORT SourceBufferRange {
SourceBufferRange(GapPolicy gap_policy, SourceBufferRange(GapPolicy gap_policy,
const BufferQueue& new_buffers, const BufferQueue& new_buffers,
base::TimeDelta range_start_pts, base::TimeDelta range_start_pts,
const InterbufferDistanceCB& interbuffer_distance_cb); InterbufferDistanceCB interbuffer_distance_cb);
~SourceBufferRange(); ~SourceBufferRange();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment