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

Unified Diff: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm

Issue 2890513002: Revert of Split iOS sdk in to separate targets (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
deleted file mode 100644
index 90529c8636d3f90d8f00545e407708e7c9b71cfe..0000000000000000000000000000000000000000
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#import "RTCRtpCodecParameters+Private.h"
-
-#import "NSString+StdString.h"
-#import "WebRTC/RTCMediaStreamTrack.h" // For "kind" strings.
-
-#include "webrtc/base/checks.h"
-#include "webrtc/media/base/mediaconstants.h"
-
-const NSString * const kRTCRtxCodecName = @(cricket::kRtxCodecName);
-const NSString * const kRTCRedCodecName = @(cricket::kRedCodecName);
-const NSString * const kRTCUlpfecCodecName = @(cricket::kUlpfecCodecName);
-const NSString * const kRTCFlexfecCodecName = @(cricket::kFlexfecCodecName);
-const NSString * const kRTCOpusCodecName = @(cricket::kOpusCodecName);
-const NSString * const kRTCIsacCodecName = @(cricket::kIsacCodecName);
-const NSString * const kRTCL16CodecName = @(cricket::kL16CodecName);
-const NSString * const kRTCG722CodecName = @(cricket::kG722CodecName);
-const NSString * const kRTCIlbcCodecName = @(cricket::kIlbcCodecName);
-const NSString * const kRTCPcmuCodecName = @(cricket::kPcmuCodecName);
-const NSString * const kRTCPcmaCodecName = @(cricket::kPcmaCodecName);
-const NSString * const kRTCDtmfCodecName = @(cricket::kDtmfCodecName);
-const NSString * const kRTCComfortNoiseCodecName =
- @(cricket::kComfortNoiseCodecName);
-const NSString * const kVp8CodecName = @(cricket::kVp8CodecName);
-const NSString * const kVp9CodecName = @(cricket::kVp9CodecName);
-const NSString * const kH264CodecName = @(cricket::kH264CodecName);
-
-@implementation RTCRtpCodecParameters
-
-@synthesize payloadType = _payloadType;
-@synthesize name = _name;
-@synthesize kind = _kind;
-@synthesize clockRate = _clockRate;
-@synthesize numChannels = _numChannels;
-
-- (instancetype)init {
- return [super init];
-}
-
-- (instancetype)initWithNativeParameters:
- (const webrtc::RtpCodecParameters &)nativeParameters {
- if (self = [self init]) {
- _payloadType = nativeParameters.payload_type;
- _name = [NSString stringForStdString:nativeParameters.name];
- switch (nativeParameters.kind) {
- case cricket::MEDIA_TYPE_AUDIO:
- _kind = kRTCMediaStreamTrackKindAudio;
- break;
- case cricket::MEDIA_TYPE_VIDEO:
- _kind = kRTCMediaStreamTrackKindVideo;
- break;
- case cricket::MEDIA_TYPE_DATA:
- RTC_NOTREACHED();
- break;
- }
- if (nativeParameters.clock_rate) {
- _clockRate = [NSNumber numberWithInt:*nativeParameters.clock_rate];
- }
- if (nativeParameters.num_channels) {
- _numChannels = [NSNumber numberWithInt:*nativeParameters.num_channels];
- }
- }
- return self;
-}
-
-- (webrtc::RtpCodecParameters)nativeParameters {
- webrtc::RtpCodecParameters parameters;
- parameters.payload_type = _payloadType;
- parameters.name = [NSString stdStringForString:_name];
- // NSString pointer comparison is safe here since "kind" is readonly and only
- // populated above.
- if (_kind == kRTCMediaStreamTrackKindAudio) {
- parameters.kind = cricket::MEDIA_TYPE_AUDIO;
- } else if (_kind == kRTCMediaStreamTrackKindVideo) {
- parameters.kind = cricket::MEDIA_TYPE_VIDEO;
- } else {
- RTC_NOTREACHED();
- }
- if (_clockRate != nil) {
- parameters.clock_rate = rtc::Optional<int>(_clockRate.intValue);
- }
- if (_numChannels != nil) {
- parameters.num_channels = rtc::Optional<int>(_numChannels.intValue);
- }
- return parameters;
-}
-
-@end

Powered by Google App Engine
This is Rietveld 408576698