| Index: media/formats/webm/webm_stream_parser.cc
|
| diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc
|
| index b978b96b4d64ed957e40655cdc5222ccd829aa16..5d43b51c6ffb3df49c33777c579b901d13df829c 100644
|
| --- a/media/formats/webm/webm_stream_parser.cc
|
| +++ b/media/formats/webm/webm_stream_parser.cc
|
| @@ -32,7 +32,7 @@ void WebMStreamParser::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);
|
| @@ -41,7 +41,7 @@ void WebMStreamParser::Init(
|
| DCHECK(!config_cb.is_null());
|
| DCHECK(!new_buffers_cb.is_null());
|
| DCHECK(!encrypted_media_init_data_cb.is_null());
|
| - DCHECK(!new_segment_cb.is_null());
|
| + DCHECK(!start_of_segment_cb.is_null());
|
| DCHECK(!end_of_segment_cb.is_null());
|
|
|
| ChangeState(kParsingHeaders);
|
| @@ -50,7 +50,7 @@ void WebMStreamParser::Init(
|
| new_buffers_cb_ = new_buffers_cb;
|
| ignore_text_tracks_ = ignore_text_tracks;
|
| 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;
|
| }
|
| @@ -159,7 +159,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
|
| return -1;
|
| }
|
| ChangeState(kParsingClusters);
|
| - new_segment_cb_.Run();
|
| + start_of_segment_cb_.Run();
|
| return 0;
|
| break;
|
| case kWebMIdSegment:
|
|
|