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

Issue 2857103006: Revert of Move CoreVideoFrameBuffer from webrtc/common_video/ to webrtc/sdk/objc/ (Closed)

Created:
3 years, 7 months ago by lliuu
Modified:
3 years, 7 months ago
CC:
webrtc-reviews_webrtc.org, tterriberry_mozilla.com
Target Ref:
refs/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Move CoreVideoFrameBuffer from webrtc/common_video/ to webrtc/sdk/objc/ (patchset #2 id:60001 of https://codereview.webrtc.org/2851563003/ ) Reason for revert: API changes broke internal projects Original issue's description: > Move CoreVideoFrameBuffer from webrtc/common_video/ to webrtc/sdk/objc/ > > CoreVideoFrameBuffer is Mac/iPhone specific and should be moved into > the webrtc/sdk/objc/ folder. > > BUG=None > > Review-Url: https://codereview.webrtc.org/2851563003 > Cr-Commit-Position: refs/heads/master@{#17998} > Committed: https://chromium.googlesource.com/external/webrtc/+/d41631aa274e926c4fba1600cbcfbc18020eb35a TBR=kthelgason@webrtc.org,magjed@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+220 lines, -234 lines) Patch
M webrtc/common_video/BUILD.gn View 1 chunk +8 lines, -0 lines 0 comments Download
A webrtc/common_video/corevideo_frame_buffer.cc View 1 chunk +148 lines, -0 lines 0 comments Download
A webrtc/common_video/include/corevideo_frame_buffer.h View 1 chunk +59 lines, -0 lines 0 comments Download
M webrtc/common_video/libyuv/include/webrtc_libyuv.h View 1 chunk +0 lines, -2 lines 0 comments Download
M webrtc/common_video/libyuv/webrtc_libyuv.cc View 1 chunk +0 lines, -3 lines 0 comments Download
M webrtc/sdk/BUILD.gn View 3 chunks +0 lines, -16 lines 0 comments Download
M webrtc/sdk/objc/DEPS View 1 chunk +0 lines, -1 line 0 comments Download
M webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm View 1 chunk +1 line, -1 line 0 comments Download
D webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.h View 1 chunk +0 lines, -59 lines 0 comments Download
D webrtc/sdk/objc/Framework/Classes/corevideo_frame_buffer.cc View 1 chunk +0 lines, -148 lines 0 comments Download
M webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_decoder.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/sdk/objc/Framework/Classes/objcvideotracksource.mm View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 5 (2 generated)
lliuu
Created Revert of Move CoreVideoFrameBuffer from webrtc/common_video/ to webrtc/sdk/objc/
3 years, 7 months ago (2017-05-03 20:56:23 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/2857103006/1
3 years, 7 months ago (2017-05-03 20:56:30 UTC) #3
commit-bot: I haz the power
3 years, 7 months ago (2017-05-03 20:56:36 UTC) #5
Failed to apply patch for webrtc/sdk/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: webrtc/sdk/BUILD.gn:212
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: webrtc/sdk/BUILD.gn: patch does not apply

Patch:       webrtc/sdk/BUILD.gn
Index: webrtc/sdk/BUILD.gn
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index
0189b88e933194ea4f92361f156fc436126aac51..ad8cda6cd832195a1dfa40ba701bccb31e518f6c
100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -212,7 +212,6 @@
     ]
 
     deps = [
-      ":rtc_sdk_corevideoframebuffer",
       ":webrtc_h264_video_toolbox",
       "../api:video_frame_api",
       "../base:rtc_base",
@@ -425,20 +424,6 @@
     ]
   }
 
-  rtc_static_library("rtc_sdk_corevideoframebuffer") {
-    sources = [
-      "objc/Framework/Classes/corevideo_frame_buffer.cc",
-      "objc/Framework/Classes/corevideo_frame_buffer.h",
-    ]
-
-    deps = [
-      "../base:rtc_base_approved",
-      "../common_video",
-    ]
-
-    libs = [ "CoreVideo.framework" ]
-  }
-
   rtc_static_library("webrtc_h264_video_toolbox") {
     sources = [
       "objc/Framework/Classes/h264_video_toolbox_decoder.cc",
@@ -453,7 +438,6 @@
 
     deps = [
       ":rtc_sdk_common_objc",
-      ":rtc_sdk_corevideoframebuffer",
       "../api:video_frame_api",
       "../base:rtc_base_approved",
       "../common_video",

Powered by Google App Engine
This is Rietveld 408576698