zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify CodecSettings helper function.

Browse Source 
Bug: webrtc:8448
Change-Id: I4413fbaeab93690047e0f464b907bfd7f078778c
Reviewed-on: https://webrtc-review.googlesource.com/47500
Reviewed-by: Michael Horowitz <mhoro@webrtc.org>
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21957}
This commit is contained in:
Rasmus Brandt
2018-02-05 09:52:47 +01:00
committed by Commit Bot
parent d0dd90be62
commit 2b304f1b2d
1 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
test/video_codec_settings.h
View File

@ -26,79 +26,52 @@ const uint16_t kTestOutlierFrameSizePercent = 250;
static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) { static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) {
memset(settings, 0, sizeof(VideoCodec)); memset(settings, 0, sizeof(VideoCodec));
settings->plType = kTestPayloadType;
settings->width = kTestWidth;
settings->height = kTestHeight;
settings->startBitrate = kTestStartBitrateKbps;
settings->maxBitrate = 0;
settings->minBitrate = kTestMinBitrateKbps;
settings->targetBitrate = 0;
settings->maxFramerate = kTestFrameRate;
settings->active = true;
settings->qpMax = 56; // See webrtcvideoengine.h.
settings->numberOfSimulcastStreams = 0;
settings->timing_frame_thresholds = {
kTestTimingFramesDelayMs, kTestOutlierFrameSizePercent,
};
switch (codec_type) { switch (codec_type) {
case kVideoCodecVP8: case kVideoCodecVP8:
strncpy(settings->plName, "VP8", 4); strncpy(settings->plName, "VP8", 4);
settings->codecType = kVideoCodecVP8; settings->codecType = kVideoCodecVP8;
// 96 to 127 dynamic payload types for video codecs.
settings->plType = kTestPayloadType;
settings->startBitrate = kTestStartBitrateKbps;
settings->minBitrate = kTestMinBitrateKbps;
settings->maxBitrate = 0;
settings->maxFramerate = kTestFrameRate;
settings->width = kTestWidth;
settings->height = kTestHeight;
settings->numberOfSimulcastStreams = 0;
settings->qpMax = 56;
settings->timing_frame_thresholds = {
kTestTimingFramesDelayMs, kTestOutlierFrameSizePercent,
};
settings->active = true;
*(settings->VP8()) = VideoEncoder::GetDefaultVp8Settings(); *(settings->VP8()) = VideoEncoder::GetDefaultVp8Settings();
return; return;
case kVideoCodecVP9: case kVideoCodecVP9:
strncpy(settings->plName, "VP9", 4); strncpy(settings->plName, "VP9", 4);
settings->codecType = kVideoCodecVP9; settings->codecType = kVideoCodecVP9;
// 96 to 127 dynamic payload types for video codecs.
settings->plType = kTestPayloadType;
settings->startBitrate = 100;
settings->minBitrate = kTestMinBitrateKbps;
settings->maxBitrate = 0;
settings->maxFramerate = kTestFrameRate;
settings->width = kTestWidth;
settings->height = kTestHeight;
settings->numberOfSimulcastStreams = 0;
settings->qpMax = 56;
settings->timing_frame_thresholds = {
kTestTimingFramesDelayMs, kTestOutlierFrameSizePercent,
};
settings->active = true;
*(settings->VP9()) = VideoEncoder::GetDefaultVp9Settings(); *(settings->VP9()) = VideoEncoder::GetDefaultVp9Settings();
return; return;
case kVideoCodecH264: case kVideoCodecH264:
strncpy(settings->plName, "H264", 5); strncpy(settings->plName, "H264", 5);
settings->codecType = kVideoCodecH264; settings->codecType = kVideoCodecH264;
// 96 to 127 dynamic payload types for video codecs. // TODO(brandtr): Set |qpMax| here, when the OpenH264 wrapper supports it.
settings->plType = kTestPayloadType;
settings->startBitrate = kTestStartBitrateKbps;
settings->minBitrate = kTestMinBitrateKbps;
settings->maxBitrate = 0;
settings->maxFramerate = kTestFrameRate;
settings->width = kTestWidth;
settings->height = kTestHeight;
settings->numberOfSimulcastStreams = 0;
settings->qpMax = 56;
settings->timing_frame_thresholds = {
kTestTimingFramesDelayMs, kTestOutlierFrameSizePercent,
};
settings->active = true;
*(settings->H264()) = VideoEncoder::GetDefaultH264Settings(); *(settings->H264()) = VideoEncoder::GetDefaultH264Settings();
return; return;
case kVideoCodecI420: case kVideoCodecI420:
strncpy(settings->plName, "I420", 5); strncpy(settings->plName, "I420", 5);
settings->codecType = kVideoCodecI420; settings->codecType = kVideoCodecI420;
// 96 to 127 dynamic payload types for video codecs.
settings->plType = kTestPayloadType;
// Bitrate needed for this size and framerate. // Bitrate needed for this size and framerate.
settings->startBitrate = settings->startBitrate =
3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2; 3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2;
settings->maxBitrate = settings->startBitrate; settings->maxBitrate = settings->startBitrate;
settings->maxFramerate = kTestFrameRate;
settings->width = kTestWidth;
settings->height = kTestHeight;
settings->minBitrate = kTestMinBitrateKbps;
settings->numberOfSimulcastStreams = 0;
settings->active = true;
return; return;
case kVideoCodecRED: case kVideoCodecRED:
case kVideoCodecULPFEC: case kVideoCodecULPFEC: