zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Update internal video decoder factory to new interface"

Browse Source 
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}
This commit is contained in:
Christian Fremerey
2017-11-08 23:26:44 +00:00
committed by Commit Bot
parent 4d4965fedb
commit 267d84baf0
8 changed files with 144 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
media/engine/videodecodersoftwarefallbackwrapper.h
View File

@ -23,9 +23,8 @@ namespace webrtc {
// hardware restrictions, such as max resolution.
class VideoDecoderSoftwareFallbackWrapper : public VideoDecoder {
public:
VideoDecoderSoftwareFallbackWrapper(
std::unique_ptr<VideoDecoder> sw_fallback_decoder,
std::unique_ptr<VideoDecoder> hw_decoder);
VideoDecoderSoftwareFallbackWrapper(VideoCodecType codec_type,
std::unique_ptr<VideoDecoder> decoder);
int32_t InitDecode(const VideoCodec* codec_settings,
int32_t number_of_cores) override;
@ -47,15 +46,14 @@ class VideoDecoderSoftwareFallbackWrapper : public VideoDecoder {
private:
bool InitFallbackDecoder();
// Determines if we are trying to use the HW or SW decoder.
bool use_hw_decoder_;
std::unique_ptr<VideoDecoder> hw_decoder_;
bool hw_decoder_initialized_;
const VideoCodecType codec_type_;
std::unique_ptr<VideoDecoder> decoder_;
bool decoder_initialized_;
VideoCodec codec_settings_;
int32_t number_of_cores_;
const std::unique_ptr<VideoDecoder> fallback_decoder_;
const std::string fallback_implementation_name_;
std::string fallback_implementation_name_;
std::unique_ptr<VideoDecoder> fallback_decoder_;
DecodedImageCallback* callback_;
};