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

Issue 1984983002: Remove use of RtpHeaderExtension and clean up (Closed)

Created:
4 years, 7 months ago by Irfan
Modified:
4 years, 6 months ago
CC:
webrtc-reviews_webrtc.org, interface-changes_webrtc.org, video-team_agora.io, yujie_mao (webrtc), zhuangzesen_agora.io, zhengzhonghou_agora.io, stefan-webrtc, tlegrand-webrtc, tterriberry_mozilla.com, qiang.lu, niklas.enbom, peah-webrtc, the sun, perkj_webrtc, mflodman
Base URL:
https://chromium.googlesource.com/external/webrtc.git@master
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Remove use of RtpHeaderExtension and clean up Currently there are two structs that are identical and track extension details: webrtc::RtpExtension cricket::RtpHeaderExtension The use of the structs is mixed in the code to track the extensions being supported. This results in duplicate definition of the URI constants and there is code to convert between the two structs. Clean up to use a single RtpHeader throughout the codebase. The actual location of RtpHeader may change in future (perhaps to be located in api/). Additionally, this CL renames some of the constants to clarify Uri and Id use. BUG=webrtc:5895 Committed: https://crrev.com/6f8d686d3503aafa64a8b545f8b8fdff65e8f816 Cr-Commit-Position: refs/heads/master@{#12924}

Patch Set 1 #

Total comments: 2

Patch Set 2 : Fix video engine test #

Patch Set 3 : Addressed comments #

Total comments: 8

Patch Set 4 : Addressed Danil comments #

Total comments: 1

Patch Set 5 : Fixed nit #

Total comments: 6

Patch Set 6 : Addressed perkj nits #

Total comments: 6

