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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix android CE 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 10
(...skipping 23 matching lines...) Expand all
34 if (extension == RtpExtension::kAudioLevelUri) 34 if (extension == RtpExtension::kAudioLevelUri)
35 return kRtpExtensionAudioLevel; 35 return kRtpExtensionAudioLevel;
36 if (extension == RtpExtension::kAbsSendTimeUri) 36 if (extension == RtpExtension::kAbsSendTimeUri)
37 return kRtpExtensionAbsoluteSendTime; 37 return kRtpExtensionAbsoluteSendTime;
38 if (extension == RtpExtension::kVideoRotationUri) 38 if (extension == RtpExtension::kVideoRotationUri)
39 return kRtpExtensionVideoRotation; 39 return kRtpExtensionVideoRotation;
40 if (extension == RtpExtension::kTransportSequenceNumberUri) 40 if (extension == RtpExtension::kTransportSequenceNumberUri)
41 return kRtpExtensionTransportSequenceNumber; 41 return kRtpExtensionTransportSequenceNumber;
42 if (extension == RtpExtension::kPlayoutDelayUri) 42 if (extension == RtpExtension::kPlayoutDelayUri)
43 return kRtpExtensionPlayoutDelay; 43 return kRtpExtensionPlayoutDelay;
44 if (extension == RtpExtension::kVideoContentTypeUri)
45 return kRtpExtensionVideoContentType;
44 RTC_NOTREACHED() << "Looking up unsupported RTP extension."; 46 RTC_NOTREACHED() << "Looking up unsupported RTP extension.";
45 return kRtpExtensionNone; 47 return kRtpExtensionNone;
46 } 48 }
47 49
48 RtpRtcp::Configuration::Configuration() 50 RtpRtcp::Configuration::Configuration()
49 : receive_statistics(NullObjectReceiveStatistics()) {} 51 : receive_statistics(NullObjectReceiveStatistics()) {}
50 52
51 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { 53 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
52 if (configuration.clock) { 54 if (configuration.clock) {
53 return new ModuleRtpRtcpImpl(configuration); 55 return new ModuleRtpRtcpImpl(configuration);
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 StreamDataCountersCallback* 889 StreamDataCountersCallback*
888 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 890 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
889 return rtp_sender_->GetRtpStatisticsCallback(); 891 return rtp_sender_->GetRtpStatisticsCallback();
890 } 892 }
891 893
892 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( 894 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation(
893 const BitrateAllocation& bitrate) { 895 const BitrateAllocation& bitrate) {
894 rtcp_sender_.SetVideoBitrateAllocation(bitrate); 896 rtcp_sender_.SetVideoBitrateAllocation(bitrate);
895 } 897 }
896 } // namespace webrtc 898 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698