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

Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)"

Browse Source 
This reverts commit c3771cc4d37f5573fe53b7c7cff295a4f0f9560f.
(breaks downstream internal project)

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2972463002 .
Cr-Commit-Position: refs/heads/master@{#18873}
This commit is contained in:
Henrik Kjellander
2017-07-01 16:48:15 +02:00
parent dca1e09db7
commit a80c16a67c
631 changed files with 1686 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
View File

@ -11,7 +11,7 @@
#import "WebRTC/RTCDataChannel.h"
#include "webrtc/api/datachannelinterface.h"
#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN

2
webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
View File

@ -11,7 +11,7 @@
#import "WebRTC/RTCPeerConnectionFactory.h"
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN

4
webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
View File

@ -12,9 +12,9 @@
#include "libyuv/convert.h"
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/logging.h"
namespace webrtc {

2
webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
View File

@ -12,8 +12,8 @@
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_
#include "WebRTC/RTCMacros.h"
#include "webrtc/base/timestampaligner.h"
#include "webrtc/media/base/adaptedvideotracksource.h"
#include "webrtc/rtc_base/timestampaligner.h"
RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);

2
webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
View File

@ -13,12 +13,12 @@
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_ENCODER_H_
#include "webrtc/api/video/video_rotation.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/common_video/h264/h264_bitstream_parser.h"
#include "webrtc/common_video/include/bitrate_adjuster.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "webrtc/rtc_base/criticalsection.h"
#include <VideoToolbox/VideoToolbox.h>
#include <vector>

4
webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
View File

@ -15,8 +15,8 @@
#include <memory>
#include <vector>
#include "webrtc/rtc_base/checks.h"
#include "webrtc/rtc_base/logging.h"
#include "webrtc/base/checks.h"
#include "webrtc/base/logging.h"
namespace webrtc {

2
webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
View File

@ -17,9 +17,9 @@
#include <CoreMedia/CoreMedia.h>
#include <vector>
#include "webrtc/base/buffer.h"
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/rtc_base/buffer.h"
using webrtc::H264::NaluIndex;

2
webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
View File

@ -11,7 +11,7 @@
#include <memory>
#include "webrtc/rtc_base/arraysize.h"
#include "webrtc/base/arraysize.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
#include "webrtc/test/gtest.h"