Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: media/cast/test/utility/default_config.cc

Issue 839983002: Adding "target_frame_rate" variable in lieu of "max_frame_rate" for FrameReceiverConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « media/cast/test/receiver.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/test/utility/default_config.h" 5 #include "media/cast/test/utility/default_config.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "media/cast/net/cast_transport_config.h" 8 #include "media/cast/net/cast_transport_config.h"
9 9
10 namespace { 10 namespace {
(...skipping 15 matching lines...) Expand all
26 namespace cast { 26 namespace cast {
27 27
28 FrameReceiverConfig GetDefaultAudioReceiverConfig() { 28 FrameReceiverConfig GetDefaultAudioReceiverConfig() {
29 FrameReceiverConfig config; 29 FrameReceiverConfig config;
30 config.feedback_ssrc = 2; 30 config.feedback_ssrc = 2;
31 config.incoming_ssrc = 1; 31 config.incoming_ssrc = 1;
32 config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs; 32 config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
33 config.rtp_payload_type = 127; 33 config.rtp_payload_type = 127;
34 config.frequency = 48000; 34 config.frequency = 48000;
35 config.channels = 2; 35 config.channels = 2;
36 config.max_frame_rate = 100; // 10ms of signal per frame 36 config.target_frame_rate = 100; // 10ms of signal per frame
37 config.codec = media::cast::CODEC_AUDIO_OPUS; 37 config.codec = media::cast::CODEC_AUDIO_OPUS;
38 return config; 38 return config;
39 } 39 }
40 40
41 FrameReceiverConfig GetDefaultVideoReceiverConfig() { 41 FrameReceiverConfig GetDefaultVideoReceiverConfig() {
42 FrameReceiverConfig config; 42 FrameReceiverConfig config;
43 config.feedback_ssrc = 12; 43 config.feedback_ssrc = 12;
44 config.incoming_ssrc = 11; 44 config.incoming_ssrc = 11;
45 config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs; 45 config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
46 config.rtp_payload_type = 96; 46 config.rtp_payload_type = 96;
47 config.frequency = kVideoFrequency; 47 config.frequency = kVideoFrequency;
48 config.channels = 1; 48 config.channels = 1;
49 config.max_frame_rate = kDefaultMaxFrameRate; 49 config.target_frame_rate = kDefaultMaxFrameRate;
50 config.codec = media::cast::CODEC_VIDEO_VP8; 50 config.codec = media::cast::CODEC_VIDEO_VP8;
51 return config; 51 return config;
52 } 52 }
53 53
54 AudioSenderConfig GetDefaultAudioSenderConfig() { 54 AudioSenderConfig GetDefaultAudioSenderConfig() {
55 FrameReceiverConfig recv_config = GetDefaultAudioReceiverConfig(); 55 FrameReceiverConfig recv_config = GetDefaultAudioReceiverConfig();
56 AudioSenderConfig config; 56 AudioSenderConfig config;
57 config.ssrc = recv_config.incoming_ssrc; 57 config.ssrc = recv_config.incoming_ssrc;
58 config.receiver_ssrc = recv_config.feedback_ssrc; 58 config.receiver_ssrc = recv_config.feedback_ssrc;
59 config.rtp_payload_type = recv_config.rtp_payload_type; 59 config.rtp_payload_type = recv_config.rtp_payload_type;
(...skipping 12 matching lines...) Expand all
72 VideoSenderConfig config; 72 VideoSenderConfig config;
73 config.ssrc = recv_config.incoming_ssrc; 73 config.ssrc = recv_config.incoming_ssrc;
74 config.receiver_ssrc = recv_config.feedback_ssrc; 74 config.receiver_ssrc = recv_config.feedback_ssrc;
75 config.rtp_payload_type = recv_config.rtp_payload_type; 75 config.rtp_payload_type = recv_config.rtp_payload_type;
76 config.use_external_encoder = false; 76 config.use_external_encoder = false;
77 config.width = 1280; 77 config.width = 1280;
78 config.height = 720; 78 config.height = 720;
79 config.max_bitrate = 4000000; 79 config.max_bitrate = 4000000;
80 config.min_bitrate = 2000000; 80 config.min_bitrate = 2000000;
81 config.start_bitrate = 4000000; 81 config.start_bitrate = 4000000;
82 config.max_frame_rate = recv_config.max_frame_rate; 82 config.max_frame_rate = recv_config.target_frame_rate;
83 config.max_number_of_video_buffers_used = 1; 83 config.max_number_of_video_buffers_used = 1;
84 config.codec = recv_config.codec; 84 config.codec = recv_config.codec;
85 config.number_of_encode_threads = 2; 85 config.number_of_encode_threads = 2;
86 config.max_playout_delay = 86 config.max_playout_delay =
87 base::TimeDelta::FromMilliseconds(kDefaultRtpMaxDelayMs); 87 base::TimeDelta::FromMilliseconds(kDefaultRtpMaxDelayMs);
88 return config; 88 return config;
89 } 89 }
90 90
91 CreateVideoEncodeAcceleratorCallback 91 CreateVideoEncodeAcceleratorCallback
92 CreateDefaultVideoEncodeAcceleratorCallback() { 92 CreateDefaultVideoEncodeAcceleratorCallback() {
93 return base::Bind(&CreateVideoEncodeAccelerator); 93 return base::Bind(&CreateVideoEncodeAccelerator);
94 } 94 }
95 95
96 CreateVideoEncodeMemoryCallback CreateDefaultVideoEncodeMemoryCallback() { 96 CreateVideoEncodeMemoryCallback CreateDefaultVideoEncodeMemoryCallback() {
97 return base::Bind(&CreateVideoEncodeMemory); 97 return base::Bind(&CreateVideoEncodeMemory);
98 } 98 }
99 99
100 } // namespace cast 100 } // namespace cast
101 } // namespace media 101 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/test/receiver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698