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

Use the same QP max for tests as in production

Browse Source 
BUG=webrtc:7664

Review-Url: https://codereview.webrtc.org/2941023002
Cr-Commit-Position: refs/heads/master@{#18611}
This commit is contained in:
sprang 2017-06-15 06:34:42 -07:00 committed by Commit Bot
parent fda496a31e
commit 67561a6411
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/media/engine/webrtcvideoengine.cc
View File

@ -362,8 +362,6 @@ const int kVideoRtpBufferSize = 65536;
// duration hasn't been implemented.
static const int kNackHistoryMs = 1000;
static const int kDefaultQpMax = 56;
static const int kDefaultRtcpReceiverReportSsrc = 1;
// Minimum time interval for logging stats.

2
webrtc/media/engine/webrtcvideoengine.h
View File

@ -187,6 +187,8 @@ class WebRtcVideoChannel : public VideoMediaChannel, public webrtc::Transport {
ADAPTREASON_BANDWIDTH = 2,
};
static constexpr int kDefaultQpMax = 56;
private:
class WebRtcVideoReceiveStream;
struct VideoCodecSettings {

1
webrtc/video/BUILD.gn
View File

@ -98,6 +98,7 @@ if (rtc_include_tests) {
"../call:call_interfaces",
"../common_video",
"../logging:rtc_event_log_api",
"../media:rtc_media",
"../media:rtc_media_base",
"../modules/audio_mixer:audio_mixer_impl",
"../modules/rtp_rtcp",

5
webrtc/video/video_quality_test.cc
View File

@ -29,6 +29,7 @@
#include "webrtc/call/call.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/engine/webrtcvideoengine.h"
#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
@ -1170,7 +1171,7 @@ VideoStream VideoQualityTest::DefaultVideoStream(const Params& params) {
stream.min_bitrate_bps = params.video.min_bitrate_bps;
stream.target_bitrate_bps = params.video.target_bitrate_bps;
stream.max_bitrate_bps = params.video.max_bitrate_bps;
stream.max_qp = 52;
stream.max_qp = cricket::WebRtcVideoChannel::kDefaultQpMax;
// TODO(sprang): Can we make this less of a hack?
if (params.video.num_temporal_layers == 2) {
stream.temporal_layer_thresholds_bps.push_back(stream.target_bitrate_bps);
@ -1190,7 +1191,7 @@ VideoStream VideoQualityTest::DefaultThumbnailStream() {
stream.min_bitrate_bps = 7500;
stream.target_bitrate_bps = 37500;
stream.max_bitrate_bps = 50000;
stream.max_qp = 52;
stream.max_qp = cricket::WebRtcVideoChannel::kDefaultQpMax;
return stream;
}