| Index: media/filters/vpx_video_decoder.cc
|
| diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc
|
| index 73ffda13662a4b5fb2cac21aa5c87969aa34fc81..b60a8269374b699916cca9989c3e9cf2e5619217 100644
|
| --- a/media/filters/vpx_video_decoder.cc
|
| +++ b/media/filters/vpx_video_decoder.cc
|
| @@ -261,7 +261,7 @@ void VpxVideoDecoder::DecodeBuffer(
|
| DCHECK(buffer.get());
|
|
|
| // Transition to kDecodeFinished on the first end of stream buffer.
|
| - if (state_ == kNormal && buffer->IsEndOfStream()) {
|
| + if (state_ == kNormal && buffer->is_end_of_stream()) {
|
| state_ = kDecodeFinished;
|
| base::ResetAndReturn(&read_cb_).Run(kOk, VideoFrame::CreateEmptyFrame());
|
| return;
|
| @@ -275,9 +275,9 @@ void VpxVideoDecoder::DecodeBuffer(
|
| }
|
|
|
| // Any successful decode counts!
|
| - if (buffer->GetDataSize() && buffer->GetSideDataSize()) {
|
| + if (buffer->get_data_size() && buffer->get_side_data_size()) {
|
| PipelineStatistics statistics;
|
| - statistics.video_bytes_decoded = buffer->GetDataSize();
|
| + statistics.video_bytes_decoded = buffer->get_data_size();
|
| statistics_cb_.Run(statistics);
|
| }
|
|
|
| @@ -294,14 +294,14 @@ bool VpxVideoDecoder::Decode(
|
| const scoped_refptr<DecoderBuffer>& buffer,
|
| scoped_refptr<VideoFrame>* video_frame) {
|
| DCHECK(video_frame);
|
| - DCHECK(!buffer->IsEndOfStream());
|
| + DCHECK(!buffer->is_end_of_stream());
|
|
|
| // Pass |buffer| to libvpx.
|
| - int64 timestamp = buffer->GetTimestamp().InMicroseconds();
|
| + int64 timestamp = buffer->get_timestamp().InMicroseconds();
|
| void* user_priv = reinterpret_cast<void*>(×tamp);
|
| vpx_codec_err_t status = vpx_codec_decode(vpx_codec_,
|
| - buffer->GetData(),
|
| - buffer->GetDataSize(),
|
| + buffer->get_data(),
|
| + buffer->get_data_size(),
|
| user_priv,
|
| 0);
|
| if (status != VPX_CODEC_OK) {
|
| @@ -323,18 +323,18 @@ bool VpxVideoDecoder::Decode(
|
| }
|
|
|
| const vpx_image_t* vpx_image_alpha = NULL;
|
| - if (vpx_codec_alpha_ && buffer->GetSideDataSize() >= 8) {
|
| + if (vpx_codec_alpha_ && buffer->get_side_data_size() >= 8) {
|
| // Pass alpha data to libvpx.
|
| - int64 timestamp_alpha = buffer->GetTimestamp().InMicroseconds();
|
| + int64 timestamp_alpha = buffer->get_timestamp().InMicroseconds();
|
| void* user_priv_alpha = reinterpret_cast<void*>(×tamp_alpha);
|
|
|
| // First 8 bytes of side data is side_data_id in big endian.
|
| const uint64 side_data_id = base::NetToHost64(
|
| - *(reinterpret_cast<const uint64*>(buffer->GetSideData())));
|
| + *(reinterpret_cast<const uint64*>(buffer->get_side_data())));
|
| if (side_data_id == 1) {
|
| status = vpx_codec_decode(vpx_codec_alpha_,
|
| - buffer->GetSideData() + 8,
|
| - buffer->GetSideDataSize() - 8,
|
| + buffer->get_side_data() + 8,
|
| + buffer->get_side_data_size() - 8,
|
| user_priv_alpha,
|
| 0);
|
|
|
|
|