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

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: Created 7 years, 5 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
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/decrypting_audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_audio_decoder.cc
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index 45d846ee1bebc897fc34467142c97fa56c6bc494..f516674a50ebcbaa8a61263b181c263e2f65faa4 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -310,8 +310,8 @@ void DecryptingAudioDecoder::DecryptAndDecodeBuffer(
// Initialize the |next_output_timestamp_| to be the timestamp of the first
// non-EOS buffer.
if (timestamp_helper_->base_timestamp() == kNoTimestamp() &&
- !buffer->IsEndOfStream()) {
- timestamp_helper_->SetBaseTimestamp(buffer->GetTimestamp());
+ !buffer->end_of_stream()) {
+ timestamp_helper_->SetBaseTimestamp(buffer->timestamp());
}
pending_buffer_to_decode_ = buffer;
@@ -324,8 +324,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(
@@ -392,7 +392,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, AudioBuffer::CreateEOSBuffer());
return;
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/decrypting_audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698