admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out target rtc_media_base from rtc_media

Browse Source 
The purpose with this CL is to be able to depend on
cricket::VideoCodec (webrtc/media/base/codec.h) from other targets
without getting cyclic dependencies.

BUG=webrtc:6402,webrtc:6337

NOTRY=True

Review-Url: https://codereview.webrtc.org/2471573003
Cr-Commit-Position: refs/heads/master@{#15137}
This commit is contained in:
magjed 2016-11-17 07:29:31 -08:00 committed by Commit bot
parent 765edc3425
commit aae7e7cf35
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
webrtc/media/BUILD.gn
View File

@ -12,6 +12,7 @@ import("../build/webrtc.gni")
group("media") {
public_deps = [
":rtc_media",
":rtc_media_base",
]
}
@ -41,7 +42,7 @@ if (is_linux && rtc_use_gtk) {
}
}
rtc_static_library("rtc_media") {
rtc_static_library("rtc_media_base") {
defines = []
libs = []
deps = []
@ -81,6 +82,38 @@ rtc_static_library("rtc_media") {
"base/videoframe.h",
"base/videosourcebase.cc",
"base/videosourcebase.h",
]
configs += [ ":rtc_media_warnings_config" ]
if (!build_with_chromium && is_clang) {
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
}
include_dirs = []
if (rtc_build_libyuv) {
deps += [ "$rtc_libyuv_dir" ]
public_deps = [
"$rtc_libyuv_dir",
]
} else {
# Need to add a directory normally exported by libyuv.
include_dirs += [ "$rtc_libyuv_dir/include" ]
}
deps += [
"..:webrtc_common",
"../base:rtc_base_approved",
"../p2p",
]
}
rtc_static_library("rtc_media") {
defines = []
libs = []
deps = []
sources = [
"engine/internalencoderfactory.cc",
"engine/internalencoderfactory.h",
"engine/nullwebrtcvideoengine.h",
@ -166,15 +199,14 @@ rtc_static_library("rtc_media") {
public_configs += [ ":gtk-lib" ]
}
deps += [
":rtc_media_base",
"..:webrtc_common",
"../api:call_api",
"../base:rtc_base_approved",
"../call",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/video_coding",
"../p2p",
"../system_wrappers",
"../video",
"../voice_engine",
]
}

6
webrtc/media/base/codec.cc
View File

@ -13,7 +13,7 @@
#include <algorithm>
#include <sstream>
#include "webrtc/base/common.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/stringencode.h"
#include "webrtc/base/stringutils.h"
@ -54,7 +54,7 @@ void FeedbackParams::Add(const FeedbackParam& param) {
return;
}
params_.push_back(param);
ASSERT(!HasDuplicateEntries());
RTC_CHECK(!HasDuplicateEntries());
}
void FeedbackParams::Intersect(const FeedbackParams& from) {
@ -192,7 +192,7 @@ bool AudioCodec::Matches(const AudioCodec& codec) const {
webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
codec_params.channels = channels;
codec_params.channels = static_cast<int>(channels);
return codec_params;
}