Tighten up media::DecoderBuffer API contract for end of stream buffers (round 2).

media/filters/decrypting_audio_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 324 matching lines @@
   }
 
   pending_buffer_to_decode_ = buffer;
   state_ = kPendingDecode;
   DecodePendingBuffer();
 }
 
 void DecryptingAudioDecoder::DecodePendingBuffer() {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDecode) << state_;
+
+  int buffer_size = 0;
+  if (!pending_buffer_to_decode_->IsEndOfStream()) {
+    buffer_size = pending_buffer_to_decode_->GetDataSize();
+  }
+
   decryptor_->DecryptAndDecodeAudio(
       pending_buffer_to_decode_,
-      base::Bind(&DecryptingAudioDecoder::DeliverFrame, this,
-                 pending_buffer_to_decode_->GetDataSize()));
+      base::Bind(&DecryptingAudioDecoder::DeliverFrame, this, buffer_size));
 }
 
 void DecryptingAudioDecoder::DeliverFrame(
     int buffer_size,
     Decryptor::Status status,
     const Decryptor::AudioBuffers& frames) {
   // We need to force task post here because the AudioDecodeCB can be executed
   // synchronously in Reset(). Instead of using more complicated logic in
   // those function to fix it, why not force task post here to make everything
   // simple and clear?
@@ skipping 152 matching lines @@
 
 base::TimeDelta DecryptingAudioDecoder::NumberOfSamplesToDuration(
     int number_of_samples) const {
   DCHECK(samples_per_second_);
   return base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerSecond *
                                            number_of_samples /
                                            samples_per_second_);
 }
 
 }  // namespace media