Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Unified Diff: media/filters/decrypting_audio_decoder.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: Fixed naming error that somehow got reverted" Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/decrypting_audio_decoder.cc
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index 297e03fd97e20bcc30c976be8e2dd2d40955a38c..8af0140d2b5ddbcb0a7cc73ece922f99f35c3273 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -311,9 +311,9 @@ void DecryptingAudioDecoder::DecryptAndDecodeBuffer(
// Initialize the |next_output_timestamp_| to be the timestamp of the first
// non-EOS buffer.
- if (output_timestamp_base_ == kNoTimestamp() && !buffer->IsEndOfStream()) {
+ if (output_timestamp_base_ == kNoTimestamp() && !buffer->end_of_stream()) {
DCHECK_EQ(total_samples_decoded_, 0);
- output_timestamp_base_ = buffer->GetTimestamp();
+ output_timestamp_base_ = buffer->timestamp();
}
pending_buffer_to_decode_ = buffer;
@@ -326,8 +326,8 @@ void DecryptingAudioDecoder::DecodePendingBuffer() {
DCHECK_EQ(state_, kPendingDecode) << state_;
int buffer_size = 0;
- if (!pending_buffer_to_decode_->IsEndOfStream()) {
- buffer_size = pending_buffer_to_decode_->GetDataSize();
+ if (!pending_buffer_to_decode_->end_of_stream()) {
+ buffer_size = pending_buffer_to_decode_->data_size();
}
decryptor_->DecryptAndDecodeAudio(
@@ -394,7 +394,7 @@ void DecryptingAudioDecoder::DeliverFrame(
if (status == Decryptor::kNeedMoreData) {
DVLOG(2) << "DeliverFrame() - kNeedMoreData";
- if (scoped_pending_buffer_to_decode->IsEndOfStream()) {
+ if (scoped_pending_buffer_to_decode->end_of_stream()) {
state_ = kDecodeFinished;
base::ResetAndReturn(&read_cb_).Run(kOk, DataBuffer::CreateEOSBuffer());
return;

Powered by Google App Engine
This is Rietveld 408576698