Index: webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc |
diff --git a/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc b/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc |
index 56093fdfdcf44525537fff5c58e104f08e14e5db..b94194fe53276d7e22194091bac7cd75aac8e267 100644 |
--- a/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc |
+++ b/webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc |
@@ -12,18 +12,14 @@ |
#include "webrtc/base/logging.h" |
#include "webrtc/common_video/h264/profile_level_id.h" |
#include "webrtc/media/base/codec.h" |
-#if defined(WEBRTC_IOS) |
#include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h" |
#include "webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h" |
-#endif |
namespace webrtc { |
// VideoToolboxVideoEncoderFactory |
VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() { |
-// Hardware H264 encoding only supported on iOS for now. |
-#if defined(WEBRTC_IOS) |
// TODO(magjed): Enumerate actual level instead of using hardcoded level 3.1. |
// Level 3.1 is 1280x720@30fps which is enough for now. |
const H264::Level level = H264::kLevel3_1; |
@@ -47,29 +43,24 @@ VideoToolboxVideoEncoderFactory::VideoToolboxVideoEncoderFactory() { |
constrained_baseline.SetParam(cricket::kH264FmtpLevelAsymmetryAllowed, "1"); |
constrained_baseline.SetParam(cricket::kH264FmtpPacketizationMode, "1"); |
supported_codecs_.push_back(constrained_baseline); |
-#endif |
} |
VideoToolboxVideoEncoderFactory::~VideoToolboxVideoEncoderFactory() {} |
VideoEncoder* VideoToolboxVideoEncoderFactory::CreateVideoEncoder( |
const cricket::VideoCodec& codec) { |
-#if defined(WEBRTC_IOS) |
if (FindMatchingCodec(supported_codecs_, codec)) { |
LOG(LS_INFO) << "Creating HW encoder for " << codec.name; |
return new H264VideoToolboxEncoder(codec); |
} |
-#endif |
LOG(LS_INFO) << "No HW encoder found for codec " << codec.name; |
return nullptr; |
} |
void VideoToolboxVideoEncoderFactory::DestroyVideoEncoder( |
VideoEncoder* encoder) { |
-#if defined(WEBRTC_IOS) |
delete encoder; |
encoder = nullptr; |
-#endif |
} |
const std::vector<cricket::VideoCodec>& |
@@ -80,9 +71,7 @@ VideoToolboxVideoEncoderFactory::supported_codecs() const { |
// VideoToolboxVideoDecoderFactory |
VideoToolboxVideoDecoderFactory::VideoToolboxVideoDecoderFactory() { |
-#if defined(WEBRTC_IOS) |
supported_codecs_.push_back(cricket::VideoCodec("H264")); |
-#endif |
} |
VideoToolboxVideoDecoderFactory::~VideoToolboxVideoDecoderFactory() {} |
@@ -95,22 +84,18 @@ VideoDecoder* VideoToolboxVideoDecoderFactory::CreateVideoDecoder( |
return nullptr; |
} |
const cricket::VideoCodec codec(*codec_name); |
-#if defined(WEBRTC_IOS) |
if (FindMatchingCodec(supported_codecs_, codec)) { |
LOG(LS_INFO) << "Creating HW decoder for " << codec.name; |
return new H264VideoToolboxDecoder(); |
} |
-#endif |
LOG(LS_INFO) << "No HW decoder found for codec " << codec.name; |
return nullptr; |
} |
void VideoToolboxVideoDecoderFactory::DestroyVideoDecoder( |
VideoDecoder* decoder) { |
-#if defined(WEBRTC_IOS) |
delete decoder; |
decoder = nullptr; |
-#endif |
} |
} // namespace webrtc |