Add callback in VideoDecoder and AudioDecoder to return decoded frames.

media/filters/opus_audio_decoder_unittest.cc

 // Copyright 2014 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 <deque>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "media/base/audio_buffer.h"
@@ skipping 39 matching lines @@
     reader_.reset(new AudioFileReader(protocol_.get()));
     reader_->Open();
 
     AudioDecoderConfig config;
     AVCodecContextToAudioDecoderConfig(
         reader_->codec_context_for_testing(), false, &config, false);
     InitializeDecoder(config);
   }
 
   void InitializeDecoder(const AudioDecoderConfig& config) {
-    decoder_->Initialize(config, NewExpectedStatusCB(PIPELINE_OK));
+    decoder_->Initialize(config,
+                         NewExpectedStatusCB(PIPELINE_OK),
+                         base::Bind(&OpusAudioDecoderTest::OnDecoderOutput,
+                                    base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
   }
 
   void Decode() {
     pending_decode_ = true;
 
     AVPacket packet;
     ASSERT_TRUE(reader_->ReadPacketForTesting(&packet));
     scoped_refptr<DecoderBuffer> buffer =
         DecoderBuffer::CopyFrom(packet.data, packet.size);
@@ skipping 13 matching lines @@
     decoder_->Reset(base::Bind(&OpusAudioDecoderTest::ResetFinished,
                                base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
   }
 
   void Stop() {
     decoder_->Stop();
     base::RunLoop().RunUntilIdle();
   }
 
-  void DecodeFinished(AudioDecoder::Status status,
-                      const scoped_refptr<AudioBuffer>& buffer) {
+  void OnDecoderOutput(const scoped_refptr<AudioBuffer>& buffer) {
+    decoded_audio_.push_back(buffer);
+  }
+
+  void DecodeFinished(AudioDecoder::Status status) {
     EXPECT_TRUE(pending_decode_);
     pending_decode_ = false;
 
-    if (status == AudioDecoder::kNotEnoughData) {
-      EXPECT_TRUE(buffer.get() == NULL);
-      Decode();
-      return;
-    }
-
-    decoded_audio_.push_back(buffer);
-
-    // If we hit a NULL buffer or have a pending reset, we expect an abort.
-    if (buffer.get() == NULL || pending_reset_) {
-      EXPECT_TRUE(buffer.get() == NULL);
+    // If we have a pending reset, we expect an abort.
+    if (pending_reset_) {
       EXPECT_EQ(status, AudioDecoder::kAborted);
       return;
     }
 
     EXPECT_EQ(status, AudioDecoder::kOk);
   }
 
   void ResetFinished() {
     EXPECT_TRUE(pending_reset_);
     // Reset should always finish after Decode.
@@ skipping 99 matching lines @@
 
 TEST_F(OpusAudioDecoderTest, PendingDecode_ResetStop) {
   Initialize();
   Decode();
   Reset();
   Stop();
   SatisfyPendingDecode();
 }
 
 }  // namespace media