Reland of Split out target rtc_media_base from rtc_media (patchset #1 id:1 of https://codereview.webrtc.org/2508163002/ )
Reason for revert: Include fix for downstream import. Original issue's description: > Revert of Split out target rtc_media_base from rtc_media (patchset #3 id:40001 of https://codereview.webrtc.org/2471573003/ ) > > Reason for revert: > Breaks downstream import. > > Original issue's description: > > Split out target rtc_media_base from rtc_media > > > > 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 > > > > Committed: https://crrev.com/aae7e7cf35a5bb43ebbaf75396aa7ccc544e920a > > Cr-Commit-Position: refs/heads/master@{#15137} > > TBR=kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6402,webrtc:6337 > > Committed: https://crrev.com/0d0d7531b50a78efe7468610395e9dc5f496e2e9 > Cr-Commit-Position: refs/heads/master@{#15139} TBR=kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6402,webrtc:6337 Review-Url: https://codereview.webrtc.org/2509123003 Cr-Commit-Position: refs/heads/master@{#15235}
This commit is contained in:
parent
33c81d0561
commit
0928a3cf0f
@ -12,6 +12,7 @@ import("../build/webrtc.gni")
|
|||||||
group("media") {
|
group("media") {
|
||||||
public_deps = [
|
public_deps = [
|
||||||
":rtc_media",
|
":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 = []
|
defines = []
|
||||||
libs = []
|
libs = []
|
||||||
deps = []
|
deps = []
|
||||||
@ -81,6 +82,60 @@ rtc_static_library("rtc_media") {
|
|||||||
"base/videoframe.h",
|
"base/videoframe.h",
|
||||||
"base/videosourcebase.cc",
|
"base/videosourcebase.cc",
|
||||||
"base/videosourcebase.h",
|
"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 = [
|
||||||
|
# TODO(magjed): Remove base header files once Chromium is updated.
|
||||||
|
"base/adaptedvideotracksource.h",
|
||||||
|
"base/audiosource.h",
|
||||||
|
"base/codec.h",
|
||||||
|
"base/cryptoparams.h",
|
||||||
|
"base/device.h",
|
||||||
|
"base/hybriddataengine.h",
|
||||||
|
"base/mediachannel.h",
|
||||||
|
"base/mediaconstants.h",
|
||||||
|
"base/mediaengine.h",
|
||||||
|
"base/rtpdataengine.h",
|
||||||
|
"base/rtpdump.h",
|
||||||
|
"base/rtputils.h",
|
||||||
|
"base/streamparams.h",
|
||||||
|
"base/turnutils.h",
|
||||||
|
"base/videoadapter.h",
|
||||||
|
"base/videobroadcaster.h",
|
||||||
|
"base/videocapturer.h",
|
||||||
|
"base/videocapturerfactory.h",
|
||||||
|
"base/videocommon.h",
|
||||||
|
"base/videoframe.h",
|
||||||
|
"base/videosourcebase.h",
|
||||||
"engine/internalencoderfactory.cc",
|
"engine/internalencoderfactory.cc",
|
||||||
"engine/internalencoderfactory.h",
|
"engine/internalencoderfactory.h",
|
||||||
"engine/nullwebrtcvideoengine.h",
|
"engine/nullwebrtcvideoengine.h",
|
||||||
@ -168,15 +223,14 @@ rtc_static_library("rtc_media") {
|
|||||||
public_configs += [ ":gtk-lib" ]
|
public_configs += [ ":gtk-lib" ]
|
||||||
}
|
}
|
||||||
deps += [
|
deps += [
|
||||||
|
":rtc_media_base",
|
||||||
"..:webrtc_common",
|
"..:webrtc_common",
|
||||||
"../api:call_api",
|
"../api:call_api",
|
||||||
"../base:rtc_base_approved",
|
"../base:rtc_base_approved",
|
||||||
"../call",
|
"../call",
|
||||||
"../modules/audio_mixer:audio_mixer_impl",
|
"../modules/audio_mixer:audio_mixer_impl",
|
||||||
"../modules/video_coding",
|
"../modules/video_coding",
|
||||||
"../p2p",
|
|
||||||
"../system_wrappers",
|
"../system_wrappers",
|
||||||
"../video",
|
|
||||||
"../voice_engine",
|
"../voice_engine",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#include "webrtc/base/common.h"
|
#include "webrtc/base/checks.h"
|
||||||
#include "webrtc/base/logging.h"
|
#include "webrtc/base/logging.h"
|
||||||
#include "webrtc/base/stringencode.h"
|
#include "webrtc/base/stringencode.h"
|
||||||
#include "webrtc/base/stringutils.h"
|
#include "webrtc/base/stringutils.h"
|
||||||
@ -54,7 +54,7 @@ void FeedbackParams::Add(const FeedbackParam& param) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
params_.push_back(param);
|
params_.push_back(param);
|
||||||
ASSERT(!HasDuplicateEntries());
|
RTC_CHECK(!HasDuplicateEntries());
|
||||||
}
|
}
|
||||||
|
|
||||||
void FeedbackParams::Intersect(const FeedbackParams& from) {
|
void FeedbackParams::Intersect(const FeedbackParams& from) {
|
||||||
@ -192,7 +192,7 @@ bool AudioCodec::Matches(const AudioCodec& codec) const {
|
|||||||
|
|
||||||
webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
|
webrtc::RtpCodecParameters AudioCodec::ToCodecParameters() const {
|
||||||
webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
|
webrtc::RtpCodecParameters codec_params = Codec::ToCodecParameters();
|
||||||
codec_params.channels = channels;
|
codec_params.channels = static_cast<int>(channels);
|
||||||
return codec_params;
|
return codec_params;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include "libyuv/scale_argb.h"
|
|
||||||
#include "webrtc/base/common.h"
|
#include "webrtc/base/common.h"
|
||||||
#include "webrtc/base/logging.h"
|
#include "webrtc/base/logging.h"
|
||||||
#include "webrtc/base/systeminfo.h"
|
#include "webrtc/base/systeminfo.h"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user