| 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 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 default: | 820 default: |
| 821 fprintf(stderr, "Invalid sender-side in TestRegistration(%c)\n", | 821 fprintf(stderr, "Invalid sender-side in TestRegistration(%c)\n", |
| 822 sendSide); | 822 sendSide); |
| 823 exit(-1); | 823 exit(-1); |
| 824 } | 824 } |
| 825 | 825 |
| 826 auto myCodec = sendACM->SendCodec(); | 826 auto myCodec = sendACM->SendCodec(); |
| 827 if (!myCodec) { | 827 if (!myCodec) { |
| 828 CodecInst ci; | 828 CodecInst ci; |
| 829 AudioCodingModule::Codec(_codecCntrA, &ci); | 829 AudioCodingModule::Codec(_codecCntrA, &ci); |
| 830 myCodec = rtc::Maybe<CodecInst>(ci); | 830 myCodec = rtc::Optional<CodecInst>(ci); |
| 831 } | 831 } |
| 832 | 832 |
| 833 if (!_randomTest) { | 833 if (!_randomTest) { |
| 834 fprintf(stdout, "Unregistering reveive codec, NO AUDIO.\n"); | 834 fprintf(stdout, "Unregistering reveive codec, NO AUDIO.\n"); |
| 835 fflush (stdout); | 835 fflush (stdout); |
| 836 } | 836 } |
| 837 { | 837 { |
| 838 WriteLockScoped wl(_apiTestRWLock); | 838 WriteLockScoped wl(_apiTestRWLock); |
| 839 *thereIsDecoder = false; | 839 *thereIsDecoder = false; |
| 840 } | 840 } |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1105 CHECK_ERROR_MT(myACM->RegisterSendCodec(myCodec)); | 1105 CHECK_ERROR_MT(myACM->RegisterSendCodec(myCodec)); |
| 1106 myChannel->ResetStats(); | 1106 myChannel->ResetStats(); |
| 1107 { | 1107 { |
| 1108 WriteLockScoped wl(_apiTestRWLock); | 1108 WriteLockScoped wl(_apiTestRWLock); |
| 1109 *thereIsEncoder = true; | 1109 *thereIsEncoder = true; |
| 1110 } | 1110 } |
| 1111 Wait(500); | 1111 Wait(500); |
| 1112 } | 1112 } |
| 1113 | 1113 |
| 1114 } // namespace webrtc | 1114 } // namespace webrtc |
| OLD | NEW |