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

Side by Side Diff: webrtc/config.cc

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix typo, leading to failed video catpure test Created 3 years, 8 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 | « webrtc/config.h ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.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 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #include "webrtc/config.h" 10 #include "webrtc/config.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time"; 57 "http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time";
58 const int RtpExtension::kAbsSendTimeDefaultId = 3; 58 const int RtpExtension::kAbsSendTimeDefaultId = 3;
59 59
60 const char* RtpExtension::kVideoRotationUri = "urn:3gpp:video-orientation"; 60 const char* RtpExtension::kVideoRotationUri = "urn:3gpp:video-orientation";
61 const int RtpExtension::kVideoRotationDefaultId = 4; 61 const int RtpExtension::kVideoRotationDefaultId = 4;
62 62
63 const char* RtpExtension::kTransportSequenceNumberUri = 63 const char* RtpExtension::kTransportSequenceNumberUri =
64 "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01"; 64 "http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01";
65 const int RtpExtension::kTransportSequenceNumberDefaultId = 5; 65 const int RtpExtension::kTransportSequenceNumberDefaultId = 5;
66 66
67 const char* RtpExtension::kVideoContentTypeUri =
68 "http://www.webrtc.org/experiments/rtp-hdrext/video-content-type";
69 const int RtpExtension::kVideoContentTypeDefaultId = 6;
70
67 // This extension allows applications to adaptively limit the playout delay 71 // This extension allows applications to adaptively limit the playout delay
68 // on frames as per the current needs. For example, a gaming application 72 // on frames as per the current needs. For example, a gaming application
69 // has very different needs on end-to-end delay compared to a video-conference 73 // has very different needs on end-to-end delay compared to a video-conference
70 // application. 74 // application.
71 const char* RtpExtension::kPlayoutDelayUri = 75 const char* RtpExtension::kPlayoutDelayUri =
72 "http://www.webrtc.org/experiments/rtp-hdrext/playout-delay"; 76 "http://www.webrtc.org/experiments/rtp-hdrext/playout-delay";
73 const int RtpExtension::kPlayoutDelayDefaultId = 6; 77 const int RtpExtension::kPlayoutDelayDefaultId = 6;
74 78
75 const int RtpExtension::kMinId = 1; 79 const int RtpExtension::kMinId = 1;
76 const int RtpExtension::kMaxId = 14; 80 const int RtpExtension::kMaxId = 14;
77 81
78 bool RtpExtension::IsSupportedForAudio(const std::string& uri) { 82 bool RtpExtension::IsSupportedForAudio(const std::string& uri) {
79 return uri == webrtc::RtpExtension::kAudioLevelUri || 83 return uri == webrtc::RtpExtension::kAudioLevelUri ||
80 uri == webrtc::RtpExtension::kTransportSequenceNumberUri; 84 uri == webrtc::RtpExtension::kTransportSequenceNumberUri;
81 } 85 }
82 86
83 bool RtpExtension::IsSupportedForVideo(const std::string& uri) { 87 bool RtpExtension::IsSupportedForVideo(const std::string& uri) {
84 return uri == webrtc::RtpExtension::kTimestampOffsetUri || 88 return uri == webrtc::RtpExtension::kTimestampOffsetUri ||
85 uri == webrtc::RtpExtension::kAbsSendTimeUri || 89 uri == webrtc::RtpExtension::kAbsSendTimeUri ||
86 uri == webrtc::RtpExtension::kVideoRotationUri || 90 uri == webrtc::RtpExtension::kVideoRotationUri ||
87 uri == webrtc::RtpExtension::kTransportSequenceNumberUri || 91 uri == webrtc::RtpExtension::kTransportSequenceNumberUri ||
88 uri == webrtc::RtpExtension::kPlayoutDelayUri; 92 uri == webrtc::RtpExtension::kPlayoutDelayUri ||
93 uri == webrtc::RtpExtension::kVideoContentTypeUri;
89 } 94 }
90 95
91 VideoStream::VideoStream() 96 VideoStream::VideoStream()
92 : width(0), 97 : width(0),
93 height(0), 98 height(0),
94 max_framerate(-1), 99 max_framerate(-1),
95 min_bitrate_bps(-1), 100 min_bitrate_bps(-1),
96 target_bitrate_bps(-1), 101 target_bitrate_bps(-1),
97 max_bitrate_bps(-1), 102 max_bitrate_bps(-1),
98 max_qp(-1) {} 103 max_qp(-1) {}
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings( 207 VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings(
203 const VideoCodecVP9& specifics) 208 const VideoCodecVP9& specifics)
204 : specifics_(specifics) {} 209 : specifics_(specifics) {}
205 210
206 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9( 211 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9(
207 VideoCodecVP9* vp9_settings) const { 212 VideoCodecVP9* vp9_settings) const {
208 *vp9_settings = specifics_; 213 *vp9_settings = specifics_;
209 } 214 }
210 215
211 } // namespace webrtc 216 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/config.h ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698