webrtc_m130/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

210 lines
7.9 KiB
C++
Raw Normal View History

/*
* 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 "media/engine/videodecodersoftwarefallbackwrapper.h"
#include "api/video_codecs/video_decoder.h"
Reland "Update internal video decoder factory to new interface" This reverts commit 267d84baf0597f89a3d1f66d323db754bc5d9239. Reason for reland: Fix the bug; decoder is not allowed to ever be null and we need to use a NullVideoDecoder that ignores calls instead. Original change's description: > Revert "Update internal video decoder factory to new interface" > > This reverts commit b2fc9b1b104240e68047901309deaee3e8b94bea. > > Reason for revert: Suspected to cause failures on Android bots on webrtc.fyi, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/21051 > > Original change's description: > > Update internal video decoder factory to new interface > > > > We want to move away from cricket::WebRtcVideoDecoderFactory and this CL > > updates the internal factory. Also, VideoDecoderSoftwareFallbackWrapper > > is updated to take a VideoDecoder as argument instead of a factory so it > > can be used with external SW decoders. > > > > Bug: webrtc:7925 > > Change-Id: Ie6dc6c24f8610a2129620c6e2b42e3cebb2ddef7 > > Reviewed-on: https://webrtc-review.googlesource.com/7301 > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20597} > > TBR=brandtr@webrtc.org,magjed@webrtc.org,andersc@webrtc.org > > Change-Id: I0a12c98fdc30f00d58c85ee7e088f50160d39724 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7925 > Reviewed-on: https://webrtc-review.googlesource.com/21420 > Reviewed-by: Christian Fremerey <chfremer@webrtc.org> > Commit-Queue: Christian Fremerey <chfremer@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20605} TBR=brandtr@webrtc.org,magjed@webrtc.org,andersc@webrtc.org,chfremer@webrtc.org,chfremer@google.com Change-Id: I6cf5794dc3fadfa86809a94da80b69dbb4c56f52 No-Try: true Bug: webrtc:7925 Reviewed-on: https://webrtc-review.googlesource.com/21541 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20623}
2017-11-09 13:43:42 +01:00
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/include/video_error_codes.h"
#include "rtc_base/checks.h"
#include "test/gtest.h"
namespace webrtc {
class VideoDecoderSoftwareFallbackWrapperTest : public ::testing::Test {
protected:
VideoDecoderSoftwareFallbackWrapperTest()
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
: fake_decoder_(new CountingFakeDecoder()),
Reland "Update internal video decoder factory to new interface" This reverts commit 267d84baf0597f89a3d1f66d323db754bc5d9239. Reason for reland: Fix the bug; decoder is not allowed to ever be null and we need to use a NullVideoDecoder that ignores calls instead. Original change's description: > Revert "Update internal video decoder factory to new interface" > > This reverts commit b2fc9b1b104240e68047901309deaee3e8b94bea. > > Reason for revert: Suspected to cause failures on Android bots on webrtc.fyi, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Android%20Tests%20%28dbg%29%20%28K%20Nexus5%29/builds/21051 > > Original change's description: > > Update internal video decoder factory to new interface > > > > We want to move away from cricket::WebRtcVideoDecoderFactory and this CL > > updates the internal factory. Also, VideoDecoderSoftwareFallbackWrapper > > is updated to take a VideoDecoder as argument instead of a factory so it > > can be used with external SW decoders. > > > > Bug: webrtc:7925 > > Change-Id: Ie6dc6c24f8610a2129620c6e2b42e3cebb2ddef7 > > Reviewed-on: https://webrtc-review.googlesource.com/7301 > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#20597} > > TBR=brandtr@webrtc.org,magjed@webrtc.org,andersc@webrtc.org > > Change-Id: I0a12c98fdc30f00d58c85ee7e088f50160d39724 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7925 > Reviewed-on: https://webrtc-review.googlesource.com/21420 > Reviewed-by: Christian Fremerey <chfremer@webrtc.org> > Commit-Queue: Christian Fremerey <chfremer@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20605} TBR=brandtr@webrtc.org,magjed@webrtc.org,andersc@webrtc.org,chfremer@webrtc.org,chfremer@google.com Change-Id: I6cf5794dc3fadfa86809a94da80b69dbb4c56f52 No-Try: true Bug: webrtc:7925 Reviewed-on: https://webrtc-review.googlesource.com/21541 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20623}
2017-11-09 13:43:42 +01:00
fallback_wrapper_(std::unique_ptr<VideoDecoder>(VP8Decoder::Create()),
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
std::unique_ptr<VideoDecoder>(fake_decoder_)) {}
class CountingFakeDecoder : public VideoDecoder {
public:
int32_t InitDecode(const VideoCodec* codec_settings,
int32_t number_of_cores) override {
++init_decode_count_;
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;
};
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
// |fake_decoder_| is owned and released by |fallback_wrapper_|.
CountingFakeDecoder* fake_decoder_;
VideoDecoderSoftwareFallbackWrapper fallback_wrapper_;
};
TEST_F(VideoDecoderSoftwareFallbackWrapperTest, InitializesDecoder) {
VideoCodec codec = {};
fallback_wrapper_.InitDecode(&codec, 2);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->init_decode_count_);
EncodedImage encoded_image;
encoded_image._frameType = kVideoFrameKey;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->init_decode_count_)
<< "Initialized decoder should not be reinitialized.";
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->decode_count_);
}
TEST_F(VideoDecoderSoftwareFallbackWrapperTest,
UsesFallbackDecoderAfterAnyInitDecodeFailure) {
VideoCodec codec = {};
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->init_decode_return_code_ =
WEBRTC_VIDEO_CODEC_UNINITIALIZED;
fallback_wrapper_.InitDecode(&codec, 2);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->init_decode_count_);
EncodedImage encoded_image;
encoded_image._frameType = kVideoFrameKey;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
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
// decoder.
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
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.
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_ = WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
EncodedImage encoded_image;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->decode_count_);
// Fail -> fake_decoder shouldn't be used anymore.
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->decode_count_)
<< "Decoder used even though fallback should be active.";
// Should be able to recover on a keyframe.
encoded_image._frameType = kVideoFrameKey;
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_ = WEBRTC_VIDEO_CODEC_OK;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(2, fake_decoder_->decode_count_)
<< "Wrapper did not try to decode a keyframe using registered decoder.";
encoded_image._frameType = kVideoFrameDelta;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(3, fake_decoder_->decode_count_)
<< "Decoder not used on future delta frames.";
}
TEST_F(VideoDecoderSoftwareFallbackWrapperTest, DoesNotFallbackOnEveryError) {
VideoCodec codec = {};
fallback_wrapper_.InitDecode(&codec, 2);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_ = WEBRTC_VIDEO_CODEC_ERROR;
EncodedImage encoded_image;
EXPECT_EQ(
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_,
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1));
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->decode_count_);
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(2, fake_decoder_->decode_count_)
<< "Decoder should be active even though previous decode failed.";
}
TEST_F(VideoDecoderSoftwareFallbackWrapperTest, ForwardsReleaseCall) {
VideoCodec codec = {};
fallback_wrapper_.InitDecode(&codec, 2);
fallback_wrapper_.Release();
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->release_count_);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_ = WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
EncodedImage encoded_image;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(1, fake_decoder_->release_count_)
<< "Decoder should not be released during fallback.";
fallback_wrapper_.Release();
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(2, fake_decoder_->release_count_);
}
// TODO(pbos): Fake a VP8 frame well enough to actually receive a callback from
// the software decoder.
TEST_F(VideoDecoderSoftwareFallbackWrapperTest,
ForwardsRegisterDecodeCompleteCallback) {
class FakeDecodedImageCallback : public DecodedImageCallback {
int32_t Decoded(VideoFrame& decodedImage) override { return 0; }
int32_t Decoded(
webrtc::VideoFrame& decodedImage, int64_t decode_time_ms) override {
RTC_NOTREACHED();
return -1;
}
void Decoded(webrtc::VideoFrame& decodedImage,
rtc::Optional<int32_t> decode_time_ms,
rtc::Optional<uint8_t> qp) override {
RTC_NOTREACHED();
}
} callback, callback2;
VideoCodec codec = {};
fallback_wrapper_.InitDecode(&codec, 2);
fallback_wrapper_.RegisterDecodeCompleteCallback(&callback);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(&callback, fake_decoder_->decode_complete_callback_);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_ = WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
EncodedImage encoded_image;
fallback_wrapper_.Decode(encoded_image, false, nullptr, nullptr, -1);
fallback_wrapper_.RegisterDecodeCompleteCallback(&callback2);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
EXPECT_EQ(&callback2, fake_decoder_->decode_complete_callback_);
}
TEST_F(VideoDecoderSoftwareFallbackWrapperTest,
ReportsFallbackImplementationName) {
VideoCodec codec = {};
fallback_wrapper_.InitDecode(&codec, 2);
Reland of Prepare for injectable SW decoders (patchset #1 id:1 of https://codereview.webrtc.org/3010953002/ ) Reason for revert: Fix bug introduced by keeping the allocated decoders in a map. Original issue's description: > Revert of Prepare for injectable SW decoders (patchset #3 id:40001 of https://codereview.webrtc.org/3009973002/ ) > > Reason for revert: > Tentative revert since it seems to cause problems in Chrome, MAC. > > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Tester/builds/42684 > > > > Original issue's description: > > Prepare for injectable SW decoders > > > > Pretty much mirrors the work done on the encoding side in CLs: > > > > "Clean up ownership of webrtc::VideoEncoder" > > https://codereview.webrtc.org/3007643002/ > > > > "Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder" > > https://codereview.webrtc.org/3007683002/ > > > > "WebRtcVideoEngine: Encapsulate logic for unifying internal and external video codecs" > > https://codereview.webrtc.org/3006713002/ > > > > BUG=webrtc:7925 > > > > Review-Url: https://codereview.webrtc.org/3009973002 > > Cr-Commit-Position: refs/heads/master@{#19641} > > Committed: https://chromium.googlesource.com/external/webrtc/+/084c55a63a2d9bdc71579458406d44f8bab9f454 > > TBR=magjed@webrtc.org,andersc@webrtc.org > # Not skipping CQ checks because original CL landed more than 1 days ago. > BUG=webrtc:7925 > > Review-Url: https://codereview.webrtc.org/3010953002 > Cr-Commit-Position: refs/heads/master@{#19647} > Committed: https://chromium.googlesource.com/external/webrtc/+/1f88531038c24c5ce3b0f4cfc682b970770a71f6 TBR=magjed@webrtc.org,perkj@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3005363002 Cr-Commit-Position: refs/heads/master@{#19782}
2017-09-11 11:50:51 -07:00
fake_decoder_->decode_return_code_ = WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
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