| OLD | NEW | 
|---|
| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 67   uint8_t noCodec = tmpACM->NumberOfCodecs(); | 67   uint8_t noCodec = tmpACM->NumberOfCodecs(); | 
| 68   CodecInst codecInst; | 68   CodecInst codecInst; | 
| 69   printf("List of Supported Codecs\n"); | 69   printf("List of Supported Codecs\n"); | 
| 70   printf("========================\n"); | 70   printf("========================\n"); | 
| 71   for (uint8_t codecCntr = 0; codecCntr < noCodec; codecCntr++) { | 71   for (uint8_t codecCntr = 0; codecCntr < noCodec; codecCntr++) { | 
| 72     EXPECT_EQ(tmpACM->Codec(codecCntr, &codecInst), 0); | 72     EXPECT_EQ(tmpACM->Codec(codecCntr, &codecInst), 0); | 
| 73     printf("%d- %s\n", codecCntr, codecInst.plname); | 73     printf("%d- %s\n", codecCntr, codecInst.plname); | 
| 74   } | 74   } | 
| 75   printf("\nChoose a send codec for side A [0]: "); | 75   printf("\nChoose a send codec for side A [0]: "); | 
| 76   char myStr[15] = ""; | 76   char myStr[15] = ""; | 
| 77   EXPECT_TRUE(fgets(myStr, 10, stdin) != NULL); | 77   EXPECT_TRUE(fgets(myStr, 10, stdin) != nullptr); | 
| 78   *codecID_A = (uint8_t) atoi(myStr); | 78   *codecID_A = (uint8_t) atoi(myStr); | 
| 79 | 79 | 
| 80   printf("\nChoose a send codec for side B [0]: "); | 80   printf("\nChoose a send codec for side B [0]: "); | 
| 81   EXPECT_TRUE(fgets(myStr, 10, stdin) != NULL); | 81   EXPECT_TRUE(fgets(myStr, 10, stdin) != nullptr); | 
| 82   *codecID_B = (uint8_t) atoi(myStr); | 82   *codecID_B = (uint8_t) atoi(myStr); | 
| 83 | 83 | 
| 84   printf("\n"); | 84   printf("\n"); | 
| 85 } | 85 } | 
| 86 | 86 | 
| 87 void TwoWayCommunication::SetUp() { | 87 void TwoWayCommunication::SetUp() { | 
| 88   uint8_t codecID_A; | 88   uint8_t codecID_A; | 
| 89   uint8_t codecID_B; | 89   uint8_t codecID_B; | 
| 90 | 90 | 
| 91   ChooseCodec(&codecID_A, &codecID_B); | 91   ChooseCodec(&codecID_A, &codecID_B); | 
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 301       EXPECT_EQ(0, _acmA->InitializeReceiver()); | 301       EXPECT_EQ(0, _acmA->InitializeReceiver()); | 
| 302     // Re-register codec on side A. | 302     // Re-register codec on side A. | 
| 303     if (((secPassed % 7) == 6) && (msecPassed >= 990)) { | 303     if (((secPassed % 7) == 6) && (msecPassed >= 990)) { | 
| 304       EXPECT_EQ(true, _acmA->RegisterReceiveCodec( | 304       EXPECT_EQ(true, _acmA->RegisterReceiveCodec( | 
| 305                           codecInst_B->pltype, CodecInstToSdp(*codecInst_B))); | 305                           codecInst_B->pltype, CodecInstToSdp(*codecInst_B))); | 
| 306     } | 306     } | 
| 307   } | 307   } | 
| 308 } | 308 } | 
| 309 | 309 | 
| 310 }  // namespace webrtc | 310 }  // namespace webrtc | 
| OLD | NEW | 
|---|