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

Side by Side Diff: media/cast/cast_config.h

Issue 268983002: Revert of Cast: Fix two video freezing problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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/audio_sender/audio_sender_unittest.cc ('k') | media/cast/cast_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 #ifndef MEDIA_CAST_CAST_CONFIG_H_ 5 #ifndef MEDIA_CAST_CAST_CONFIG_H_
6 #define MEDIA_CAST_CAST_CONFIG_H_ 6 #define MEDIA_CAST_CAST_CONFIG_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 12 matching lines...) Expand all
23 namespace cast { 23 namespace cast {
24 24
25 enum RtcpMode { 25 enum RtcpMode {
26 kRtcpCompound, // Compound RTCP mode is described by RFC 4585. 26 kRtcpCompound, // Compound RTCP mode is described by RFC 4585.
27 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506. 27 kRtcpReducedSize, // Reduced-size RTCP mode is described by RFC 5506.
28 }; 28 };
29 29
30 struct AudioSenderConfig { 30 struct AudioSenderConfig {
31 AudioSenderConfig(); 31 AudioSenderConfig();
32 32
33 // The sender ssrc is in rtp_config.ssrc. 33 uint32 sender_ssrc;
34 uint32 incoming_feedback_ssrc; 34 uint32 incoming_feedback_ssrc;
35 35
36 int rtcp_interval; 36 int rtcp_interval;
37 std::string rtcp_c_name; 37 std::string rtcp_c_name;
38 RtcpMode rtcp_mode; 38 RtcpMode rtcp_mode;
39 39
40 transport::RtpConfig rtp_config; 40 transport::RtpConfig rtp_config;
41 41
42 bool use_external_encoder; 42 bool use_external_encoder;
43 int frequency; 43 int frequency;
44 int channels; 44 int channels;
45 int bitrate; // Set to <= 0 for "auto variable bitrate" (libopus knows best). 45 int bitrate; // Set to <= 0 for "auto variable bitrate" (libopus knows best).
46 transport::AudioCodec codec; 46 transport::AudioCodec codec;
47 }; 47 };
48 48
49 struct VideoSenderConfig { 49 struct VideoSenderConfig {
50 VideoSenderConfig(); 50 VideoSenderConfig();
51 51
52 // The sender ssrc is in rtp_config.ssrc. 52 uint32 sender_ssrc;
53 uint32 incoming_feedback_ssrc; 53 uint32 incoming_feedback_ssrc;
54 54
55 int rtcp_interval; 55 int rtcp_interval;
56 std::string rtcp_c_name; 56 std::string rtcp_c_name;
57 RtcpMode rtcp_mode; 57 RtcpMode rtcp_mode;
58 58
59 transport::RtpConfig rtp_config; 59 transport::RtpConfig rtp_config;
60 60
61 bool use_external_encoder; 61 bool use_external_encoder;
62 int width; // Incoming frames will be scaled to this size. 62 int width; // Incoming frames will be scaled to this size.
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)> 139 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)>
140 ReceiveVideoEncodeMemoryCallback; 140 ReceiveVideoEncodeMemoryCallback;
141 typedef base::Callback<void(size_t size, 141 typedef base::Callback<void(size_t size,
142 const ReceiveVideoEncodeMemoryCallback&)> 142 const ReceiveVideoEncodeMemoryCallback&)>
143 CreateVideoEncodeMemoryCallback; 143 CreateVideoEncodeMemoryCallback;
144 144
145 } // namespace cast 145 } // namespace cast
146 } // namespace media 146 } // namespace media
147 147
148 #endif // MEDIA_CAST_CAST_CONFIG_H_ 148 #endif // MEDIA_CAST_CAST_CONFIG_H_
OLDNEW
« no previous file with comments | « media/cast/audio_sender/audio_sender_unittest.cc ('k') | media/cast/cast_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698