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

Remove rtc_base/scoped_ref_ptr.h.

Browse Source 
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:
Mirko Bonadei
2019-01-25 20:26:48 +01:00
committed by Commit Bot
parent 9444f3a8c8
commit d970807e0c
224 changed files with 303 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/src/jni/android_media_decoder.cc
View File

@ -13,6 +13,7 @@
#include <memory>
#include <vector>
#include "api/scoped_refptr.h"
#include "api/video_codecs/sdp_video_format.h"
#include "common_video/h264/h264_bitstream_parser.h"
#include "common_video/include/i420_buffer_pool.h"
@ -23,7 +24,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/thread.h"
#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/MediaCodecVideoDecoder_jni.h"

6
sdk/android/src/jni/pc/audio.h
View File

@ -13,10 +13,10 @@
// Adding 'nogncheck' to disable the gn include headers check.
// We don't want this target depend on audio related targets
#include "api/audio_codecs/audio_decoder_factory.h" // nogncheck
#include "api/audio_codecs/audio_encoder_factory.h" // nogncheck
#include "api/audio_codecs/audio_decoder_factory.h" // nogncheck
#include "api/audio_codecs/audio_encoder_factory.h" // nogncheck
#include "api/scoped_refptr.h"
#include "modules/audio_processing/include/audio_processing.h" // nogncheck
#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
namespace jni {

2
sdk/android/src/jni/pc/media.h
View File

@ -13,7 +13,7 @@
#include <memory>
#include "rtc_base/scoped_ref_ptr.h"
#include "api/scoped_refptr.h"
namespace webrtc {
class AudioDeviceModule;

2
sdk/android/src/jni/pc/video.h
View File

@ -13,7 +13,7 @@
#include <jni.h>
#include "rtc_base/scoped_ref_ptr.h"
#include "api/scoped_refptr.h"
#include "rtc_base/thread.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"

2
sdk/android/src/jni/video_frame.cc
View File

@ -12,12 +12,12 @@
#include <memory>
#include "api/scoped_refptr.h"
#include "common_video/include/video_frame_buffer.h"
#include "rtc_base/bind.h"
#include "rtc_base/checks.h"
#include "rtc_base/keep_ref_until_done.h"
#include "rtc_base/logging.h"
#include "rtc_base/scoped_ref_ptr.h"
#include "rtc_base/time_utils.h"
#include "sdk/android/generated_video_jni/jni/VideoFrame_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"