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

Remove built-in sw codecs from decoder_database.

Browse Source 
All decoders are injectable, no need to create built-in codecs from
there.

Bug: webrtc:7925
Change-Id: Iabf3d59a8e4d721ad29386acbf138b7e5992ce5e
Reviewed-on: https://webrtc-review.googlesource.com/72441
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23397}
This commit is contained in:
Anders Carlsson
2018-05-24 13:31:30 +02:00
committed by Commit Bot
parent 55378f48b1
commit 51e23aed9e
5 changed files with 1 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/BUILD.gn
View File

@ -257,7 +257,6 @@ rtc_source_set("video_stream_decoder") {
# Delete after downstream users are updated.
rtc_source_set("video_stream_decoder_create") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
public_deps = [ # no-presubmit-check TODO(webrtc:8603)
"video:video_stream_decoder_create",

1
api/video/BUILD.gn
View File

@ -90,7 +90,6 @@ rtc_source_set("video_stream_decoder") {
rtc_source_set("video_stream_decoder_create") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
sources = [
"video_stream_decoder_create.cc",
"video_stream_decoder_create.h",

10
modules/video_coding/BUILD.gn
View File

@ -38,7 +38,6 @@ rtc_static_library("encoded_frame") {
rtc_static_library("video_coding") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
deps = []
sources = [
@ -119,20 +118,11 @@ rtc_static_library("video_coding") {
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
if (rtc_use_builtin_sw_codecs) {
deps += [
":webrtc_i420",
":webrtc_vp8",
":webrtc_vp9",
]
}
deps += [
":codec_globals_headers",
":encoded_frame",
":video_codec_interface",
":video_coding_utility",
":webrtc_h264",
":webrtc_vp8_helpers",
":webrtc_vp9_helpers",
"..:module_api",

38
modules/video_coding/decoder_database.cc
View File

@ -9,44 +9,11 @@
*/
#include "modules/video_coding/decoder_database.h"
#if defined(USE_BUILTIN_SW_CODECS)
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/i420/include/i420.h" // nogncheck
#include "modules/video_coding/codecs/vp8/include/vp8.h" // nogncheck
#include "modules/video_coding/codecs/vp9/include/vp9.h" // nogncheck
#endif
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
namespace webrtc {
#if defined(USE_BUILTIN_SW_CODECS)
// Create an internal Decoder given a codec type
static std::unique_ptr<VCMGenericDecoder> CreateDecoder(VideoCodecType type) {
switch (type) {
case kVideoCodecVP8:
return std::unique_ptr<VCMGenericDecoder>(
new VCMGenericDecoder(VP8Decoder::Create()));
case kVideoCodecVP9:
return std::unique_ptr<VCMGenericDecoder>(
new VCMGenericDecoder(VP9Decoder::Create()));
case kVideoCodecI420:
return std::unique_ptr<VCMGenericDecoder>(
new VCMGenericDecoder(new I420Decoder()));
case kVideoCodecH264:
if (H264Decoder::IsSupported()) {
return std::unique_ptr<VCMGenericDecoder>(
new VCMGenericDecoder(H264Decoder::Create()));
}
break;
default:
break;
}
RTC_LOG(LS_WARNING) << "No internal decoder of this type exists.";
return std::unique_ptr<VCMGenericDecoder>();
}
#endif
VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings,
int number_of_cores,
bool require_key_frame)
@ -196,12 +163,7 @@ std::unique_ptr<VCMGenericDecoder> VCMDecoderDataBase::CreateAndInitDecoder(
ptr_decoder.reset(new VCMGenericDecoder(
external_dec_item->external_decoder_instance, true));
} else {
#if !defined(USE_BUILTIN_SW_CODECS)
RTC_LOG(LS_ERROR) << "No decoder of this type exists.";
#else
// Create decoder.
ptr_decoder = CreateDecoder(decoder_item->settings->codecType);
#endif
}
if (!ptr_decoder)
return nullptr;

2
video/BUILD.gn
View File

@ -112,7 +112,7 @@ rtc_static_library("video") {
rtc_source_set("video_stream_decoder_impl") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
sources = [
"video_stream_decoder_impl.cc",
"video_stream_decoder_impl.h",