summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormiu <miu@chromium.org>2015-05-06 12:09:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-06 19:10:20 +0000
commit7ee008a9ba94df47180d2733afec47238dc999f7 (patch)
tree8d5c7824b7550c5bd556880a4563d74e7008eb39 /media
parent7ede0044fffe3a96a96583cfbabbf3640e0c12cc (diff)
downloadchromium_src-7ee008a9ba94df47180d2733afec47238dc999f7.zip
chromium_src-7ee008a9ba94df47180d2733afec47238dc999f7.tar.gz
chromium_src-7ee008a9ba94df47180d2733afec47238dc999f7.tar.bz2
[Cast] Set kDefaultMaxQp to 63
Research shows there is no reason to artifically limit the quality setting of the VP8 encoder. Allowing a quantizer of 63 may allow Cast Streaming to perform better in bandwidth-constrained environments when dynamic bitrate control is enabled. Minor test clean-up in video_sender_unittest.cc. BUG=156767 Review URL: https://codereview.chromium.org/1125853003 Cr-Commit-Position: refs/heads/master@{#328574}
Diffstat (limited to 'media')
-rw-r--r--media/cast/cast_defines.h2
-rw-r--r--media/cast/sender/video_sender_unittest.cc13
2 files changed, 2 insertions, 13 deletions
diff --git a/media/cast/cast_defines.h b/media/cast/cast_defines.h
index 582729e..9bf2f44 100644
--- a/media/cast/cast_defines.h
+++ b/media/cast/cast_defines.h
@@ -68,7 +68,7 @@ enum OperationalStatus {
enum DefaultSettings {
kDefaultAudioEncoderBitrate = 0, // This means "auto," and may mean VBR.
kDefaultAudioSamplingRate = 48000,
- kDefaultMaxQp = 56,
+ kDefaultMaxQp = 63,
kDefaultMinQp = 4,
kDefaultMaxFrameRate = 30,
kDefaultNumberOfVideoBuffers = 1,
diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc
index 6da16bd..1dbccf0 100644
--- a/media/cast/sender/video_sender_unittest.cc
+++ b/media/cast/sender/video_sender_unittest.cc
@@ -163,19 +163,8 @@ class VideoSenderTest : public ::testing::Test {
// If |external| is true then external video encoder (VEA) is used.
// |expect_init_sucess| is true if initialization is expected to succeed.
void InitEncoder(bool external, bool expect_init_success) {
- VideoSenderConfig video_config;
- video_config.ssrc = 1;
- video_config.receiver_ssrc = 2;
- video_config.rtp_payload_type = 127;
+ VideoSenderConfig video_config = GetDefaultVideoSenderConfig();
video_config.use_external_encoder = external;
- video_config.max_bitrate = 5000000;
- video_config.min_bitrate = 1000000;
- video_config.start_bitrate = 1000000;
- video_config.max_qp = 56;
- video_config.min_qp = 0;
- video_config.max_frame_rate = 30;
- video_config.max_number_of_video_buffers_used = 1;
- video_config.codec = CODEC_VIDEO_VP8;
ASSERT_EQ(operational_status_, STATUS_UNINITIALIZED);