iOS AppRTCMobile: Fix SDP video codec reordering for multiple H264 profiles

webrtc/examples/objc/AppRTCMobile/tests/ARDAppClientTest.mm

 /*
  *  Copyright 2014 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.
  */
 
@@ skipping 336 matching lines @@
   [self waitForExpectationsWithTimeout:20 handler:^(NSError *error) {
     if (error) {
       EXPECT_TRUE(0);
     }
   }];
 }
 
 @end
 
 @interface ARDSDPUtilsTest : ARDTestCase
-- (void)testPreferVideoCodec;
+- (void)testPreferVideoCodec:(NSString *)codec
+                         sdp:(NSString *)sdp
+                 expectedSdp:(NSString *)expectedSdp;
 @end
 
 @implementation ARDSDPUtilsTest
 
-- (void)testPreferVideoCodec {
-  NSString *sdp = @("m=video 9 RTP/SAVPF 100 116 117 96 120\n"
-                    "a=rtpmap:120 H264/90000\n");
-  NSString *expectedSdp = @("m=video 9 RTP/SAVPF 120 100 116 117 96\n"
-                            "a=rtpmap:120 H264/90000\n");
+- (void)testPreferVideoCodec:(NSString *)codec
+                         sdp:(NSString *)sdp
+                 expectedSdp:(NSString *)expectedSdp {
   RTCSessionDescription* desc =
       [[RTCSessionDescription alloc] initWithType:RTCSdpTypeOffer sdp:sdp];
   RTCSessionDescription *h264Desc =

[denicija-google, 2016/11/22 15:05:30]

Now that the test is more generic, perhaps this should be renamed from h264Desc?

[magjed_webrtc, 2016/11/22 15:14:28]

Thanks, missed that.

       [ARDSDPUtils descriptionForDescription:desc
-                         preferredVideoCodec:@"H264"];
+                         preferredVideoCodec:codec];
   EXPECT_TRUE([h264Desc.description rangeOfString:expectedSdp].location != NSNotFound);
 }
 
 @end
 
 class SignalingTest : public ::testing::Test {
  protected:
   static void SetUpTestCase() {
     rtc::InitializeSSL();
   }
@@ skipping 12 matching lines @@
 #if !TARGET_IPHONE_SIMULATOR
 // Expected fail on iOS Simulator due to no camera support
 TEST_F(SignalingTest, SessionLocalVideoCallbackTest) {
   @autoreleasepool {
     ARDAppClientTest *test = [[ARDAppClientTest alloc] init];
     [test testSessionShouldGetLocalVideoTrackCallback];
   }
 }
 #endif
 
-TEST_F(SignalingTest, SDPTest) {
+TEST_F(SignalingTest, SdpH264Test) {
   @autoreleasepool {
     ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init];
-    [test testPreferVideoCodec];
+    NSString *sdp = @("m=video 9 RTP/SAVPF 100 116 117 96 120 97\n"
+                      "a=rtpmap:120 H264/90000\n"
+                      "a=rtpmap:97 H264/90000\n");
+    NSString *expectedSdp = @("m=video 9 RTP/SAVPF 120 97 100 116 117 96\n"
+                              "a=rtpmap:120 H264/90000\n"
+                              "a=rtpmap:97 H264/90000\n");
+    [test testPreferVideoCodec:@"H264"
+                           sdp:sdp
+                   expectedSdp:expectedSdp];
   }
 }
 
+TEST_F(SignalingTest, SdpVp8Test) {
+  @autoreleasepool {
+    ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init];
+    NSString *sdp = @("m=video 9 RTP/SAVPF 100 116 117 96 120 97\n"
+                      "a=rtpmap:116 VP8/90000\n");
+    NSString *expectedSdp = @("m=video 9 RTP/SAVPF 116 100 117 96 120 97\n"
+                              "a=rtpmap:116 VP8/90000\n");
+    [test testPreferVideoCodec:@"VP8"
+                           sdp:sdp
+                   expectedSdp:expectedSdp];
+  }
+}
+
+TEST_F(SignalingTest, SdpNoMLineTest) {
+  @autoreleasepool {
+    ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init];
+    NSString *sdp = @("a=rtpmap:116 VP8/90000\n");
+    [test testPreferVideoCodec:@"VP8"
+                           sdp:sdp
+                   expectedSdp:sdp];
+  }
+}
+
+TEST_F(SignalingTest, SdpMissingCodecTest) {
+  @autoreleasepool {
+    ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init];
+    NSString *sdp = @("m=video 9 RTP/SAVPF 100 116 117 96 120 97\n"
+                      "a=rtpmap:116 VP8/90000\n");
+    [test testPreferVideoCodec:@"foo"
+                           sdp:sdp
+                   expectedSdp:sdp];
+  }
+}
+
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }