Add callback in VideoDecoder and AudioDecoder to return decoded frames.

media/filters/video_frame_stream_unittest.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 "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "media/base/gmock_callback_support.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "media/filters/decoder_stream.h"
 #include "media/filters/fake_demuxer_stream.h"
 #include "media/filters/fake_video_decoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Assign;
 using ::testing::Invoke;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::SaveArg;
 
 static const int kNumConfigs = 3;
 static const int kNumBuffersInOneConfig = 5;
 
 namespace media {
 
 struct VideoFrameStreamTestParams {
   VideoFrameStreamTestParams(bool is_encrypted,
-                             bool enable_get_decode_output,
                              int decoding_delay,
                              int parallel_decoding)
       : is_encrypted(is_encrypted),
-        enable_get_decode_output(enable_get_decode_output),
         decoding_delay(decoding_delay),
         parallel_decoding(parallel_decoding) {}
 
   bool is_encrypted;
-  bool enable_get_decode_output;
   int decoding_delay;
   int parallel_decoding;
 };
 
 class VideoFrameStreamTest
     : public testing::Test,
       public testing::WithParamInterface<VideoFrameStreamTestParams> {
  public:
   VideoFrameStreamTest()
       : demuxer_stream_(new FakeDemuxerStream(kNumConfigs,
                                               kNumBuffersInOneConfig,
                                               GetParam().is_encrypted)),
         decryptor_(new NiceMock<MockDecryptor>()),
         decoder_(new FakeVideoDecoder(GetParam().decoding_delay,
-                                      GetParam().enable_get_decode_output,
                                       GetParam().parallel_decoding)),
         is_initialized_(false),
         num_decoded_frames_(0),
         pending_initialize_(false),
         pending_read_(false),
         pending_reset_(false),
         pending_stop_(false),
         total_bytes_decoded_(0),
         has_no_key_(false) {
     ScopedVector<VideoDecoder> decoders;
@@ skipping 275 matching lines @@
   bool has_no_key_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoFrameStreamTest);
 };
 
 INSTANTIATE_TEST_CASE_P(
     Clear,
     VideoFrameStreamTest,
     ::testing::Values(
-        VideoFrameStreamTestParams(false, false, 0, 1),
-        VideoFrameStreamTestParams(false, false, 3, 1),
-        VideoFrameStreamTestParams(false, false, 7, 1)));
-INSTANTIATE_TEST_CASE_P(
-    Clear_GetDecodeOutput,
-    VideoFrameStreamTest,
-    ::testing::Values(
-        VideoFrameStreamTestParams(false, true, 0, 1),
-        VideoFrameStreamTestParams(false, true, 3, 1),
-        VideoFrameStreamTestParams(false, true, 7, 1)));
+        VideoFrameStreamTestParams(false, 0, 1),
+        VideoFrameStreamTestParams(false, 3, 1),
+        VideoFrameStreamTestParams(false, 7, 1)));

[xhwang, 2014/06/05 21:53:51]

Add a case where parallel_decoding > decoding_delay?

[Sergey Ulanov, 2014/06/06 22:49:41]

There are some below, line 360.

 INSTANTIATE_TEST_CASE_P(
     Encrypted,
     VideoFrameStreamTest,
     ::testing::Values(
-        VideoFrameStreamTestParams(true, false, 7, 1)));
-INSTANTIATE_TEST_CASE_P(
-    Encrypted_GetDecodeOutput,
-    VideoFrameStreamTest,
-    ::testing::Values(
-        VideoFrameStreamTestParams(true, true, 7, 1)));
+        VideoFrameStreamTestParams(true, 7, 1)));
 
 INSTANTIATE_TEST_CASE_P(
     Clear_Parallel,
     VideoFrameStreamTest,
     ::testing::Values(
-        VideoFrameStreamTestParams(false, false, 0, 3),
-        VideoFrameStreamTestParams(false, false, 2, 3)));
+        VideoFrameStreamTestParams(false, 0, 3),
+        VideoFrameStreamTestParams(false, 2, 3)));
 
 
 TEST_P(VideoFrameStreamTest, Initialization) {
   Initialize();
 }
 
 TEST_P(VideoFrameStreamTest, ReadOneFrame) {
   Initialize();
   Read();
 }
@@ skipping 313 matching lines @@
   // The error must surface from Read() as DECODE_ERROR.
   while (last_read_status_ == VideoFrameStream::OK) {
     ReadOneFrame();
     message_loop_.RunUntilIdle();
     EXPECT_FALSE(pending_read_);
   }
   EXPECT_EQ(VideoFrameStream::DECODE_ERROR, last_read_status_);
 }
 
 }  // namespace media