commit a974d76c74ce299492e56b95d03aaf26627897dd
author kthelgason <kthelgason@webrtc.org> Thu Dec 01 00:16:48 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Dec 01 08:16:54 2016 +0000
tree 29b4d99e81f265e3447f70f5813cce8d1980b67e
parent 024c90ed906c4c69185666669ba96ab60419b664

Enable VideoToolbox encoder on mac

BUG=webrtc:6317

Review-Url: https://codereview.webrtc.org/2532983006
Cr-Commit-Position: refs/heads/master@{#15348}

webrtc/sdk/BUILD.gn

diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 7d2036b..5340cdd 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -176,6 +176,10 @@
       "objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
     ]
 
+    deps = [
+      ":webrtc_h264_video_toolbox",
+    ]
+
     if (is_ios) {
       sources += [
         "objc/Framework/Classes/RTCEAGLVideoView.m",
@@ -188,9 +192,6 @@
         "OpenGLES.framework",
         "QuartzCore.framework",
       ]
-      deps = [
-        ":webrtc_h264_video_toolbox",
-      ]
     }
 
     if (is_mac) {
@@ -202,7 +203,6 @@
         "CoreMedia.framework",
         "OpenGL.framework",
       ]
-      deps = []
     }
 
     configs += [

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 56093fd..b94194f 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 @@
   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 @@
 // VideoToolboxVideoDecoderFactory
 
 VideoToolboxVideoDecoderFactory::VideoToolboxVideoDecoderFactory() {
-#if defined(WEBRTC_IOS)
   supported_codecs_.push_back(cricket::VideoCodec("H264"));
-#endif
 }
 
 VideoToolboxVideoDecoderFactory::~VideoToolboxVideoDecoderFactory() {}
@@ -95,22 +84,18 @@
     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