267d84baf0
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}
91 lines
3.1 KiB
C++
91 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2016 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/internaldecoderfactory.h"
|
|
|
|
#include <utility>
|
|
|
|
#include "modules/video_coding/codecs/h264/include/h264.h"
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "modules/video_coding/codecs/vp9/include/vp9.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace cricket {
|
|
|
|
namespace {
|
|
|
|
// Video decoder class to be used for unknown codecs. Doesn't support decoding
|
|
// but logs messages to LS_ERROR.
|
|
class NullVideoDecoder : public webrtc::VideoDecoder {
|
|
public:
|
|
int32_t InitDecode(const webrtc::VideoCodec* codec_settings,
|
|
int32_t number_of_cores) override {
|
|
LOG(LS_ERROR) << "Can't initialize NullVideoDecoder.";
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
int32_t Decode(const webrtc::EncodedImage& input_image,
|
|
bool missing_frames,
|
|
const webrtc::RTPFragmentationHeader* fragmentation,
|
|
const webrtc::CodecSpecificInfo* codec_specific_info,
|
|
int64_t render_time_ms) override {
|
|
LOG(LS_ERROR) << "The NullVideoDecoder doesn't support decoding.";
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
int32_t RegisterDecodeCompleteCallback(
|
|
webrtc::DecodedImageCallback* callback) override {
|
|
LOG(LS_ERROR)
|
|
<< "Can't register decode complete callback on NullVideoDecoder.";
|
|
return WEBRTC_VIDEO_CODEC_OK;
|
|
}
|
|
|
|
int32_t Release() override { return WEBRTC_VIDEO_CODEC_OK; }
|
|
|
|
const char* ImplementationName() const override { return "NullVideoDecoder"; }
|
|
};
|
|
|
|
} // anonymous namespace
|
|
|
|
InternalDecoderFactory::InternalDecoderFactory() {}
|
|
|
|
InternalDecoderFactory::~InternalDecoderFactory() {}
|
|
|
|
// WebRtcVideoDecoderFactory implementation.
|
|
webrtc::VideoDecoder* InternalDecoderFactory::CreateVideoDecoder(
|
|
webrtc::VideoCodecType type) {
|
|
switch (type) {
|
|
case webrtc::kVideoCodecH264:
|
|
if (webrtc::H264Decoder::IsSupported())
|
|
return webrtc::H264Decoder::Create();
|
|
// This could happen in a software-fallback for a codec type only
|
|
// supported externally (e.g. H.264 on iOS or Android) or in current usage
|
|
// in WebRtcVideoEngine if the external decoder fails to be created.
|
|
LOG(LS_ERROR) << "Unable to create an H.264 decoder fallback. "
|
|
<< "Decoding of this stream will be broken.";
|
|
return new NullVideoDecoder();
|
|
case webrtc::kVideoCodecVP8:
|
|
return webrtc::VP8Decoder::Create();
|
|
case webrtc::kVideoCodecVP9:
|
|
RTC_DCHECK(webrtc::VP9Decoder::IsSupported());
|
|
return webrtc::VP9Decoder::Create();
|
|
default:
|
|
LOG(LS_ERROR) << "Creating NullVideoDecoder for unsupported codec.";
|
|
return new NullVideoDecoder();
|
|
}
|
|
}
|
|
|
|
void InternalDecoderFactory::DestroyVideoDecoder(
|
|
webrtc::VideoDecoder* decoder) {
|
|
delete decoder;
|
|
}
|
|
|
|
} // namespace cricket
|