diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-15 09:35:06 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-15 09:35:06 +0000 |
| commit | 7e68693b6862ad571ea422828b12f102aeea0a15 (patch) | |
| tree | 087da2edc6172ae079fc18e92737910a97d006e1 /common_types.h | |
| parent | 3362d4237f3f92c15a275878061ce02f28b204c2 (diff) | |
| download | webrtc-7e68693b6862ad571ea422828b12f102aeea0a15.tar.gz | |
Add ToString() to VideoSendStream::Config.
Adds ToString() to subsequent parts as well as a common.gyp to define
ToString() methods for config.h. VideoStream is also moved to config.h.
BUG=3171
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/11329004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6170 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'common_types.h')
| -rw-r--r-- | common_types.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/common_types.h b/common_types.h index 2d93102d..6892a83f 100644 --- a/common_types.h +++ b/common_types.h @@ -13,6 +13,8 @@ #include <stddef.h> #include <string.h> + +#include <string> #include <vector> #include "webrtc/typedefs.h" @@ -781,30 +783,6 @@ struct RTPHeader { RTPHeaderExtension extension; }; -struct VideoStream { - VideoStream() - : width(0), - height(0), - max_framerate(-1), - min_bitrate_bps(-1), - target_bitrate_bps(-1), - max_bitrate_bps(-1), - max_qp(-1) {} - - size_t width; - size_t height; - int max_framerate; - - int min_bitrate_bps; - int target_bitrate_bps; - int max_bitrate_bps; - - int max_qp; - - // Bitrate thresholds for enabling additional temporal layers. - std::vector<int> temporal_layers; -}; - } // namespace webrtc #endif // WEBRTC_COMMON_TYPES_H_ |