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

Issue 1304143003: VideoFrameBuffer: Make non-const data access explicit (Closed)

Created:
5 years, 4 months ago by magjed_webrtc
Modified:
5 years, 3 months ago
Reviewers:
tommi
CC:
webrtc-reviews_webrtc.org, yujie_mao (webrtc), Andrew MacDonald, stefan-webrtc, tterriberry_mozilla.com, qiang.lu, niklas.enbom, mflodman
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

VideoFrameBuffer: Make non-const data access explicit VideoFrameBuffer currently has two overloaded data() functions for pixel access, one for const and one for non-const. Unfortunately, it will default to the non-const version, even when 'const scoped_refptr<VideoFrameBuffer>&' is used. This is a problem, because many subclasses use RTC_NOTREACHED() in the non-const version. This CL makes the non-const version of data() explicit with a different, longer function name MutableData(). R=tommi@webrtc.org Committed: https://chromium.googlesource.com/external/webrtc/+/3318f984cd7f51d24da4726665c05f5f06f82e6d

Patch Set 1 : #

Patch Set 2 : Rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+43 lines, -52 lines) Patch
M talk/media/webrtc/webrtcvideoframe.cc View 2 chunks +13 lines, -15 lines 0 comments Download
M webrtc/common_video/i420_buffer_pool.cc View 1 chunk +5 lines, -5 lines 0 comments Download
M webrtc/common_video/i420_buffer_pool_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/common_video/interface/video_frame_buffer.h View 1 4 chunks +6 lines, -5 lines 0 comments Download
M webrtc/common_video/video_frame.cc View 1 chunk +3 lines, -4 lines 0 comments Download
M webrtc/common_video/video_frame_buffer.cc View 1 5 chunks +9 lines, -16 lines 0 comments Download
M webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_decoder.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M webrtc/test/fake_texture_frame.h View 1 chunk +3 lines, -3 lines 0 comments Download

Messages

Total messages: 15 (6 generated)
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1304143003/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1304143003/1
5 years, 4 months ago (2015-08-21 11:33:38 UTC) #2
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_asan on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/linux_asan/builds/8890)
5 years, 4 months ago (2015-08-21 11:44:32 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1304143003/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1304143003/20001
5 years, 4 months ago (2015-08-21 14:57:45 UTC) #8
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
5 years, 4 months ago (2015-08-21 17:40:43 UTC) #10
magjed_webrtc
Please take a look.
5 years, 4 months ago (2015-08-24 08:01:36 UTC) #11
tommi
lgtm
5 years, 4 months ago (2015-08-24 09:59:09 UTC) #12
magjed_webrtc
Committed patchset #2 (id:40001) manually as 3318f984cd7f51d24da4726665c05f5f06f82e6d (presubmit successful).
5 years, 3 months ago (2015-08-26 14:06:36 UTC) #13
noahric
On 2015/08/26 14:06:36, magjed_webrtc wrote: > Committed patchset #2 (id:40001) manually as > 3318f984cd7f51d24da4726665c05f5f06f82e6d (presubmit ...
5 years, 3 months ago (2015-08-26 15:03:13 UTC) #14
magjed_webrtc
5 years, 3 months ago (2015-08-26 15:11:30 UTC) #15
Message was sent while issue was closed.
On 2015/08/26 15:03:13, noahric wrote:
> On 2015/08/26 14:06:36, magjed_webrtc wrote:
> > Committed patchset #2 (id:40001) manually as
> > 3318f984cd7f51d24da4726665c05f5f06f82e6d (presubmit successful).
> 
> FYI, I'm seeing buildbot failures from this CL:
> In file included from
> ../../content/renderer/media/webrtc/webrtc_video_frame_adapter.cc:5:
> ../../content/renderer/media/webrtc/webrtc_video_frame_adapter.h:27:41: error:
> only virtual member functions can be marked 'override'
>   uint8_t* data(webrtc::PlaneType type) override;
> 
>
http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20GN%20%28dbg%...
> 
> Looks like webrtc_video_frame_adapter.h also needs to be updated?

Yes, I have spoken with grunell, the webrtc-in-chrome sheriff. I'm doing a
custom roll right now:
https://codereview.chromium.org/1310213008/
The Chromium waterfall is not in a good right now though.

Powered by Google App Engine
This is Rietveld 408576698