admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for rtx with h264.

Browse Source 
BUG=chromium:500605,webrtc:5516

Review URL: https://codereview.webrtc.org/1689543005

Cr-Commit-Position: refs/heads/master@{#11570}
This commit is contained in:
stefan 2016-02-11 04:13:54 -08:00 committed by Commit bot
parent 07c51e3f79
commit 1e01660899
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/media/base/constants.cc
View File

@ -124,6 +124,7 @@ const int kDefaultUlpfecType = 117;
const int kDefaultRtxVp8PlType = 96; const int kDefaultRtxVp8PlType = 96;
const int kDefaultRtxVp9PlType = 97; const int kDefaultRtxVp9PlType = 97;
const int kDefaultRtxRedPlType = 98; const int kDefaultRtxRedPlType = 98;
const int kDefaultRtxH264PlType = 99;
const int kDefaultVideoMaxWidth = 640; const int kDefaultVideoMaxWidth = 640;
const int kDefaultVideoMaxHeight = 400; const int kDefaultVideoMaxHeight = 400;

1
webrtc/media/base/constants.h
View File

@ -157,6 +157,7 @@ extern const int kDefaultUlpfecType;
extern const int kDefaultRtxVp8PlType; extern const int kDefaultRtxVp8PlType;
extern const int kDefaultRtxVp9PlType; extern const int kDefaultRtxVp9PlType;
extern const int kDefaultRtxRedPlType; extern const int kDefaultRtxRedPlType;
extern const int kDefaultRtxH264PlType;
extern const int kDefaultVideoMaxWidth; extern const int kDefaultVideoMaxWidth;
extern const int kDefaultVideoMaxHeight; extern const int kDefaultVideoMaxHeight;

10
webrtc/media/webrtc/webrtcvideoengine2.cc
View File

@ -337,19 +337,19 @@ std::vector<VideoCodec> DefaultVideoCodecList() {
std::vector<VideoCodec> codecs; std::vector<VideoCodec> codecs;
codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType,
kVp8CodecName)); kVp8CodecName));
codecs.push_back(
VideoCodec::CreateRtxCodec(kDefaultRtxVp8PlType, kDefaultVp8PlType));
if (CodecIsInternallySupported(kVp9CodecName)) { if (CodecIsInternallySupported(kVp9CodecName)) {
codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp9PlType, codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp9PlType,
kVp9CodecName)); kVp9CodecName));
codecs.push_back(
VideoCodec::CreateRtxCodec(kDefaultRtxVp9PlType, kDefaultVp9PlType));
} }
if (CodecIsInternallySupported(kH264CodecName)) { if (CodecIsInternallySupported(kH264CodecName)) {
codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultH264PlType, codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultH264PlType,
kH264CodecName)); kH264CodecName));
}
codecs.push_back(
VideoCodec::CreateRtxCodec(kDefaultRtxVp8PlType, kDefaultVp8PlType));
if (CodecIsInternallySupported(kVp9CodecName)) {
codecs.push_back( codecs.push_back(
VideoCodec::CreateRtxCodec(kDefaultRtxVp9PlType, kDefaultVp9PlType)); VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType));
} }
codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName)); codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName));
codecs.push_back( codecs.push_back(