Patch Set 7 : Addressed nit #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+433 lines, -504 lines) Patch
M webrtc/api/webrtcsdp.cc View 1 2 3 4 5 6 8 chunks +9 lines, -8 lines 0 comments Download
M webrtc/api/webrtcsdp_unittest.cc View 4 chunks +5 lines, -7 lines 0 comments Download
M webrtc/audio/audio_receive_stream.cc View 2 chunks +4 lines, -4 lines 0 comments Download
M webrtc/audio/audio_receive_stream_unittest.cc View 1 3 4 5 2 chunks +5 lines, -5 lines 0 comments Download
M webrtc/audio/audio_send_stream.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M webrtc/audio/audio_send_stream_unittest.cc View 1 3 4 5 2 chunks +5 lines, -5 lines 0 comments Download
M webrtc/call/bitrate_estimator_tests.cc View 8 chunks +10 lines, -10 lines 0 comments Download
M webrtc/call/rampup_tests.cc View 5 chunks +32 lines, -30 lines 0 comments Download
M webrtc/call/rtc_event_log.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M webrtc/call/rtc_event_log_unittest.cc View 1 chunk +4 lines, -5 lines 0 comments Download
M webrtc/call/rtc_event_log_unittest_helper.cc View 4 chunks +6 lines, -6 lines 0 comments Download
M webrtc/config.h View 1 2 3 4 5 1 chunk +33 lines, -11 lines 0 comments Download
M webrtc/config.cc View 1 2 1 chunk +26 lines, -16 lines 0 comments Download
M webrtc/media/base/fakemediaengine.h View 1 2 3 6 chunks +11 lines, -12 lines 0 comments Download
M webrtc/media/base/mediachannel.h View 1 2 3 4 chunks +2 lines, -41 lines 0 comments Download
M webrtc/media/base/mediaconstants.h View 1 chunk +0 lines, -28 lines 0 comments Download
M webrtc/media/base/mediaconstants.cc View 1 chunk +0 lines, -21 lines 0 comments Download
M webrtc/media/base/mediaengine.h View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/media/engine/webrtcmediaengine.h View 1 chunk +4 lines, -5 lines 0 comments Download
M webrtc/media/engine/webrtcmediaengine.cc View 1 2 3 5 chunks +16 lines, -17 lines 0 comments Download
M webrtc/media/engine/webrtcmediaengine_unittest.cc View 4 chunks +48 lines, -54 lines 0 comments Download
M webrtc/media/engine/webrtcvideoengine2.cc View 1 2 3 4 chunks +13 lines, -13 lines 0 comments Download
M webrtc/media/engine/webrtcvideoengine2_unittest.cc View 1 2 3 25 chunks +72 lines, -84 lines 0 comments Download
M webrtc/media/engine/webrtcvoiceengine.cc View 1 2 3 1 chunk +8 lines, -7 lines 0 comments Download
M webrtc/media/engine/webrtcvoiceengine_unittest.cc View 1 2 3 11 chunks +19 lines, -22 lines 0 comments Download
M webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc View 1 chunk +5 lines, -5 lines 0 comments Download
M webrtc/pc/channel.h View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M webrtc/pc/channel.cc View 1 2 3 4 2 chunks +17 lines, -3 lines 0 comments Download
M webrtc/pc/mediasession.h View 3 chunks +3 lines, -3 lines 2 comments Download
M webrtc/pc/mediasession.cc View 5 chunks +7 lines, -9 lines 0 comments Download
M webrtc/pc/mediasession_unittest.cc View 1 2 3 5 chunks +34 lines, -38 lines 0 comments Download
M webrtc/test/call_test.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/video/end_to_end_tests.cc View 1 2 3 4 5 6 7 chunks +11 lines, -11 lines 0 comments Download
M webrtc/video/replay.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M webrtc/video/rtp_stream_receiver.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/video/video_quality_test.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M webrtc/video/video_receive_stream.cc View 1 chunk +1 line, -1 line 0 comments Download
M webrtc/video/video_send_stream.cc View 1 2 3 4 5 6 1 chunk +1 line, -1 line 0 comments Download
M webrtc/video/video_send_stream_tests.cc View 4 chunks +7 lines, -7 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 64 (27 generated)
Irfan
See config.h/config.cc for the modified RtpExtension See mediachannel.h/mediaconstants.h for the removed RtpHeaderExtension and constants. Much ...
4 years, 7 months ago (2016-05-17 06:46:54 UTC) #3
danilchap
looks good: less same structures is better. I'm sorry for beeing slow with cleanup of ...
4 years, 7 months ago (2016-05-17 18:07:15 UTC) #6
Irfan
https://codereview.webrtc.org/1984983002/diff/1/webrtc/config.h File webrtc/config.h (right): https://codereview.webrtc.org/1984983002/diff/1/webrtc/config.h#newcode65 webrtc/config.h:65: static const int kAudioLevelId; On 2016/05/17 18:07:15, danilchap wrote: ...
4 years, 7 months ago (2016-05-17 18:13:39 UTC) #7
danilchap
On 2016/05/17 18:13:39, Irfan wrote: > https://codereview.webrtc.org/1984983002/diff/1/webrtc/config.h > File webrtc/config.h (right): > > https://codereview.webrtc.org/1984983002/diff/1/webrtc/config.h#newcode65 > ...
4 years, 7 months ago (2016-05-18 07:32:15 UTC) #8
pbos-webrtc
On 2016/05/18 07:32:15, danilchap wrote: > On 2016/05/17 18:13:39, Irfan wrote: > > https://codereview.webrtc.org/1984983002/diff/1/webrtc/config.h > ...
4 years, 7 months ago (2016-05-18 10:44:31 UTC) #9
Irfan
I cherry-picked this and tested on chrome with apprtc. Let me know if there is ...
4 years, 7 months ago (2016-05-18 18:01:47 UTC) #10
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/60001
4 years, 7 months ago (2016-05-18 18:02:18 UTC) #12
commit-bot: I haz the power
Dry run: No L-G-T-M from a valid reviewer yet. CQ run can only be started ...
4 years, 7 months ago (2016-05-18 18:02:21 UTC) #14
danilchap
https://codereview.webrtc.org/1984983002/diff/60001/webrtc/config.cc File webrtc/config.cc (right): https://codereview.webrtc.org/1984983002/diff/60001/webrtc/config.cc#newcode27 webrtc/config.cc:27: ss << "{uri: " << uri; question to expirienced ...
4 years, 7 months ago (2016-05-18 20:00:09 UTC) #15
Irfan
https://codereview.chromium.org/1984983002/diff/60001/webrtc/media/engine/webrtcmediaengine.cc File webrtc/media/engine/webrtcmediaengine.cc (right): https://codereview.chromium.org/1984983002/diff/60001/webrtc/media/engine/webrtcmediaengine.cc#newcode118 webrtc/media/engine/webrtcmediaengine.cc:118: result.push_back({extension.uri, extension.id}); On 2016/05/18 20:00:09, danilchap wrote: > thanks ...
4 years, 7 months ago (2016-05-19 00:56:22 UTC) #16
Stefan
lgtm
4 years, 7 months ago (2016-05-19 10:24:28 UTC) #18
danilchap
lgtm https://codereview.webrtc.org/1984983002/diff/80001/webrtc/pc/channel.cc File webrtc/pc/channel.cc (right): https://codereview.webrtc.org/1984983002/diff/80001/webrtc/pc/channel.cc#newcode48 webrtc/pc/channel.cc:48: // empty extension otherwise. nullptr otherwise.
4 years, 7 months ago (2016-05-19 12:08:55 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/100001
4 years, 7 months ago (2016-05-19 15:01:46 UTC) #22
commit-bot: I haz the power
Try jobs failed on following builders: presubmit on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/5661)
4 years, 7 months ago (2016-05-19 15:08:41 UTC) #24
Irfan
ptatcher, I need a owners LGTM. Thanks!
4 years, 7 months ago (2016-05-19 15:14:05 UTC) #26
perkj_webrtc
lgtm with the below addressed. But it might still be good to get approvals for ...
4 years, 7 months ago (2016-05-19 16:40:59 UTC) #27
Irfan
https://codereview.webrtc.org/1984983002/diff/100001/webrtc/config.h File webrtc/config.h (right): https://codereview.webrtc.org/1984983002/diff/100001/webrtc/config.h#newcode64 webrtc/config.h:64: static const char* kAudioLevelUri; On 2016/05/19 16:40:59, perkj_webrtc wrote: ...
4 years, 7 months ago (2016-05-19 16:54:58 UTC) #28
Irfan
ok will wait for pthatcher@ to take a look
4 years, 7 months ago (2016-05-19 16:56:29 UTC) #29
pthatcher1
https://codereview.webrtc.org/1984983002/diff/120001/webrtc/api/webrtcsdp.cc File webrtc/api/webrtcsdp.cc (right): https://codereview.webrtc.org/1984983002/diff/120001/webrtc/api/webrtcsdp.cc#newcode30 webrtc/api/webrtcsdp.cc:30: #include "webrtc/config.h" Can you leave a "// for RtpExtension"? ...
4 years, 7 months ago (2016-05-25 20:43:31 UTC) #30
Irfan
https://codereview.webrtc.org/1984983002/diff/120001/webrtc/api/webrtcsdp.cc File webrtc/api/webrtcsdp.cc (right): https://codereview.webrtc.org/1984983002/diff/120001/webrtc/api/webrtcsdp.cc#newcode30 webrtc/api/webrtcsdp.cc:30: #include "webrtc/config.h" On 2016/05/25 20:43:30, pthatcher1 wrote: > Can ...
4 years, 7 months ago (2016-05-25 20:55:50 UTC) #31
Irfan
Addressed nit
4 years, 7 months ago (2016-05-25 21:02:35 UTC) #33
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/140001
4 years, 7 months ago (2016-05-25 21:03:21 UTC) #35
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: bot3 on tryserver.chromium.mac (JOB_FAILED, no build URL)
4 years, 7 months ago (2016-05-25 21:04:13 UTC) #37
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/140001
4 years, 7 months ago (2016-05-25 21:56:18 UTC) #40
commit-bot: I haz the power
Try jobs failed on following builders: bot1 on tryserver.chromium.linux (JOB_FAILED, no build URL) bot2 on ...
4 years, 7 months ago (2016-05-25 21:56:49 UTC) #42
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/140001
4 years, 7 months ago (2016-05-25 21:57:30 UTC) #45
commit-bot: I haz the power
Try jobs failed on following builders: presubmit on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/5859)
4 years, 7 months ago (2016-05-25 21:59:39 UTC) #47
Irfan
I need the LGTMs here again :)
4 years, 7 months ago (2016-05-25 22:01:28 UTC) #48
Irfan
Needs owner LGTM for: webrtc/audio webrtc/call webrtc/ webrtc/video Magnus, can you help ?
4 years, 7 months ago (2016-05-26 17:33:08 UTC) #50
pthatcher1
lgtm
4 years, 7 months ago (2016-05-26 17:37:56 UTC) #51
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/140001
4 years, 7 months ago (2016-05-26 17:40:21 UTC) #53
commit-bot: I haz the power
Try jobs failed on following builders: presubmit on tryserver.webrtc (JOB_FAILED, http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/5888)
4 years, 7 months ago (2016-05-26 17:43:55 UTC) #55
mflodman
LGTM!
4 years, 7 months ago (2016-05-26 18:08:18 UTC) #56
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1984983002/140001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1984983002/140001
4 years, 7 months ago (2016-05-26 18:09:29 UTC) #58
commit-bot: I haz the power
Committed patchset #7 (id:140001)
4 years, 7 months ago (2016-05-26 18:25:03 UTC) #60
commit-bot: I haz the power
Patchset 7 (id:??) landed as https://crrev.com/6f8d686d3503aafa64a8b545f8b8fdff65e8f816 Cr-Commit-Position: refs/heads/master@{#12924}
4 years, 7 months ago (2016-05-26 18:25:14 UTC) #62
the sun
4 years, 6 months ago (2016-05-30 16:00:17 UTC) #64
Message was sent while issue was closed.
lgtm

https://codereview.chromium.org/1984983002/diff/140001/webrtc/pc/mediasession.h
File webrtc/pc/mediasession.h (right):

https://codereview.chromium.org/1984983002/diff/140001/webrtc/pc/mediasession...
webrtc/pc/mediasession.h:38: typedef std::vector<webrtc::RtpExtension>
RtpHeaderExtensions;
Is this actually used anywhere? ...

https://codereview.chromium.org/1984983002/diff/140001/webrtc/pc/mediasession...
webrtc/pc/mediasession.h:287: std::vector<webrtc::RtpExtension>
rtp_header_extensions_;
...it could be used here.

Powered by Google App Engine
This is Rietveld 408576698