| Index: media/base/stream_parser_buffer.cc
|
| diff --git a/media/base/stream_parser_buffer.cc b/media/base/stream_parser_buffer.cc
|
| index 8df4fae7a4050e7b2becf77392a98eca83768d8b..19a967356472178705d7f4a92f8e970bbfd30ba7 100644
|
| --- a/media/base/stream_parser_buffer.cc
|
| +++ b/media/base/stream_parser_buffer.cc
|
| @@ -19,7 +19,7 @@ static scoped_refptr<StreamParserBuffer> CopyBuffer(
|
| buffer.data_size(),
|
| buffer.side_data(),
|
| buffer.side_data_size(),
|
| - buffer.IsKeyframe(),
|
| + buffer.is_keyframe(),
|
| buffer.type(),
|
| buffer.track_id());
|
| copied_buffer->SetDecodeTimestamp(buffer.GetDecodeTimestamp());
|
| @@ -77,8 +77,7 @@ StreamParserBuffer::StreamParserBuffer(const uint8* data, int data_size,
|
| const uint8* side_data,
|
| int side_data_size, bool is_keyframe,
|
| Type type, TrackId track_id)
|
| - : DecoderBuffer(data, data_size, side_data, side_data_size),
|
| - is_keyframe_(is_keyframe),
|
| + : DecoderBuffer(data, data_size, side_data, side_data_size, is_keyframe),
|
| decode_timestamp_(kNoDecodeTimestamp()),
|
| config_id_(kInvalidConfigId),
|
| type_(type),
|
| @@ -143,7 +142,7 @@ void StreamParserBuffer::ConvertToSpliceBuffer(
|
| SetDecodeTimestamp(first_splice_buffer->GetDecodeTimestamp());
|
| SetConfigId(first_splice_buffer->GetConfigId());
|
| set_timestamp(first_splice_buffer->timestamp());
|
| - is_keyframe_ = first_splice_buffer->IsKeyframe();
|
| + set_is_keyframe(first_splice_buffer->is_keyframe());
|
| type_ = first_splice_buffer->type();
|
| track_id_ = first_splice_buffer->track_id();
|
| set_splice_timestamp(overlapping_buffer->timestamp());
|
|
|