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

Side by Side Diff: talk/session/media/channelmanager_unittest.cc

Issue 1505253004: Support for remote audio into tracks (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Address comments Created 5 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2008 Google Inc. 3 * Copyright 2008 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 14 matching lines...) Expand all
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/fakemediacontroller.h" 28 #include "talk/app/webrtc/fakemediacontroller.h"
29 #include "talk/media/base/fakecapturemanager.h" 29 #include "talk/media/base/fakecapturemanager.h"
30 #include "talk/media/base/fakemediaengine.h" 30 #include "talk/media/base/fakemediaengine.h"
31 #include "talk/media/base/fakevideocapturer.h" 31 #include "talk/media/base/fakevideocapturer.h"
32 #include "talk/media/base/testutils.h" 32 #include "talk/media/base/testutils.h"
33 #include "talk/media/webrtc/fakewebrtccall.h" 33 #include "talk/media/webrtc/fakewebrtccall.h"
34 #include "talk/session/media/channelmanager.h" 34 #include "talk/session/media/channelmanager.h"
35 #include "webrtc/audio/audio_sink.h"
35 #include "webrtc/base/gunit.h" 36 #include "webrtc/base/gunit.h"
36 #include "webrtc/base/logging.h" 37 #include "webrtc/base/logging.h"
37 #include "webrtc/base/thread.h" 38 #include "webrtc/base/thread.h"
38 #include "webrtc/p2p/base/faketransportcontroller.h" 39 #include "webrtc/p2p/base/faketransportcontroller.h"
39 40
40 namespace cricket { 41 namespace cricket {
41 42
42 static const AudioCodec kAudioCodecs[] = { 43 static const AudioCodec kAudioCodecs[] = {
43 AudioCodec(97, "voice", 1, 2, 3, 0), 44 AudioCodec(97, "voice", 1, 2, 3, 0),
44 AudioCodec(111, "OPUS", 48000, 32000, 2, 0), 45 AudioCodec(111, "OPUS", 48000, 32000, 2, 0),
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false)); 275 EXPECT_FALSE(cm_->SetVideoRtxEnabled(false));
275 276
276 // Can set again after terminate. 277 // Can set again after terminate.
277 cm_->Terminate(); 278 cm_->Terminate();
278 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true)); 279 EXPECT_TRUE(cm_->SetVideoRtxEnabled(true));
279 cm_->GetSupportedVideoCodecs(&codecs); 280 cm_->GetSupportedVideoCodecs(&codecs);
280 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec)); 281 EXPECT_TRUE(ContainsMatchingCodec(codecs, rtx_codec));
281 } 282 }
282 283
283 } // namespace cricket 284 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698