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

Issue 2411953002: Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)

Created:
4 years, 2 months ago by nisse-webrtc
Modified:
4 years, 2 months ago
CC:
webrtc-reviews_webrtc.org, interface-changes_webrtc.org, yujie_mao (webrtc), tterriberry_mozilla.com, qiang.lu, niklas.enbom, peah-webrtc, the sun
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/2402853002/ ) This cl now makes cricket::VideoFrame and cricket::WebRtcVideoFrame aliases for webrtc::VideoFrame. Reason for revert: Fixing backwards compatibility issues. Original issue's description: > Revert of Make cricket::VideoFrame inherit webrtc::VideoFrame. (patchset #9 id:160001 of https://codereview.webrtc.org/2315663002/ ) > > Reason for revert: > Breaks compile for Chromium builds: > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/10761 > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/18142 > > FAILED: obj/remoting/protocol/protocol/webrtc_video_renderer_adapter.o > ../../remoting/protocol/webrtc_video_renderer_adapter.cc:110:52: error: no member named 'transport_frame_id' in 'cricket::VideoFrame' > weak_factory_.GetWeakPtr(), frame.transport_frame_id(), > ~~~~~ ^ > 1 error generated. > > Please run chromium trybots as described at https://webrtc.org/contributing/#tryjobs-on-chromium-trybots before relanding. > > Original issue's description: > > Make cricket::VideoFrame inherit webrtc::VideoFrame. Delete > > all methods but a few constructors. And similarly for the > > subclass cricket::WebRtcVideoFrame. > > > > TBR=tkchin@webrtc.org # Added an include line > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/dda6ec008a0fc8d52e118814fb779032e8931968 > > Cr-Commit-Position: refs/heads/master@{#14576} > > TBR=perkj@webrtc.org,pthatcher@webrtc.org,pthatcher@chromium.org,tkchin@webrtc.org,nisse@webrtc.org > NOTRY=True > NOPRESUBMIT=True > BUG=webrtc:5682 > > Committed: https://crrev.com/d36dd499c8f253cbcf37364c2a070c2e8c7100e9 > Cr-Commit-Position: refs/heads/master@{#14583} TBR=perkj@webrtc.org,pthatcher@webrtc.org,pthatcher@chromium.org,tkchin@webrtc.org,kjellander@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Committed: https://crrev.com/09347858f7b9882cb3ef5677cd534ffddc9d6d6a Cr-Commit-Position: refs/heads/master@{#14678}

Patch Set 1 #

Patch Set 2 : Improve backwards compatibility. #

Patch Set 3 : Rebased. #

Patch Set 4 : Convert back to using aliases. #

Patch Set 5 : Use webrtc::VideoFrame constructor directly. #

Patch Set 6 : Fix for windows build. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+45 lines, -2020 lines) Patch
M webrtc/api/androidvideotracksource.cc View 1 2 3 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/media/BUILD.gn View 1 2 3 chunks +0 lines, -4 lines 0 comments Download
M webrtc/media/base/mediachannel.h View 1 2 3 2 chunks +3 lines, -1 line 0 comments Download
M webrtc/media/base/testutils.h View 1 2 3 1 chunk +0 lines, -1 line 0 comments Download
M webrtc/media/base/videobroadcaster.cc View 1 2 chunks +2 lines, -1 line 0 comments Download
M webrtc/media/base/videobroadcaster_unittest.cc View 1 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/media/base/videocapturer.h View 1 2 3 1 chunk +0 lines, -2 lines 0 comments Download
M webrtc/media/base/videoframe.h View 1 2 3 1 chunk +16 lines, -45 lines 0 comments Download
D webrtc/media/base/videoframe.cc View 1 chunk +0 lines, -171 lines 0 comments Download
D webrtc/media/base/videoframe_unittest.h View 1 chunk +0 lines, -1369 lines 0 comments Download
M webrtc/media/devices/gdivideorenderer.h View 1 2 3 4 5 1 chunk +3 lines, -2 lines 0 comments Download
M webrtc/media/devices/gtkvideorenderer.h View 1 2 3 1 chunk +3 lines, -2 lines 0 comments Download
M webrtc/media/engine/webrtcvideocapturer.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/media/engine/webrtcvideoengine2.h View 1 2 3 2 chunks +1 line, -2 lines 0 comments Download
M webrtc/media/engine/webrtcvideoengine2.cc View 1 2 3 2 chunks +1 line, -5 lines 0 comments Download
M webrtc/media/engine/webrtcvideoframe.h View 1 2 3 2 chunks +5 lines, -95 lines 0 comments Download
D webrtc/media/engine/webrtcvideoframe.cc View 1 chunk +0 lines, -154 lines 0 comments Download
D webrtc/media/engine/webrtcvideoframe_unittest.cc View 1 chunk +0 lines, -157 lines 0 comments Download
M webrtc/media/media.gyp View 1 2 chunks +0 lines, -2 lines 0 comments Download
M webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm View 1 2 3 4 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/video_frame.h View 1 1 chunk +4 lines, -0 lines 0 comments Download

Messages

Total messages: 14 (5 generated)
nisse-webrtc
Created Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame.
4 years, 2 months ago (2016-10-11 21:30:31 UTC) #1
kjellander_webrtc
lgtm. It would be nice with a link to the Chrome update CL in the ...
4 years, 2 months ago (2016-10-11 22:52:19 UTC) #2
tkchin_webrtc
On 2016/10/11 22:52:19, kjellander_webrtc wrote: > lgtm. It would be nice with a link to ...
4 years, 2 months ago (2016-10-11 23:02:22 UTC) #3
nisse-webrtc
On 2016/10/11 22:52:19, kjellander_webrtc wrote: > lgtm. It would be nice with a link to ...
4 years, 2 months ago (2016-10-11 23:40:41 UTC) #4
pthatcher1
lgtm
4 years, 2 months ago (2016-10-13 21:26:29 UTC) #5
nisse-webrtc
I've done some additional testing. Chrome cl https://codereview.chromium.org/2430643002/ needs to be landed first.
4 years, 2 months ago (2016-10-18 14:06:11 UTC) #7
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/2411953002/300001
4 years, 2 months ago (2016-10-19 06:30:37 UTC) #10
commit-bot: I haz the power
Committed patchset #6 (id:300001)
4 years, 2 months ago (2016-10-19 07:30:34 UTC) #12
commit-bot: I haz the power
4 years, 2 months ago (2016-10-19 07:30:38 UTC) #14
Message was sent while issue was closed.
Patchset 6 (id:??) landed as
https://crrev.com/09347858f7b9882cb3ef5677cd534ffddc9d6d6a
Cr-Commit-Position: refs/heads/master@{#14678}

Powered by Google App Engine
This is Rietveld 408576698