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

Issue 1646253004: Split out dscp option from VideoOptions to new struct MediaChannelOptions. (Closed)

Created:
4 years, 10 months ago by nisse-webrtc
Modified:
4 years, 10 months ago
CC:
webrtc-reviews_webrtc.org
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Split out dscp option from VideoOptions to new struct MediaChannelOptions. The idea is to separate on-construction options from more mutable options. Additional video options will follow later. BUG=webrtc:5438

Patch Set 1 #

Patch Set 2 : Fix accidentally broken combined_audio_video_bwe option. #

Total comments: 9

Patch Set 3 : Delete useless constructors. Rename dscp --> enable_dscp. #

Patch Set 4 : Fix WebRtcVideoChannel2Test.TestSetDscpOptions. #

Total comments: 6

Patch Set 5 : Rename DscpValue --> MediaTypeDscpValue. #

Total comments: 11

Patch Set 6 : Address pbos' comments. #

Patch Set 7 : Rebase. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+270 lines, -160 lines) Patch
M talk/app/webrtc/statscollector_unittest.cc View 1 2 3 4 5 6 1 chunk +8 lines, -4 lines 0 comments Download
M talk/app/webrtc/webrtcsession.h View 1 2 3 4 5 6 1 chunk +1 line, -0 lines 0 comments Download
M talk/app/webrtc/webrtcsession.cc View 1 2 3 4 5 6 3 chunks +5 lines, -9 lines 0 comments Download
M talk/app/webrtc/webrtcsession_unittest.cc View 1 2 3 4 5 6 2 chunks +10 lines, -4 lines 0 comments Download
M talk/session/media/channel_unittest.cc View 1 2 3 4 5 6 2 chunks +10 lines, -4 lines 0 comments Download
M talk/session/media/channelmanager.h View 1 2 3 4 5 6 3 chunks +8 lines, -4 lines 0 comments Download
M talk/session/media/channelmanager.cc View 1 2 3 4 5 6 4 chunks +14 lines, -8 lines 0 comments Download
M talk/session/media/channelmanager_unittest.cc View 1 2 3 4 5 6 3 chunks +12 lines, -6 lines 0 comments Download
M webrtc/media/base/fakemediaengine.h View 1 2 3 4 5 6 7 chunks +40 lines, -16 lines 0 comments Download
M webrtc/media/base/mediachannel.h View 1 2 3 4 5 6 14 chunks +20 lines, -17 lines 0 comments Download
M webrtc/media/base/mediaengine.h View 1 2 3 4 5 6 2 chunks +14 lines, -8 lines 0 comments Download
M webrtc/media/base/rtpdataengine.cc View 1 2 3 4 5 6 1 chunk +4 lines, -2 lines 0 comments Download
M webrtc/media/base/videoengine_unittest.h View 1 2 3 4 5 6 1 chunk +3 lines, -1 line 0 comments Download
M webrtc/media/sctp/sctpdataengine.cc View 1 2 3 4 5 6 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/media/webrtc/nullwebrtcvideoengine.h View 1 2 3 4 5 6 1 chunk +2 lines, -1 line 0 comments Download
M webrtc/media/webrtc/webrtcvideoengine2.h View 1 2 3 4 5 6 2 chunks +6 lines, -2 lines 0 comments Download
M webrtc/media/webrtc/webrtcvideoengine2.cc View 1 2 3 4 5 6 5 chunks +15 lines, -11 lines 0 comments Download
M webrtc/media/webrtc/webrtcvideoengine2_unittest.cc View 1 2 3 4 5 6 7 chunks +35 lines, -19 lines 0 comments Download
M webrtc/media/webrtc/webrtcvoiceengine.h View 1 2 3 4 5 6 2 chunks +6 lines, -2 lines 0 comments Download
M webrtc/media/webrtc/webrtcvoiceengine.cc View 1 2 3 4 5 6 5 chunks +14 lines, -20 lines 0 comments Download
M webrtc/media/webrtc/webrtcvoiceengine_unittest.cc View 1 2 3 4 5 6 11 chunks +41 lines, -21 lines 0 comments Download

