| Index: media/filters/gpu_video_decoder.cc
|
| diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
|
| index 31c550b3a1ed08dfe849c41970d7873f8a531bf3..10eaeea3713a0e5cb4c241a6c749d3b4b64065a3 100644
|
| --- a/media/filters/gpu_video_decoder.cc
|
| +++ b/media/filters/gpu_video_decoder.cc
|
| @@ -401,7 +401,7 @@ void GpuVideoDecoder::RequestBufferDecode(
|
| return;
|
| }
|
|
|
| - if (buffer->IsEndOfStream()) {
|
| + if (buffer->is_end_of_stream()) {
|
| if (state_ == kNormal) {
|
| state_ = kDrainingDecoder;
|
| vda_loop_proxy_->PostTask(FROM_HERE, base::Bind(
|
| @@ -413,12 +413,12 @@ void GpuVideoDecoder::RequestBufferDecode(
|
| if (!pending_reset_cb_.is_null())
|
| return;
|
|
|
| - size_t size = buffer->GetDataSize();
|
| + size_t size = buffer->get_data_size();
|
| SHMBuffer* shm_buffer = GetSHM(size);
|
| if (!shm_buffer)
|
| return;
|
|
|
| - memcpy(shm_buffer->shm->memory(), buffer->GetData(), size);
|
| + memcpy(shm_buffer->shm->memory(), buffer->get_data(), size);
|
| BitstreamBuffer bitstream_buffer(
|
| next_bitstream_buffer_id_, shm_buffer->shm->handle(), size);
|
| // Mask against 30 bits, to avoid (undefined) wraparound on signed integer.
|
| @@ -441,7 +441,7 @@ void GpuVideoDecoder::RequestBufferDecode(
|
| void GpuVideoDecoder::RecordBufferData(
|
| const BitstreamBuffer& bitstream_buffer, const DecoderBuffer& buffer) {
|
| input_buffer_data_.push_front(BufferData(
|
| - bitstream_buffer.id(), buffer.GetTimestamp(),
|
| + bitstream_buffer.id(), buffer.get_timestamp(),
|
| demuxer_stream_->video_decoder_config().visible_rect(),
|
| demuxer_stream_->video_decoder_config().natural_size()));
|
| // Why this value? Because why not. avformat.h:MAX_REORDER_DELAY is 16, but
|
| @@ -674,9 +674,9 @@ void GpuVideoDecoder::NotifyEndOfBitstreamBuffer(int32 id) {
|
|
|
| PutSHM(it->second.shm_buffer);
|
| const scoped_refptr<DecoderBuffer>& buffer = it->second.buffer;
|
| - if (buffer->GetDataSize()) {
|
| + if (buffer->get_data_size()) {
|
| PipelineStatistics statistics;
|
| - statistics.video_bytes_decoded = buffer->GetDataSize();
|
| + statistics.video_bytes_decoded = buffer->get_data_size();
|
| statistics_cb_.Run(statistics);
|
| }
|
| bitstream_buffers_in_decoder_.erase(it);
|
|
|