| Index: webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h
|
| diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h b/webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h
|
| similarity index 31%
|
| copy from webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h
|
| copy to webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h
|
| index fbb2bd29b6c77b1630a4a0c21ee4238976603c84..0b82e927d6bbfda001f78c827d14005837dfa7bf 100644
|
| --- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h
|
| +++ b/webrtc/modules/video_coding/codecs/test/objc_codec_h264_test.h
|
| @@ -8,40 +8,19 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#import <Foundation/Foundation.h>
|
| +#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_
|
| +#define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_
|
|
|
| -#import <WebRTC/RTCMacros.h>
|
| -#import <WebRTC/RTCVideoCodecFactory.h>
|
| +#include <memory>
|
|
|
| -/** Class for H264 specific config. */
|
| -typedef NS_ENUM(NSUInteger, RTCH264PacketizationMode) {
|
| - NonInterleaved = 0, // Mode 1 - STAP-A, FU-A is allowed
|
| - SingleNalUnit // Mode 0 - only single NALU allowed
|
| -};
|
| +#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
|
| +#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
|
|
|
| -RTC_EXPORT
|
| -@interface RTCCodecSpecificInfoH264 : NSObject<RTCCodecSpecificInfo>
|
| +namespace webrtc {
|
|
|
| -@property(nonatomic, assign) RTCH264PacketizationMode packetizationMode;
|
| +std::unique_ptr<cricket::WebRtcVideoEncoderFactory> CreateObjCEncoderFactory();
|
| +std::unique_ptr<cricket::WebRtcVideoDecoderFactory> CreateObjCDecoderFactory();
|
|
|
| -@end
|
| +} // namespace webrtc
|
|
|
| -/** Encoder. */
|
| -RTC_EXPORT
|
| -@interface RTCVideoEncoderH264 : NSObject<RTCVideoEncoder>
|
| -@end
|
| -
|
| -/** Decoder. */
|
| -RTC_EXPORT
|
| -@interface RTCVideoDecoderH264 : NSObject<RTCVideoDecoder>
|
| -@end
|
| -
|
| -/** Encoder factory. */
|
| -RTC_EXPORT
|
| -@interface RTCVideoEncoderFactoryH264 : NSObject<RTCVideoEncoderFactory>
|
| -@end
|
| -
|
| -/** Decoder factory. */
|
| -RTC_EXPORT
|
| -@interface RTCVideoDecoderFactoryH264 : NSObject<RTCVideoDecoderFactory>
|
| -@end
|
| +#endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_OBJC_CODEC_H264_TEST_H_
|
|
|