webrtc/modules/video_coding/main/source/codec_database.cc - Issue 1215603003: Remove VCM_*_PAYLOAD_TYPE constants.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/main/source/codec_database.cc

Issue 1215603003: Remove VCM_*_PAYLOAD_TYPE constants. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/video_coding/main/interface/video_coding_defines.h ('k') | webrtc/modules/video_coding/main/test/video_rtp_play.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/main/source/codec_database.cc

diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc

index 49a018b4eb6bd3143354d25a8645f4472a4663f1..5f899368b172e6d4d087a5895e0ec3a4e03cca4c 100644

--- a/webrtc/modules/video_coding/main/source/codec_database.cc

+++ b/webrtc/modules/video_coding/main/source/codec_database.cc

@@ -31,6 +31,7 @@

namespace {

const size_t kDefaultPayloadSize = 1440;

+const uint8_t kDefaultPayloadType = 100;

}

namespace webrtc {

@@ -140,7 +141,7 @@ bool VCMCodecDataBase::Codec(int list_id,

strncpy(settings->plName, "VP8", 4);

settings->codecType = kVideoCodecVP8;

// 96 to 127 dynamic payload types for video codecs.

- settings->plType = VCM_VP8_PAYLOAD_TYPE;

+ settings->plType = kDefaultPayloadType;

settings->startBitrate = kDefaultStartBitrateKbps;

settings->minBitrate = VCM_MIN_BITRATE;

settings->maxBitrate = 0;

@@ -158,7 +159,7 @@ bool VCMCodecDataBase::Codec(int list_id,

strncpy(settings->plName, "VP9", 4);

settings->codecType = kVideoCodecVP9;

// 96 to 127 dynamic payload types for video codecs.

- settings->plType = VCM_VP9_PAYLOAD_TYPE;

+ settings->plType = kDefaultPayloadType;

settings->startBitrate = 100;

settings->minBitrate = VCM_MIN_BITRATE;

settings->maxBitrate = 0;

@@ -176,7 +177,7 @@ bool VCMCodecDataBase::Codec(int list_id,

strncpy(settings->plName, "H264", 5);

settings->codecType = kVideoCodecH264;

// 96 to 127 dynamic payload types for video codecs.

- settings->plType = VCM_H264_PAYLOAD_TYPE;

+ settings->plType = kDefaultPayloadType;

settings->startBitrate = kDefaultStartBitrateKbps;

settings->minBitrate = VCM_MIN_BITRATE;

settings->maxBitrate = 0;

@@ -194,7 +195,7 @@ bool VCMCodecDataBase::Codec(int list_id,

strncpy(settings->plName, "I420", 5);

settings->codecType = kVideoCodecI420;

// 96 to 127 dynamic payload types for video codecs.

- settings->plType = VCM_I420_PAYLOAD_TYPE;

+ settings->plType = kDefaultPayloadType;

// Bitrate needed for this size and framerate.

settings->startBitrate = 3 * VCM_DEFAULT_CODEC_WIDTH *

VCM_DEFAULT_CODEC_HEIGHT * 8 *