| Index: media/formats/mp4/mp4_stream_parser.cc
|
| diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc
|
| index 18698b36c4ab2426d00f1832743e7561df5eb8c1..d9a10aebb06969f616fb9f3c98736cca853ae64f 100644
|
| --- a/media/formats/mp4/mp4_stream_parser.cc
|
| +++ b/media/formats/mp4/mp4_stream_parser.cc
|
| @@ -47,7 +47,7 @@ void MP4StreamParser::Init(
|
| const NewBuffersCB& new_buffers_cb,
|
| bool /* ignore_text_tracks */,
|
| const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
|
| - const NewMediaSegmentCB& new_segment_cb,
|
| + const base::Closure& start_of_segment_cb,
|
| const base::Closure& end_of_segment_cb,
|
| const scoped_refptr<MediaLog>& media_log) {
|
| DCHECK_EQ(state_, kWaitingForInit);
|
| @@ -63,7 +63,7 @@ void MP4StreamParser::Init(
|
| config_cb_ = config_cb;
|
| new_buffers_cb_ = new_buffers_cb;
|
| encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
|
| - new_segment_cb_ = new_segment_cb;
|
| + start_of_segment_cb_ = start_of_segment_cb;
|
| end_of_segment_cb_ = end_of_segment_cb;
|
| media_log_ = media_log;
|
| }
|
| @@ -361,7 +361,7 @@ bool MP4StreamParser::ParseMoof(BoxReader* reader) {
|
| if (!moof.pssh.empty())
|
| OnEncryptedMediaInitData(moof.pssh);
|
|
|
| - new_segment_cb_.Run();
|
| + start_of_segment_cb_.Run();
|
| ChangeState(kWaitingForSampleData);
|
| return true;
|
| }
|
| @@ -409,7 +409,7 @@ bool MP4StreamParser::EnqueueSample(BufferQueue* audio_buffers,
|
|
|
| if (!runs_->IsRunValid()) {
|
| // Flush any buffers we've gotten in this chunk so that buffers don't
|
| - // cross NewSegment() calls
|
| + // cross |start_of_segment_cb_| calls
|
| *err = !SendAndFlushSamples(audio_buffers, video_buffers);
|
| if (*err)
|
| return false;
|
|
|