| Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
|
| diff --git a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
|
| similarity index 90%
|
| rename from webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h
|
| rename to webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
|
| index 3acdf641cdfea4e28646ccfb82282584779c9888..2b387563d348c41e7966b092bc10327078d47888 100644
|
| --- a/webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
|
| @@ -9,8 +9,8 @@
|
| *
|
| */
|
|
|
| -#ifndef WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_H264_VIDEO_TOOLBOX_ENCODER_H_
|
| -#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_H264_VIDEO_TOOLBOX_ENCODER_H_
|
| +#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
|
| +#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
|
|
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/common_video/h264/h264_bitstream_parser.h"
|
| @@ -19,6 +19,8 @@
|
| #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
|
| #include "webrtc/modules/video_coding/utility/quality_scaler.h"
|
|
|
| +#if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
|
| +
|
| #include <VideoToolbox/VideoToolbox.h>
|
| #include <vector>
|
|
|
| @@ -92,4 +94,5 @@ class H264VideoToolboxEncoder : public H264Encoder {
|
|
|
| } // namespace webrtc
|
|
|
| -#endif // WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_H264_VIDEO_TOOLBOX_ENCODER_H_
|
| +#endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
|
| +#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
|
|
|