Handle InitDecode and reset in fallback decoder.

webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/video_decoder.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
 #include "webrtc/modules/video_coding/include/video_error_codes.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 
 class VideoDecoderSoftwareFallbackWrapperTest : public ::testing::Test {
  protected:
   VideoDecoderSoftwareFallbackWrapperTest()
       : fallback_wrapper_(kVideoCodecVP8, &fake_decoder_) {}
 
   class CountingFakeDecoder : public VideoDecoder {
    public:
     int32_t InitDecode(const VideoCodec* codec_settings,
                        int32_t number_of_cores) override {
+      puts("CountingFakeDecoder::InitDecode");
       ++init_decode_count_;
-      return WEBRTC_VIDEO_CODEC_OK;
+      return init_decode_return_code_;
     }
 
     int32_t Decode(const EncodedImage& input_image,
                    bool missing_frames,
                    const RTPFragmentationHeader* fragmentation,
                    const CodecSpecificInfo* codec_specific_info,
                    int64_t render_time_ms) override {
       ++decode_count_;
       return decode_return_code_;
     }
 
     int32_t RegisterDecodeCompleteCallback(
         DecodedImageCallback* callback) override {
       decode_complete_callback_ = callback;
       return WEBRTC_VIDEO_CODEC_OK;
     }
 
     int32_t Release() override {
       ++release_count_;
       return WEBRTC_VIDEO_CODEC_OK;
     }
 
     const char* ImplementationName() const override {
       return "fake-decoder";
     }
 
     int init_decode_count_ = 0;
     int decode_count_ = 0;
+    int32_t init_decode_return_code_ = WEBRTC_VIDEO_CODEC_OK;
     int32_t decode_return_code_ = WEBRTC_VIDEO_CODEC_OK;
     DecodedImageCallback* decode_complete_callback_ = nullptr;
     int release_count_ = 0;
     int reset_count_ = 0;
   };
   CountingFakeDecoder fake_decoder_;
   VideoDecoderSoftwareFallbackWrapper fallback_wrapper_;
 };
 
 TEST_F(VideoDecoderSoftwareFallbackWrapperTest, InitializesDecoder) {
   VideoCodec codec = {};
   fallback_wrapper_.InitDecode(&codec, 2);
   EXPECT_EQ(1, fake_decoder_.init_decode_count_);
+
+  EncodedImage encoded_image;
+  encoded_image._frameType = kVideoFrameKey;
+  fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
+  EXPECT_EQ(1, fake_decoder_.init_decode_count_)
+      << "Initialized decoder should not be reinitialized.";
+  EXPECT_EQ(1, fake_decoder_.decode_count_);
 }
 
 TEST_F(VideoDecoderSoftwareFallbackWrapperTest,
+       UsesFallbackDecoderAfterOnInitDecodeFailure) {
+  VideoCodec codec = {};
+  fake_decoder_.init_decode_return_code_ = WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
+  fallback_wrapper_.InitDecode(&codec, 2);
+  EXPECT_EQ(1, fake_decoder_.init_decode_count_);
+
+  EncodedImage encoded_image;
+  encoded_image._frameType = kVideoFrameKey;
+  fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
+  EXPECT_EQ(2, fake_decoder_.init_decode_count_)
+      << "Should have attempted reinitializing the fallback decoder on "
+         "keyframe.";
+  // Unfortunately faking a VP8 frame is hard. Rely on no Decode -> using SW

[noahric, 2017/02/13 20:42:30]

Makes sense, just check the result of fallback_wrapper_.Decode.

+  // decoder.
+  EXPECT_EQ(0, fake_decoder_.decode_count_)
+      << "Decoder used even though no InitDecode had succeeded.";
+}
+
+TEST_F(VideoDecoderSoftwareFallbackWrapperTest,
        CanRecoverFromSoftwareFallback) {
   VideoCodec codec = {};
   fallback_wrapper_.InitDecode(&codec, 2);
   // Unfortunately faking a VP8 frame is hard. Rely on no Decode -> using SW
   // decoder.
   fake_decoder_.decode_return_code_ = WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
   EncodedImage encoded_image;
   fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
   EXPECT_EQ(1, fake_decoder_.decode_count_);
 
@@ skipping 84 matching lines @@
   EncodedImage encoded_image;
   fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
   // Hard coded expected value since libvpx is the software implementation name
   // for VP8. Change accordingly if the underlying implementation does.
   EXPECT_STREQ("libvpx (fallback from: fake-decoder)",
                fallback_wrapper_.ImplementationName());
   fallback_wrapper_.Release();
 }
 
 }  // namespace webrtc