Revert "Simple Default ObjC video codec factories."

This reverts commit 30915a742d86df55ac5c04501c0e8104675a612e.

Reason for revert: Breaks downstream.

Original change's description:
> Simple Default ObjC video codec factories.
> 
> Move the simple video encoder/decoder factory from AppRTCMobile into the
> public API so users who don't have special requirements for video codecs
> can easily get started.
> 
> Also clean up the API a little.
> 
> This CL replaces the more flexible default factories in
> https://webrtc-review.googlesource.com/c/src/+/7741 and clients that
> want to implement their own codecs will have to supply their own
> encoder/decoder factories as well. The benefits of the approach in
> this CL are a simpler API and less effects on the rest of the code.
> 
> Bug: None
> Change-Id: I4ed94090d778b4fc38b49864de1d4de4ff125d6a
> Reviewed-on: https://webrtc-review.googlesource.com/15141
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> Commit-Queue: Anders Carlsson <andersc@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#20441}

TBR=magjed@webrtc.org,andersc@webrtc.org,kthelgason@webrtc.org

Change-Id: I3d4395cc9667e6c6cdb33a3b0f5c5fb5bfde9028
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/15182
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20446}

examples/BUILD.gn

@@ -233,6 +233,10 @@ if (is_ios || (is_mac && target_cpu != "x86")) {
       "objc/AppRTCMobile/ARDTURNClient+Internal.h",
       "objc/AppRTCMobile/ARDTURNClient.h",
       "objc/AppRTCMobile/ARDTURNClient.m",
+      "objc/AppRTCMobile/ARDVideoDecoderFactory.h",
+      "objc/AppRTCMobile/ARDVideoDecoderFactory.m",
+      "objc/AppRTCMobile/ARDVideoEncoderFactory.h",
+      "objc/AppRTCMobile/ARDVideoEncoderFactory.m",
       "objc/AppRTCMobile/ARDWebSocketChannel.h",
       "objc/AppRTCMobile/ARDWebSocketChannel.m",
       "objc/AppRTCMobile/RTCIceCandidate+JSON.h",

examples/objc/AppRTCMobile/ARDAppClient.m

@@ -22,7 +22,6 @@
 #import "WebRTC/RTCPeerConnectionFactory.h"
 #import "WebRTC/RTCRtpSender.h"
 #import "WebRTC/RTCTracing.h"
-#import "WebRTC/RTCVideoCodecFactory.h"
 #import "WebRTC/RTCVideoTrack.h"
 
 #import "ARDAppEngineClient.h"
@@ -33,6 +32,8 @@
 #import "ARDSignalingMessage.h"
 #import "ARDTURNClient+Internal.h"
 #import "ARDUtilities.h"
+#import "ARDVideoDecoderFactory.h"
+#import "ARDVideoEncoderFactory.h"
 #import "ARDWebSocketChannel.h"
 #import "RTCIceCandidate+JSON.h"
 #import "RTCSessionDescription+JSON.h"
@@ -220,8 +221,8 @@ static int const kKbpsMultiplier = 1000;
   _isLoopback = isLoopback;
   self.state = kARDAppClientStateConnecting;
 
-  RTCDefaultVideoDecoderFactory *decoderFactory = [[RTCDefaultVideoDecoderFactory alloc] init];
+  ARDVideoDecoderFactory *decoderFactory = [[ARDVideoDecoderFactory alloc] init];
-  RTCDefaultVideoEncoderFactory *encoderFactory = [[RTCDefaultVideoEncoderFactory alloc] init];
+  ARDVideoEncoderFactory *encoderFactory = [[ARDVideoEncoderFactory alloc] init];
   encoderFactory.preferredCodec = [settings currentVideoCodecSettingFromStore];
   _factory = [[RTCPeerConnectionFactory alloc] initWithEncoderFactory:encoderFactory
                                                        decoderFactory:decoderFactory];

examples/objc/AppRTCMobile/ARDSettingsModel.m

@@ -10,9 +10,9 @@
 
 #import "ARDSettingsModel+Private.h"
 #import "ARDSettingsStore.h"
+#import "ARDVideoEncoderFactory.h"
 #import "WebRTC/RTCCameraVideoCapturer.h"
 #import "WebRTC/RTCMediaConstraints.h"
-#import "WebRTC/RTCVideoCodecFactory.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -66,7 +66,9 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (NSArray<RTCVideoCodecInfo *> *)availableVideoCodecs {
-  return [RTCDefaultVideoEncoderFactory supportedCodecs];
+  NSArray<RTCVideoCodecInfo *> *supportedCodecs =
+      [[[ARDVideoEncoderFactory alloc] init] supportedCodecs];
+  return supportedCodecs;
 }
 
 - (RTCVideoCodecInfo *)currentVideoCodecSettingFromStore {

examples/objc/AppRTCMobile/ARDVideoDecoderFactory.h

@@ -0,0 +1,16 @@
+/*
+ *  Copyright 2017 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 <Foundation/Foundation.h>
+#import "WebRTC/RTCVideoCodecFactory.h"
+
+@interface ARDVideoDecoderFactory : NSObject<RTCVideoDecoderFactory>
+
+@end

examples/objc/AppRTCMobile/ARDVideoDecoderFactory.m

@@ -8,20 +8,20 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import "WebRTC/RTCVideoCodecFactory.h"
+#import "ARDVideoDecoderFactory.h"
 
 #import "WebRTC/RTCVideoCodecH264.h"
 #import "WebRTC/RTCVideoDecoderVP8.h"
 #import "WebRTC/RTCVideoDecoderVP9.h"
 
-@implementation RTCDefaultVideoDecoderFactory
+@implementation ARDVideoDecoderFactory
 
 - (id<RTCVideoDecoder>)createDecoder:(RTCVideoCodecInfo *)info {
-  if ([info.name isEqualToString:kRTCVideoCodecH264Name]) {
+  if ([info.name isEqualToString:@"H264"]) {
     return [[RTCVideoDecoderH264 alloc] init];
-  } else if ([info.name isEqualToString:kRTCVideoCodecVp8Name]) {
+  } else if ([info.name isEqualToString:@"VP8"]) {
     return [RTCVideoDecoderVP8 vp8Decoder];
-  } else if ([info.name isEqualToString:kRTCVideoCodecVp9Name]) {
+  } else if ([info.name isEqualToString:@"VP9"]) {
     return [RTCVideoDecoderVP9 vp9Decoder];
   }
 
@@ -30,9 +30,9 @@
 
 - (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
   return @[
-    [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name],
+    [[RTCVideoCodecInfo alloc] initWithName:@"H264" parameters:nil],
-    [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp8Name],
+    [[RTCVideoCodecInfo alloc] initWithName:@"VP8" parameters:nil],
-    [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp9Name]
+    [[RTCVideoCodecInfo alloc] initWithName:@"VP9" parameters:nil]
   ];
 }
 

examples/objc/AppRTCMobile/ARDVideoEncoderFactory.h

@@ -0,0 +1,18 @@
+/*
+ *  Copyright 2017 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 <Foundation/Foundation.h>
+#import "WebRTC/RTCVideoCodecFactory.h"
+
+@interface ARDVideoEncoderFactory : NSObject<RTCVideoEncoderFactory>
+
+@property(nonatomic, retain) RTCVideoCodecInfo* preferredCodec;
+
+@end

examples/objc/AppRTCMobile/ARDVideoEncoderFactory.m

@@ -8,43 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#import "WebRTC/RTCVideoCodecFactory.h"
+#import "ARDVideoEncoderFactory.h"
 
+#import "ARDSettingsModel.h"
 #import "WebRTC/RTCVideoCodec.h"
 #import "WebRTC/RTCVideoCodecH264.h"
 #import "WebRTC/RTCVideoEncoderVP8.h"
 #import "WebRTC/RTCVideoEncoderVP9.h"
 
-@implementation RTCDefaultVideoEncoderFactory
+@implementation ARDVideoEncoderFactory
 
 @synthesize preferredCodec;
 
-+ (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
-  NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
-    @"profile-level-id" : kRTCLevel31ConstrainedHigh,
-    @"level-asymmetry-allowed" : @"1",
-    @"packetization-mode" : @"1",
-  };
-  RTCVideoCodecInfo *constrainedHighInfo =
-      [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name
-                                   parameters:constrainedHighParams];
-
-  NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
-    @"profile-level-id" : kRTCLevel31ConstrainedBaseline,
-    @"level-asymmetry-allowed" : @"1",
-    @"packetization-mode" : @"1",
-  };
-  RTCVideoCodecInfo *constrainedBaselineInfo =
-      [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name
-                                   parameters:constrainedBaselineParams];
-
-  RTCVideoCodecInfo *vp8Info = [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp8Name];
-
-  RTCVideoCodecInfo *vp9Info = [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp9Name];
-
-  return @[ constrainedHighInfo, constrainedBaselineInfo, vp8Info, vp9Info ];
-}
-
 - (id<RTCVideoEncoder>)createEncoder:(RTCVideoCodecInfo *)info {
   if ([info.name isEqualToString:kRTCVideoCodecH264Name]) {
     return [[RTCVideoEncoderH264 alloc] initWithCodecInfo:info];
@@ -58,7 +33,35 @@
 }
 
 - (NSArray<RTCVideoCodecInfo *> *)supportedCodecs {
-  NSMutableArray<RTCVideoCodecInfo *> *codecs = [[[self class] supportedCodecs] mutableCopy];
+  NSMutableArray<RTCVideoCodecInfo *> *codecs = [NSMutableArray array];
+
+  NSDictionary<NSString *, NSString *> *constrainedHighParams = @{
+    @"profile-level-id" : kRTCLevel31ConstrainedHigh,
+    @"level-asymmetry-allowed" : @"1",
+    @"packetization-mode" : @"1",
+  };
+  RTCVideoCodecInfo *constrainedHighInfo =
+      [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name
+                                   parameters:constrainedHighParams];
+  [codecs addObject:constrainedHighInfo];
+
+  NSDictionary<NSString *, NSString *> *constrainedBaselineParams = @{
+    @"profile-level-id" : kRTCLevel31ConstrainedBaseline,
+    @"level-asymmetry-allowed" : @"1",
+    @"packetization-mode" : @"1",
+  };
+  RTCVideoCodecInfo *constrainedBaselineInfo =
+      [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecH264Name
+                                   parameters:constrainedBaselineParams];
+  [codecs addObject:constrainedBaselineInfo];
+
+  RTCVideoCodecInfo *vp8Info =
+      [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp8Name parameters:nil];
+  [codecs addObject:vp8Info];
+
+  RTCVideoCodecInfo *vp9Info =
+      [[RTCVideoCodecInfo alloc] initWithName:kRTCVideoCodecVp9Name parameters:nil];
+  [codecs addObject:vp9Info];
 
   NSMutableArray<RTCVideoCodecInfo *> *orderedCodecs = [NSMutableArray array];
   NSUInteger index = [codecs indexOfObject:self.preferredCodec];

sdk/BUILD.gn

@@ -397,8 +397,6 @@ if (is_ios || is_mac) {
         "objc/Framework/Classes/PeerConnection/RTCDataChannel.mm",
         "objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h",
         "objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm",
-        "objc/Framework/Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m",
-        "objc/Framework/Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m",
         "objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm",
         "objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h",
         "objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm",

sdk/objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h

@@ -33,22 +33,4 @@ RTC_EXPORT
 
 @end
 
-#pragma mark - Default factories
-
-/** These codec factories include support for all codecs bundled with WebRTC. If using custom
- *  codecs, create custom implementations of RTCVideoEncoderFactory and RTCVideoDecoderFactory.
- */
-RTC_EXPORT
-@interface RTCDefaultVideoEncoderFactory : NSObject <RTCVideoEncoderFactory>
-
-@property(nonatomic, retain) RTCVideoCodecInfo *preferredCodec;
-
-+ (NSArray<RTCVideoCodecInfo *> *)supportedCodecs;
-
-@end
-
-RTC_EXPORT
-@interface RTCDefaultVideoDecoderFactory : NSObject <RTCVideoDecoderFactory>
-@end
-
 NS_ASSUME_NONNULL_END