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

Issue 2084873002: Revert of Split IncomingVideoStream into two implementations, with smoothing and without. (Closed)

Created:
4 years, 6 months ago by sakal
Modified:
4 years, 6 months ago
CC:
webrtc-reviews_webrtc.org, video-team_agora.io, yujie_mao (webrtc), zhengzhonghou_agora.io, stefan-webrtc, tterriberry_mozilla.com, pbos-webrtc, perkj_webrtc
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Revert of Split IncomingVideoStream into two implementations, with smoothing and without. (patchset #5 id:340001 of https://codereview.webrtc.org/2078873002/ ) Reason for revert: Breaks chromium.webrtc.fyi https://uberchromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win7%20Tester/builds/4719 https://uberchromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win10%20Tester/builds/3120 Original issue's description: > Reland of IncomingVideoStream refactoring. > This reland does not contain the non-smoothing part of the original implementation. Instead, when smoothing is turned off, frame callbacks run on the decoder thread, as they did before. This code path is used in Chrome. As far as Chrome goes, the difference now is that there won't be an instance of IncomingVideoStream in between the decoder and the callback (i.e. fewer locks). Other than that, no change for Chrome. > > Original issue's description (with non-smoothing references removed): > > Split IncomingVideoStream into two implementations, with smoothing and without. > > * Added TODOs and documentation for VideoReceiveStream::OnFrame, where we today grab 6 locks. > > * Removed the Start/Stop methods from the IncomingVideoStream implementations. Now, when an instance is created, it should be considered to be "running" and when it is deleted, it's "not running". This saves on resources and also reduces the amount of locking required and I could remove one critical section altogether. > > * Changed the VideoStreamDecoder class to not depend on IncomingVideoStream but rather use the generic rtc::VideoSinkInterface<VideoFrame> interface. This means that any implementation of that interface can be used and the decoder can be made to just use the 'renderer' from the config. Once we do that, we can decouple the IncomingVideoStream implementations from the decoder and VideoReceiveStream implementations and leave it up to the application for how to do smoothing. The app can choose to use the Incoming* classes or roll its own (which may be preferable since applications often have their own scheduling mechanisms). > > * The lifetime of the VideoStreamDecoder instance is now bound to Start/Stop in VideoReceiveStream and not all of the lifetime of VideoReceiveStream. > > * Fixed VideoStreamDecoder to unregister callbacks in the dtor that were registered in the ctor. (this was open to a use-after-free regression) > > * Delay and callback pointers are now passed via the ctors to the IncomingVideoStream classes. The thread primitives in the IncomingVideoStream classes are also constructed/destructed at the same time as the owning object, which allowed me to remove one more lock. > > * Removed code in the VideoStreamDecoder that could overwrite the VideoReceiveStream render delay with a fixed value of 10ms on construction. This wasn't a problem with the previous implementation (it would be now though) but seemed to me like the wrong place to be setting that value. > > * Made the render delay value in VideoRenderFrames, const. > > BUG=chromium:620232 > R=mflodman@webrtc.org, nisse@webrtc.org > > Committed: https://crrev.com/884c336c345d988974c2a69cea402b0fb8b07a63 > Cr-Commit-Position: refs/heads/master@{#13219} TBR=nisse@webrtc.org,philipel@webrtc.org,mflodman@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:620232 Committed: https://crrev.com/a536bfe70de38fe877245317a7f0b00bcf69cbd0 Cr-Commit-Position: refs/heads/master@{#13229}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+218 lines, -147 lines) Patch
M webrtc/common_video/include/incoming_video_stream.h View 2 chunks +28 lines, -12 lines 0 comments Download
M webrtc/common_video/incoming_video_stream.cc View 4 chunks +108 lines, -41 lines 0 comments Download
M webrtc/common_video/video_render_frames.h View 3 chunks +8 lines, -3 lines 0 comments Download
M webrtc/common_video/video_render_frames.cc View 3 chunks +23 lines, -11 lines 0 comments Download
M webrtc/media/base/videosinkinterface.h View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/video/end_to_end_tests.cc View 6 chunks +1 line, -16 lines 0 comments Download
M webrtc/video/video_receive_stream.h View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/video/video_receive_stream.cc View 8 chunks +23 lines, -37 lines 0 comments Download
M webrtc/video/video_stream_decoder.h View 4 chunks +7 lines, -5 lines 0 comments Download
M webrtc/video/video_stream_decoder.cc View 5 chunks +14 lines, -16 lines 0 comments Download

Messages

Total messages: 8 (3 generated)
sakal
Created Revert of Split IncomingVideoStream into two implementations, with smoothing and without.
4 years, 6 months ago (2016-06-21 07:08:33 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2084873002/1
4 years, 6 months ago (2016-06-21 07:08:42 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 6 months ago (2016-06-21 07:08:53 UTC) #5
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/a536bfe70de38fe877245317a7f0b00bcf69cbd0 Cr-Commit-Position: refs/heads/master@{#13229}
4 years, 6 months ago (2016-06-21 07:09:08 UTC) #7
tommi
4 years, 6 months ago (2016-06-21 07:26:27 UTC) #8
Message was sent while issue was closed.
A revert of this CL (patchset #1 id:1) has been created in
https://codereview.webrtc.org/2089613002/ by tommi@webrtc.org.

The reason for reverting is: Reverting the revert.  This change is not related
to the failure on the Windows FYI bots.  The cause of the failure has been
reverted in Chromium:
https://codereview.chromium.org/2081653004/.

Powered by Google App Engine
This is Rietveld 408576698