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

Issue 2511933002: Reland of Stop using hardcoded payload types for video codecs (Closed)

Created:
4 years, 1 month ago by magjed_webrtc
Modified:
4 years, 1 month ago
CC:
webrtc-reviews_webrtc.org, interface-changes_webrtc.org, video-team_agora.io, yujie_mao (webrtc), zhengzhonghou_agora.io, stefan-webrtc, tterriberry_mozilla.com, qiang.lu, niklas.enbom, peah-webrtc, the sun, mflodman
Target Ref:
refs/pending/heads/master
Project:
webrtc
Visibility:
Public.

Description

Reland of Stop using hardcoded payload types for video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2513633002/ ) Reason for revert: The WebRtcBrowserTest.NegotiateUnsupportedVideoCodec test has been fixed in Chromium with the following change: function removeVideoCodec(offerSdp) { - offerSdp = offerSdp.replace('a=rtpmap:100 VP8/90000\r\n', - 'a=rtpmap:100 XVP8/90000\r\n'); + offerSdp = offerSdp.replace(/a=rtpmap:(\d+)\ VP8\/90000\r\n/, + 'a=rtpmap:$1 XVP8/90000\r\n'); return offerSdp; } Original issue's description: > Revert of Stop using hardcoded payload types for video codecs (patchset #6 id:210001 of https://codereview.webrtc.org/2493133002/ ) > > Reason for revert: > Breaks chromium.fyi test: > WebRtcBrowserTest.NegotiateUnsupportedVideoCodec > > Original issue's description: > > Stop using hardcoded payload types for video codecs > > > > This CL stops using hardcoded payload types for different video codecs > > and will dynamically assign them payload types incrementally from 96 to > > 127 instead. > > > > This CL: > > * Replaces 'std::vector<VideoCodec> DefaultVideoCodecList()' in > > webrtcvideoengine2.cc with an explicit WebRtcVideoEncoderFactory for > > internally supported software codecs instead. The purpose is to > > streamline the payload type assignment in webrtcvideoengine2.cc which > > will now have two encoder factories of the same > > WebRtcVideoEncoderFactory type; one internal and one external. > > * Removes webrtc::VideoEncoder::EncoderType and use cricket::VideoCodec > > instead. > > * Removes 'static VideoEncoder* Create(EncoderType codec_type)' and > > moves the create function to the internal encoder factory instead. > > * Removes video_encoder.cc. webrtc::VideoEncoder is now just an > > interface without any static functions. > > * The function GetSupportedCodecs in webrtcvideoengine2.cc unifies > > the internal and external codecs and assigns them payload types > > incrementally from 96 to 127. > > * Updates webrtcvideoengine2_unittest.cc and removes assumptions about > > what payload types will be used. > > > > BUG=webrtc:6677, webrtc:6705 > > R=hta@webrtc.org, ossu@webrtc.org, stefan@webrtc.org > > > > Committed: https://crrev.com/42043b95872b51321f508bf255d804ce3dff366b > > Cr-Commit-Position: refs/heads/master@{#15135} > > TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6677, webrtc:6705 > > Committed: https://crrev.com/eacbaea920797ff751ca83050d140821f5055591 > Cr-Commit-Position: refs/heads/master@{#15140} TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6677, webrtc:6705 Committed: https://crrev.com/509e4fe8e697d55bc15bd65d6129b847d8a7bb66 Cr-Commit-Position: refs/heads/master@{#15148}

Patch Set 1 #

Patch Set 2 : Remove singleton pattern for InternalEncoderFactory #

Unified diffs Side-by-side diffs Delta from patch set Stats (+509 lines, -541 lines) Patch
M webrtc/api/android/jni/androidmediaencoder_jni.cc View 1 16 chunks +26 lines, -24 lines 0 comments Download
M webrtc/api/webrtcsdp_unittest.cc View 1 1 chunk +6 lines, -5 lines 0 comments Download
M webrtc/media/BUILD.gn View 1 1 chunk +2 lines, -0 lines 0 comments Download
M webrtc/media/base/mediaconstants.h View 1 1 chunk +0 lines, -12 lines 0 comments Download
M webrtc/media/base/mediaconstants.cc View 1 1 chunk +0 lines, -12 lines 0 comments Download
A webrtc/media/engine/internalencoderfactory.h View 1 1 chunk +41 lines, -0 lines 0 comments Download
A webrtc/media/engine/internalencoderfactory.cc View 1 1 chunk +68 lines, -0 lines 0 comments Download
M webrtc/media/engine/payload_type_mapper.cc View 1 1 chunk +1 line, -24 lines 0 comments Download
M webrtc/media/engine/payload_type_mapper_unittest.cc View 1 1 chunk +2 lines, -22 lines 0 comments Download
M webrtc/media/engine/videoencodersoftwarefallbackwrapper.h View 1 3 chunks +3 lines, -2 lines 0 comments Download
M webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc View 1 3 chunks +7 lines, -5 lines 0 comments Download
M webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc View 1 1 chunk +1 line, -1 line 0 comments Download
M webrtc/media/engine/webrtcvideoengine2.h View 1 2 chunks +2 lines, -5 lines 0 comments Download
M webrtc/media/engine/webrtcvideoengine2.cc View 1 7 chunks +94 lines, -136 lines 0 comments Download
M webrtc/media/engine/webrtcvideoengine2_unittest.cc View 1 69 chunks +235 lines, -188 lines 0 comments Download
M webrtc/video/BUILD.gn View 1 1 chunk +0 lines, -1 line 0 comments Download
M webrtc/video/end_to_end_tests.cc View 1 7 chunks +10 lines, -17 lines 0 comments Download
D webrtc/video/video_encoder.cc View 1 chunk +0 lines, -67 lines 0 comments Download
M webrtc/video/video_quality_test.cc View 1 2 chunks +6 lines, -3 lines 0 comments Download
M webrtc/video/video_send_stream_tests.cc View 1 3 chunks +5 lines, -4 lines 0 comments Download
M webrtc/video_encoder.h View 1 1 chunk +0 lines, -13 lines 0 comments Download

Messages

Total messages: 7 (3 generated)
magjed_webrtc
Created Reland of Stop using hardcoded payload types for video codecs
4 years, 1 month ago (2016-11-17 20:50:13 UTC) #1
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/2511933002/270001
4 years, 1 month ago (2016-11-18 09:33:58 UTC) #3
commit-bot: I haz the power
Committed patchset #2 (id:270001)
4 years, 1 month ago (2016-11-18 09:34:16 UTC) #5
commit-bot: I haz the power
4 years, 1 month ago (2016-11-18 09:34:18 UTC) #7
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/509e4fe8e697d55bc15bd65d6129b847d8a7bb66
Cr-Commit-Position: refs/heads/master@{#15148}

Powered by Google App Engine
This is Rietveld 408576698