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

Side by Side Diff: media/cast/test/sender.cc

Issue 736233003: Renaming "incoming_feedback_ssrc" to "receiver_ssrc" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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/end2end_unittest.cc ('k') | media/cast/test/utility/default_config.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // Test application that simulates a cast sender - Data can be either generated 5 // Test application that simulates a cast sender - Data can be either generated
6 // or read from a file. 6 // or read from a file.
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 media::cast::AudioSenderConfig GetAudioSenderConfig() { 65 media::cast::AudioSenderConfig GetAudioSenderConfig() {
66 media::cast::AudioSenderConfig audio_config; 66 media::cast::AudioSenderConfig audio_config;
67 67
68 audio_config.use_external_encoder = false; 68 audio_config.use_external_encoder = false;
69 audio_config.frequency = kAudioSamplingFrequency; 69 audio_config.frequency = kAudioSamplingFrequency;
70 audio_config.channels = kAudioChannels; 70 audio_config.channels = kAudioChannels;
71 audio_config.bitrate = 0; // Use Opus auto-VBR mode. 71 audio_config.bitrate = 0; // Use Opus auto-VBR mode.
72 audio_config.codec = media::cast::CODEC_AUDIO_OPUS; 72 audio_config.codec = media::cast::CODEC_AUDIO_OPUS;
73 audio_config.ssrc = 1; 73 audio_config.ssrc = 1;
74 audio_config.incoming_feedback_ssrc = 2; 74 audio_config.receiver_ssrc = 2;
75 audio_config.rtp_payload_type = 127; 75 audio_config.rtp_payload_type = 127;
76 // TODO(miu): The default in cast_defines.h is 100. Should this be 100, and 76 // TODO(miu): The default in cast_defines.h is 100. Should this be 100, and
77 // should receiver.cc's config also be 100? 77 // should receiver.cc's config also be 100?
78 audio_config.max_playout_delay = base::TimeDelta::FromMilliseconds(300); 78 audio_config.max_playout_delay = base::TimeDelta::FromMilliseconds(300);
79 return audio_config; 79 return audio_config;
80 } 80 }
81 81
82 media::cast::VideoSenderConfig GetVideoSenderConfig() { 82 media::cast::VideoSenderConfig GetVideoSenderConfig() {
83 media::cast::VideoSenderConfig video_config; 83 media::cast::VideoSenderConfig video_config;
84 84
(...skipping 13 matching lines...) Expand all
98 video_config.codec = media::cast::CODEC_VIDEO_VP8; 98 video_config.codec = media::cast::CODEC_VIDEO_VP8;
99 video_config.max_number_of_video_buffers_used = 1; 99 video_config.max_number_of_video_buffers_used = 1;
100 video_config.number_of_encode_threads = 2; 100 video_config.number_of_encode_threads = 2;
101 101
102 // Quality options. 102 // Quality options.
103 video_config.min_qp = 4; 103 video_config.min_qp = 4;
104 video_config.max_qp = 40; 104 video_config.max_qp = 40;
105 105
106 // SSRCs and payload type. Don't change them. 106 // SSRCs and payload type. Don't change them.
107 video_config.ssrc = 11; 107 video_config.ssrc = 11;
108 video_config.incoming_feedback_ssrc = 12; 108 video_config.receiver_ssrc = 12;
109 video_config.rtp_payload_type = 96; 109 video_config.rtp_payload_type = 96;
110 // TODO(miu): The default in cast_defines.h is 100. Should this be 100, and 110 // TODO(miu): The default in cast_defines.h is 100. Should this be 100, and
111 // should receiver.cc's config also be 100? 111 // should receiver.cc's config also be 100?
112 video_config.max_playout_delay = base::TimeDelta::FromMilliseconds(300); 112 video_config.max_playout_delay = base::TimeDelta::FromMilliseconds(300);
113 return video_config; 113 return video_config;
114 } 114 }
115 115
116 void UpdateCastTransportStatus( 116 void UpdateCastTransportStatus(
117 media::cast::CastTransportStatus status) { 117 media::cast::CastTransportStatus status) {
118 VLOG(1) << "Transport status: " << status; 118 VLOG(1) << "Transport status: " << status;
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 base::Passed(&audio_stats_subscriber), 402 base::Passed(&audio_stats_subscriber),
403 base::Passed(&offset_estimator)), 403 base::Passed(&offset_estimator)),
404 base::TimeDelta::FromSeconds(logging_duration_seconds)); 404 base::TimeDelta::FromSeconds(logging_duration_seconds));
405 405
406 fake_media_source->Start(cast_sender->audio_frame_input(), 406 fake_media_source->Start(cast_sender->audio_frame_input(),
407 cast_sender->video_frame_input()); 407 cast_sender->video_frame_input());
408 408
409 io_message_loop.Run(); 409 io_message_loop.Run();
410 return 0; 410 return 0;
411 } 411 }
OLDNEW
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | media/cast/test/utility/default_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698