Index: media/filters/decrypting_audio_decoder.cc |
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc |
index 8aee1411ef7336aef8e871da8fe917d2ee16680c..6074bed534f1b183d6ac3afaca53ae483220b7a8 100644 |
--- a/media/filters/decrypting_audio_decoder.cc |
+++ b/media/filters/decrypting_audio_decoder.cc |
@@ -96,7 +96,7 @@ void DecryptingAudioDecoder::Read(const ReadCB& read_cb) { |
// Return empty (end-of-stream) frames if decoding has finished. |
if (state_ == kDecodeFinished) { |
- base::ResetAndReturn(&read_cb_).Run(kOk, DataBuffer::CreateEOSBuffer()); |
+ base::ResetAndReturn(&read_cb_).Run(kOk, DataBuffer::create_eos_buffer()); |
return; |
} |
@@ -396,7 +396,7 @@ void DecryptingAudioDecoder::DeliverFrame( |
DVLOG(2) << "DeliverFrame() - kNeedMoreData"; |
if (scoped_pending_buffer_to_decode->IsEndOfStream()) { |
state_ = kDecodeFinished; |
- base::ResetAndReturn(&read_cb_).Run(kOk, DataBuffer::CreateEOSBuffer()); |
+ base::ResetAndReturn(&read_cb_).Run(kOk, DataBuffer::create_eos_buffer()); |
return; |
} |
@@ -458,20 +458,20 @@ void DecryptingAudioDecoder::EnqueueFrames( |
++iter) { |
scoped_refptr<DataBuffer>& frame = *iter; |
- DCHECK(!frame->IsEndOfStream()) << "EOS frame returned."; |
- DCHECK_GT(frame->GetDataSize(), 0) << "Empty frame returned."; |
+ DCHECK(!frame->is_end_of_stream()) << "EOS frame returned."; |
+ DCHECK_GT(frame->get_data_size(), 0) << "Empty frame returned."; |
base::TimeDelta cur_timestamp = output_timestamp_base_ + |
NumberOfSamplesToDuration(total_samples_decoded_); |
- if (IsOutOfSync(cur_timestamp, frame->GetTimestamp())) { |
+ if (IsOutOfSync(cur_timestamp, frame->get_timestamp())) { |
DVLOG(1) << "Timestamp returned by the decoder (" |
- << frame->GetTimestamp().InMilliseconds() << " ms)" |
+ << frame->get_timestamp().InMilliseconds() << " ms)" |
<< " does not match the input timestamp and number of samples" |
<< " decoded (" << cur_timestamp.InMilliseconds() << " ms)."; |
} |
- frame->SetTimestamp(cur_timestamp); |
+ frame->set_timestamp(cur_timestamp); |
- int frame_size = frame->GetDataSize(); |
+ int frame_size = frame->get_data_size(); |
DCHECK_EQ(frame_size % bytes_per_sample_, 0) << |
"Decoder didn't output full samples"; |
int samples_decoded = frame_size / bytes_per_sample_; |
@@ -480,7 +480,7 @@ void DecryptingAudioDecoder::EnqueueFrames( |
base::TimeDelta next_timestamp = output_timestamp_base_ + |
NumberOfSamplesToDuration(total_samples_decoded_); |
base::TimeDelta duration = next_timestamp - cur_timestamp; |
- frame->SetDuration(duration); |
+ frame->set_duration(duration); |
} |
} |