| Index: media/webm/webm_cluster_parser.cc
|
| diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
|
| index 41e193f88a1ab06f303ecbba461e52022191d78d..90a885859ef627aad725154ecdb07ca821824dc3 100644
|
| --- a/media/webm/webm_cluster_parser.cc
|
| +++ b/media/webm/webm_cluster_parser.cc
|
| @@ -323,7 +323,7 @@ bool WebMClusterParser::OnBlock(bool is_simple_block, int track_num,
|
| is_simple_block ? (flags & 0x80) != 0 : track->IsKeyframe(data, size);
|
|
|
| scoped_refptr<StreamParserBuffer> buffer =
|
| - StreamParserBuffer::CopyFrom(data, size, additional, additional_size,
|
| + StreamParserBuffer::copy_from(data, size, additional, additional_size,
|
| is_keyframe);
|
|
|
| // Every encrypted Block has a signal byte and IV prepended to it. Current
|
| @@ -339,12 +339,12 @@ bool WebMClusterParser::OnBlock(bool is_simple_block, int track_num,
|
| buffer->SetDecryptConfig(config.Pass());
|
| }
|
|
|
| - buffer->SetTimestamp(timestamp);
|
| + buffer->set_timestamp(timestamp);
|
| if (cluster_start_time_ == kNoTimestamp())
|
| cluster_start_time_ = timestamp;
|
|
|
| if (block_duration >= 0) {
|
| - buffer->SetDuration(base::TimeDelta::FromMicroseconds(
|
| + buffer->set_duration(base::TimeDelta::FromMicroseconds(
|
| block_duration * timecode_multiplier_));
|
| }
|
|
|
| @@ -361,10 +361,10 @@ WebMClusterParser::Track::~Track() {}
|
| bool WebMClusterParser::Track::AddBuffer(
|
| const scoped_refptr<StreamParserBuffer>& buffer) {
|
| DVLOG(2) << "AddBuffer() : " << track_num_
|
| - << " ts " << buffer->GetTimestamp().InSecondsF()
|
| - << " dur " << buffer->GetDuration().InSecondsF()
|
| + << " ts " << buffer->get_timestamp().InSecondsF()
|
| + << " dur " << buffer->get_duration().InSecondsF()
|
| << " kf " << buffer->IsKeyframe()
|
| - << " size " << buffer->GetDataSize();
|
| + << " size " << buffer->get_data_size();
|
|
|
| buffers_.push_back(buffer);
|
| return true;
|
|
|