Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Issue 2488663003: Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (Closed)

Created:
4 years, 1 month ago by kthelgason
Modified:
4 years, 1 month ago
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com, zhengzhonghou_agora.io, video-team_agora.io, stefan-webrtc, mflodman
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:280001 of https://codereview.webrtc.org/2487723004/ ) Reason for revert: Broke webrtc gyp build Original issue's description: > Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #1 id:1 of https://codereview.webrtc.org/2483273002/ ) > > Reason for revert: > Fix gyp build > > Original issue's description: > > Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ ) > > > > Reason for revert: > > Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes. > > > > Original issue's description: > > > Add a webrtc{en,de}coderfactory implementation for VideoToolbox > > > > > > This CL removes the coupling of the VideoToolbox h264 implementation > > > to the generic h264 code. The files have been moved into sdb/obj/Framework > > > and all dependency on them has been removed from the rest of WebRTC. > > > We now add it as an external encoder via a factory supplied to the > > > CreatePeerConnectionFactory call. This also brings the iOS implementation > > > closer to what we do on Android for MediaCodec. > > > > > > BUG=webrtc:6619 > > > > > > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4 > > > Cr-Commit-Position: refs/heads/master@{#14953} > > > > TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org > > BUG=webrtc:6619 > > > > Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1 > > Cr-Commit-Position: refs/heads/master@{#14985} > > R=magjed@webrtc.org > TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6619 > > Committed: https://chromium.googlesource.com/external/webrtc/+/cbe743528848dc71e6bc15185002a634b78661c6 TBR=magjed@webrtc.org,stefan@webrtc.org,kwiberg@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6619

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1970 lines, -2035 lines) Patch
M webrtc/modules/BUILD.gn View 1 chunk +4 lines, -1 line 0 comments Download
M webrtc/modules/video_coding/BUILD.gn View 2 chunks +59 lines, -0 lines 0 comments Download
M webrtc/modules/video_coding/codecs/h264/h264.cc View 4 chunks +28 lines, -0 lines 0 comments Download
M webrtc/modules/video_coding/codecs/h264/h264.gypi View 2 chunks +45 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_objc.mm View 1 chunk +32 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.h View 1 chunk +62 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc View 1 chunk +281 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h View 1 chunk +98 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.mm View 1 chunk +664 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.h View 1 chunk +115 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu.cc View 1 chunk +369 lines, -0 lines 0 comments Download
A webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_nalu_unittest.cc View 1 chunk +208 lines, -0 lines 0 comments Download
M webrtc/sdk/BUILD.gn View 6 chunks +4 lines, -61 lines 0 comments Download
M webrtc/sdk/DEPS View 1 chunk +0 lines, -2 lines 0 comments Download
M webrtc/sdk/objc/Framework/Classes/RTCPeerConnectionFactory.mm View 2 chunks +1 line, -8 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.h View 1 chunk +0 lines, -59 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc View 1 chunk +0 lines, -277 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.h View 1 chunk +0 lines, -95 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm View 1 chunk +0 lines, -660 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.h View 1 chunk +0 lines, -112 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu.cc View 1 chunk +0 lines, -365 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_nalu_unittest.cc View 1 chunk +0 lines, -204 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.h View 1 chunk +0 lines, -50 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc View 1 chunk +0 lines, -103 lines 0 comments Download
M webrtc/sdk/sdk.gyp View 2 chunks +0 lines, -38 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
kthelgason
Created Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox
4 years, 1 month ago (2016-11-09 09:58:32 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/2488663003/1
4 years, 1 month ago (2016-11-09 09:58:35 UTC) #3
commit-bot: I haz the power
4 years, 1 month ago (2016-11-09 09:58:41 UTC) #5
Failed to apply patch for webrtc/sdk/sdk.gyp:
While running git apply --index -3 -p1;
  error: patch failed: webrtc/sdk/sdk.gyp:84
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: webrtc/sdk/sdk.gyp: patch does not apply

Patch:       webrtc/sdk/sdk.gyp
Index: webrtc/sdk/sdk.gyp
diff --git a/webrtc/sdk/sdk.gyp b/webrtc/sdk/sdk.gyp
index
ea4454c4125a67982ca5a347e4bc0f977ab4c85e..908d544abba5a45b7744c430313ebf4858670576
100644
--- a/webrtc/sdk/sdk.gyp
+++ b/webrtc/sdk/sdk.gyp
@@ -84,7 +84,6 @@
           'dependencies': [
             '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
             'rtc_sdk_common_objc',
-            'webrtc_h264_video_toolbox',
           ],
           'include_dirs': [
             'objc/Framework/Classes',
@@ -339,42 +338,5 @@
         }, # rtc_sdk_framework_objc
       ],  # targets
     }],  # OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")
-    ['OS=="ios"', {
-      'targets': [
-        {
-          'target_name': 'webrtc_h264_video_toolbox',
-          'type': 'static_library',
-          'includes': [ '../build/objc_common.gypi' ],
-          'dependencies': [
-            'rtc_sdk_common_objc',
-          ],
-          'link_settings': {
-            'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '-framework CoreFoundation',
-                '-framework CoreMedia',
-                '-framework CoreVideo',
-                '-framework VideoToolbox',
-              ],
-            },
-          },
-          'sources': [
-            'objc/Framework/Classes/h264_video_toolbox_decoder.cc',
-            'objc/Framework/Classes/h264_video_toolbox_decoder.h',
-            'objc/Framework/Classes/h264_video_toolbox_encoder.h',
-            'objc/Framework/Classes/h264_video_toolbox_encoder.mm',
-            'objc/Framework/Classes/h264_video_toolbox_nalu.cc',
-            'objc/Framework/Classes/h264_video_toolbox_nalu.h',
-            'objc/Framework/Classes/videotoolboxvideocodecfactory.cc',
-            'objc/Framework/Classes/videotoolboxvideocodecfactory.h',
-          ],
-          'conditions': [
-            ['build_libyuv==1', {
-              'dependencies':
['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv'],
-            }],
-          ],
-        }, # webrtc_h264_video_toolbox
-      ], # targets
-    }], # OS=="ios"
   ],
 }

Powered by Google App Engine
This is Rietveld 408576698