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

Move videosinkinterface.h to common_video to solve a circular dep.

Browse Source 
I updated some dependency enforcement rules to allow examples and pc
to depend on common_video. I reckoned depending on common_video is
not controversial when they already dependend on media/base, which
is a lower-level abstraction.

Bug: webrtc:6828
Change-Id: I77dbeb10187b4e70dda1d873a29994fa76070758
Reviewed-on: https://webrtc-review.googlesource.com/34187
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21495}
This commit is contained in:
Patrik Höglund
2018-01-04 12:14:35 +01:00
committed by Commit Bot
parent 085bb64c85
commit be214a26f8
32 changed files with 70 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common_video/BUILD.gn
View File

@ -13,13 +13,6 @@ config("common_video_config") {
}
rtc_static_library("common_video") {
# TODO(bugs.webrtc.org/6828): Remove dependency cycle:
# //common_video:common_video ->
# //media:rtc_media_base ->
# //call:call_interfaces ->
# //call:video_stream_api ->
# //common_video:common_video
check_includes = false
sources = [
"bitrate_adjuster.cc",
"h264/h264_bitstream_parser.cc",
@ -61,14 +54,18 @@ rtc_static_library("common_video") {
deps = [
"..:webrtc_common",
"../:typedefs",
"../api:libjingle_peerconnection_api",
"../api:optional",
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../media:rtc_h264_profile_id",
"../modules:module_api",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base:rtc_task_queue",
"../system_wrappers",
"//third_party/libyuv",
]
}

2
common_video/include/incoming_video_stream.h
View File

@ -11,8 +11,8 @@
#ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
#define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
#include "api/videosinkinterface.h"
#include "common_video/video_render_frames.h"
#include "media/base/videosinkinterface.h"
#include "rtc_base/race_checker.h"
#include "rtc_base/task_queue.h"