Remove rtc_base/scoped_ref_ptr.h.
The type rtc::scoped_refptr<T> is now part of api/. Please include it from api/scoped_refptr.h. More info: See: https://groups.google.com/forum/#!topic/discuss-webrtc/Mme2MSz4z4o. Bug: webrtc:9887, webrtc:8205 No-Try: True Change-Id: Ic6c7c81e226e59f12f7933e472f573ae097b55bf Reviewed-on: https://webrtc-review.googlesource.com/c/119041 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26414}
This commit is contained in:
committed by
Commit Bot
parent
9444f3a8c8
commit
d970807e0c
@ -32,6 +32,7 @@ rtc_source_set("video_codecs_api") {
|
||||
]
|
||||
|
||||
deps = [
|
||||
"..:scoped_refptr",
|
||||
"../..:webrtc_common",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:rtc_base_approved",
|
||||
@ -59,8 +60,8 @@ rtc_static_library("builtin_video_decoder_factory") {
|
||||
|
||||
deps = [
|
||||
":video_codecs_api",
|
||||
"../../api:scoped_refptr",
|
||||
"../../media:rtc_internal_video_codecs",
|
||||
"../../rtc_base:ptr_util",
|
||||
"../../rtc_base/system:rtc_export",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
]
|
||||
@ -79,11 +80,11 @@ rtc_static_library("builtin_video_encoder_factory") {
|
||||
|
||||
deps = [
|
||||
":video_codecs_api",
|
||||
"../../api:scoped_refptr",
|
||||
"../../media:rtc_encoder_simulcast_proxy",
|
||||
"../../media:rtc_internal_video_codecs",
|
||||
"../../media:rtc_media_base",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:ptr_util",
|
||||
"../../rtc_base/system:rtc_export",
|
||||
"//third_party/abseil-cpp/absl/memory",
|
||||
"//third_party/abseil-cpp/absl/strings",
|
||||
|
||||
@ -23,12 +23,12 @@ if (rtc_include_tests) {
|
||||
"..:video_codecs_api",
|
||||
"../..:mock_video_encoder",
|
||||
"../../../:webrtc_common",
|
||||
"../../../api:scoped_refptr",
|
||||
"../../../modules:module_api",
|
||||
"../../../modules/video_coding:video_codec_interface",
|
||||
"../../../modules/video_coding:video_coding_utility",
|
||||
"../../../modules/video_coding:webrtc_vp8",
|
||||
"../../../rtc_base:checks",
|
||||
"../../../rtc_base:ptr_util",
|
||||
"../../../rtc_base:rtc_base_tests_utils",
|
||||
"../../../test:field_trial",
|
||||
"../../../test:test_support",
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
#include "absl/memory/memory.h"
|
||||
#include "absl/types/optional.h"
|
||||
#include "api/scoped_refptr.h"
|
||||
#include "api/test/mock_video_encoder.h"
|
||||
#include "api/video/encoded_image.h"
|
||||
#include "api/video/i420_buffer.h"
|
||||
@ -33,7 +34,6 @@
|
||||
#include "modules/video_coding/include/video_error_codes.h"
|
||||
#include "modules/video_coding/utility/simulcast_rate_allocator.h"
|
||||
#include "rtc_base/fake_clock.h"
|
||||
#include "rtc_base/scoped_ref_ptr.h"
|
||||
#include "test/field_trial.h"
|
||||
#include "test/gmock.h"
|
||||
#include "test/gtest.h"
|
||||
|
||||
@ -16,10 +16,10 @@
|
||||
#include <vector>
|
||||
|
||||
#include "absl/types/optional.h"
|
||||
#include "api/scoped_refptr.h"
|
||||
#include "api/video_codecs/sdp_video_format.h"
|
||||
#include "api/video_codecs/video_codec.h"
|
||||
#include "rtc_base/ref_count.h"
|
||||
#include "rtc_base/scoped_ref_ptr.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user