Messages

Total messages: 34 (9 generated)
nisse-webrtc
4 years, 10 months ago (2016-01-29 14:01:08 UTC) #2
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1646253004/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1646253004/1
4 years, 10 months ago (2016-01-29 14:01:35 UTC) #4
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_rel on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/linux_rel/builds/12396)
4 years, 10 months ago (2016-01-29 14:11:09 UTC) #6
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1646253004/10018 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1646253004/10018
4 years, 10 months ago (2016-01-29 15:07:24 UTC) #8
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: linux_msan on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/linux_msan/builds/7500)
4 years, 10 months ago (2016-01-29 16:00:54 UTC) #10
pbos-webrtc
https://codereview.webrtc.org/1646253004/diff/10018/talk/app/webrtc/webrtcsession_unittest.cc File talk/app/webrtc/webrtcsession_unittest.cc (right): https://codereview.webrtc.org/1646253004/diff/10018/talk/app/webrtc/webrtcsession_unittest.cc#newcode4095 talk/app/webrtc/webrtcsession_unittest.cc:4095: // TODO(nisse): To keep this test, we need a ...
4 years, 10 months ago (2016-01-29 16:22:56 UTC) #11
pbos-webrtc
https://codereview.webrtc.org/1646253004/diff/10018/talk/app/webrtc/webrtcsession_unittest.cc File talk/app/webrtc/webrtcsession_unittest.cc (right): https://codereview.webrtc.org/1646253004/diff/10018/talk/app/webrtc/webrtcsession_unittest.cc#newcode4095 talk/app/webrtc/webrtcsession_unittest.cc:4095: // TODO(nisse): To keep this test, we need a ...
4 years, 10 months ago (2016-01-29 16:23:47 UTC) #12
nisse-webrtc
https://codereview.webrtc.org/1646253004/diff/10018/talk/app/webrtc/webrtcsession_unittest.cc File talk/app/webrtc/webrtcsession_unittest.cc (right): https://codereview.webrtc.org/1646253004/diff/10018/talk/app/webrtc/webrtcsession_unittest.cc#newcode4095 talk/app/webrtc/webrtcsession_unittest.cc:4095: // TODO(nisse): To keep this test, we need a ...
4 years, 10 months ago (2016-02-01 08:29:49 UTC) #13
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1646253004/50001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1646253004/50001
4 years, 10 months ago (2016-02-01 09:43:22 UTC) #17
nisse-webrtc
Updated the testcase now, to create a new channel for each setting of the enable_dscp ...
4 years, 10 months ago (2016-02-01 09:53:29 UTC) #18
commit-bot: I haz the power
Dry run: This issue passed the CQ dry run.
4 years, 10 months ago (2016-02-01 10:43:19 UTC) #20
pbos-webrtc
https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h File talk/media/base/mediachannel.h (right): https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h#newcode100 talk/media/base/mediachannel.h:100: bool enable_dscp = false; To me it sounds like ...
4 years, 10 months ago (2016-02-01 10:57:54 UTC) #21
nisse-webrtc
https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h File talk/media/base/mediachannel.h (right): https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h#newcode100 talk/media/base/mediachannel.h:100: bool enable_dscp = false; On 2016/02/01 10:57:54, pbos-webrtc wrote: ...
4 years, 10 months ago (2016-02-01 11:26:34 UTC) #22
pbos-webrtc
https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h File talk/media/base/mediachannel.h (right): https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h#newcode390 talk/media/base/mediachannel.h:390: virtual rtc::DiffServCodePoint DscpValue() const { return rtc::DSCP_DEFAULT; } On ...
4 years, 10 months ago (2016-02-01 11:27:21 UTC) #23
nisse-webrtc
https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h File talk/media/base/mediachannel.h (right): https://codereview.webrtc.org/1646253004/diff/50001/talk/media/base/mediachannel.h#newcode390 talk/media/base/mediachannel.h:390: virtual rtc::DiffServCodePoint DscpValue() const { return rtc::DSCP_DEFAULT; } On ...
4 years, 10 months ago (2016-02-01 12:09:46 UTC) #24
pbos-webrtc
Thanks, this looks a lot better so far. https://codereview.webrtc.org/1646253004/diff/70001/talk/app/webrtc/webrtcsession_unittest.cc File talk/app/webrtc/webrtcsession_unittest.cc (right): https://codereview.webrtc.org/1646253004/diff/70001/talk/app/webrtc/webrtcsession_unittest.cc#newcode4092 talk/app/webrtc/webrtcsession_unittest.cc:4092: #if ...
4 years, 10 months ago (2016-02-01 14:44:39 UTC) #25
pthatcher1
I think we need to rethink this a little bit. Eventually, we are going to ...
4 years, 10 months ago (2016-02-01 18:20:18 UTC) #26
nisse-webrtc
On 2016/02/01 18:20:18, pthatcher1 wrote: > To explain in more detail what I am thinking: ...
4 years, 10 months ago (2016-02-02 08:11:20 UTC) #27
nisse-webrtc
https://codereview.webrtc.org/1646253004/diff/70001/talk/app/webrtc/webrtcsession_unittest.cc File talk/app/webrtc/webrtcsession_unittest.cc (right): https://codereview.webrtc.org/1646253004/diff/70001/talk/app/webrtc/webrtcsession_unittest.cc#newcode4092 talk/app/webrtc/webrtcsession_unittest.cc:4092: #if 0 On 2016/02/01 14:44:38, pbos-webrtc wrote: > Assuming ...
4 years, 10 months ago (2016-02-02 11:32:50 UTC) #28
pthatcher1
On 2016/02/02 08:11:20, nisse-webrtc wrote: > On 2016/02/01 18:20:18, pthatcher1 wrote: > > To explain ...
4 years, 10 months ago (2016-02-02 19:50:30 UTC) #29
nisse-webrtc
On 2016/02/02 19:50:30, pthatcher1 wrote: > Another option I just thought of is to make ...
4 years, 10 months ago (2016-02-03 12:34:01 UTC) #30
pthatcher1
On 2016/02/03 12:34:01, nisse-webrtc wrote: > On 2016/02/02 19:50:30, pthatcher1 wrote: > > > Another ...
4 years, 10 months ago (2016-02-03 18:31:12 UTC) #31
nisse-webrtc
On 2016/02/03 18:31:12, pthatcher1 wrote: > On 2016/02/03 12:34:01, nisse-webrtc wrote: > > To be ...
4 years, 10 months ago (2016-02-04 09:21:02 UTC) #32
pthatcher1
On 2016/02/04 09:21:02, nisse-webrtc wrote: > On 2016/02/03 18:31:12, pthatcher1 wrote: > > On 2016/02/03 ...
4 years, 10 months ago (2016-02-04 17:21:31 UTC) #33
nisse-webrtc
4 years, 10 months ago (2016-02-05 10:45:19 UTC) #34
On 2016/02/04 17:21:31, pthatcher1 wrote:
> How about "MediaConfig" or "MediaControllerConfig"? 

MediaConfig sounds ok to me.

> Pass it into
> MediaController's constructor.  Then add MediaController::config(), and call
it
> in WebRtcSession::CreateVideoChannel and pass it into the VideoChannel
> constructor and so on down?

I'll try this approach. I've made a not very careful rebase of the current cl,
but I'm going to start on a new one for the new approach.
 
> The values in it could be:
> 
> cpu_overuse_detection
> disable_video_prerender_smoothing
> dscp

And for now, enable_dscp will be a construction time config?

> And you could pass the same thing to VoiceChannel.  Some things won't make
sense
> for audio (video smoothing), but many things will (dscp, maybe
> cpu_overuse_detection).

I think I would prefer to structure MediaConfig to keep audio and video
separate, and only pass the video-relevant config down to the video channels.
We'll see if that's easy or not, it's not essential.

Powered by Google App Engine
This is Rietveld 408576698