1204448a68
This reverts commit 4954a77cf81e6793245f52d485834acd3e6eab1c. Reason for revert: Breaks downstream build which was depending on the name "kVideoCodecStereo". Will need to do some sort of trickery to make this change without breaking the relevant code. Sorry. :( Original change's description: > Reland "Rename stereo video codec to multiplex" > > This is a reland of bbdabe50db0cf09f6007dda12a6476dc4602b174. > This was reverted because of breaking internal build. I contacted sheriff > and looked at logs but cannot find anything related to this CL. This was landed > with #3850 build which caused exception, but 3847-3855 seem to all have failed. > I am relanding to see if it will work this time or it will give some related > error message that can guide me. > > Original change's description: > > Rename stereo video codec to multiplex > > > > This CL only does the rename from"stereo" to multiplex". With this we have a > > better name that doesn't clash with audio's usage of stereo. > > > > Bug: webrtc:7671 > > Change-Id: Iebc3fc20839025f1bc8bcf0e16141bf9744ef652 > > Reviewed-on: https://webrtc-review.googlesource.com/43242 > > Commit-Queue: Emircan Uysaler <emircan@webrtc.org> > > Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#21769} > > TBR=niklas.enbom@webrtc.org > > Bug: webrtc:7671 > Change-Id: I5934abad1ce28acf02842ea8ee2af7768a826eb8 > Reviewed-on: https://webrtc-review.googlesource.com/44520 > Reviewed-by: Emircan Uysaler <emircan@webrtc.org> > Commit-Queue: Emircan Uysaler <emircan@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#21780} TBR=sprang@webrtc.org,niklas.enbom@webrtc.org,qiangchen@chromium.org,emircan@webrtc.org Change-Id: I0a71327c2ddfdd030b1e058cd6a41b1689836719 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7671 Reviewed-on: https://webrtc-review.googlesource.com/44621 Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21783}
117 lines
4.2 KiB
C++
117 lines
4.2 KiB
C++
/*
|
|
* Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#ifndef TEST_VIDEO_CODEC_SETTINGS_H_
|
|
#define TEST_VIDEO_CODEC_SETTINGS_H_
|
|
|
|
#include "api/video_codecs/video_encoder.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
const uint16_t kTestWidth = 352;
|
|
const uint16_t kTestHeight = 288;
|
|
const uint32_t kTestFrameRate = 30;
|
|
const unsigned int kTestMinBitrateKbps = 30;
|
|
const unsigned int kTestStartBitrateKbps = 300;
|
|
const uint8_t kTestPayloadType = 100;
|
|
const int64_t kTestTimingFramesDelayMs = 200;
|
|
const uint16_t kTestOutlierFrameSizePercent = 250;
|
|
|
|
static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) {
|
|
memset(settings, 0, sizeof(VideoCodec));
|
|
switch (codec_type) {
|
|
case kVideoCodecVP8:
|
|
strncpy(settings->plName, "VP8", 4);
|
|
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();
|
|
return;
|
|
case kVideoCodecVP9:
|
|
strncpy(settings->plName, "VP9", 4);
|
|
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();
|
|
return;
|
|
case kVideoCodecH264:
|
|
strncpy(settings->plName, "H264", 5);
|
|
settings->codecType = kVideoCodecH264;
|
|
// 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->H264()) = VideoEncoder::GetDefaultH264Settings();
|
|
return;
|
|
case kVideoCodecI420:
|
|
strncpy(settings->plName, "I420", 5);
|
|
settings->codecType = kVideoCodecI420;
|
|
// 96 to 127 dynamic payload types for video codecs.
|
|
settings->plType = kTestPayloadType;
|
|
// Bitrate needed for this size and framerate.
|
|
settings->startBitrate =
|
|
3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2;
|
|
settings->maxBitrate = settings->startBitrate;
|
|
settings->maxFramerate = kTestFrameRate;
|
|
settings->width = kTestWidth;
|
|
settings->height = kTestHeight;
|
|
settings->minBitrate = kTestMinBitrateKbps;
|
|
settings->numberOfSimulcastStreams = 0;
|
|
settings->active = true;
|
|
return;
|
|
case kVideoCodecRED:
|
|
case kVideoCodecULPFEC:
|
|
case kVideoCodecFlexfec:
|
|
case kVideoCodecStereo:
|
|
case kVideoCodecGeneric:
|
|
case kVideoCodecUnknown:
|
|
RTC_NOTREACHED();
|
|
return;
|
|
}
|
|
}
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_VIDEO_CODEC_SETTINGS_H_
|