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

Side by Side Diff: talk/media/webrtc/webrtcvoiceengine_unittest.cc

Issue 1360773002: Remove VoEFile from VoeWrapper and the remaining places in libjingle where it was being used. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 months 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
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 static uint32 kSsrc1 = 0x99; 61 static uint32 kSsrc1 = 0x99;
62 static uint32 kSsrc2 = 0x98; 62 static uint32 kSsrc2 = 0x98;
63 63
64 class FakeVoEWrapper : public cricket::VoEWrapper { 64 class FakeVoEWrapper : public cricket::VoEWrapper {
65 public: 65 public:
66 explicit FakeVoEWrapper(cricket::FakeWebRtcVoiceEngine* engine) 66 explicit FakeVoEWrapper(cricket::FakeWebRtcVoiceEngine* engine)
67 : cricket::VoEWrapper(engine, // processing 67 : cricket::VoEWrapper(engine, // processing
68 engine, // base 68 engine, // base
69 engine, // codec 69 engine, // codec
70 engine, // dtmf 70 engine, // dtmf
71 engine, // file
72 engine, // hw 71 engine, // hw
73 engine, // media 72 engine, // media
74 engine, // neteq 73 engine, // neteq
75 engine, // network 74 engine, // network
76 engine, // rtp 75 engine, // rtp
77 engine, // sync 76 engine, // sync
78 engine) { // volume 77 engine) { // volume
79 } 78 }
80 }; 79 };
81 80
(...skipping 3374 matching lines...) Expand 10 before | Expand all | Expand 10 after
3456 cricket::WebRtcVoiceEngine engine; 3455 cricket::WebRtcVoiceEngine engine;
3457 EXPECT_TRUE(engine.Init(rtc::Thread::Current())); 3456 EXPECT_TRUE(engine.Init(rtc::Thread::Current()));
3458 rtc::scoped_ptr<webrtc::Call> call( 3457 rtc::scoped_ptr<webrtc::Call> call(
3459 webrtc::Call::Create(webrtc::Call::Config())); 3458 webrtc::Call::Create(webrtc::Call::Config()));
3460 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::AudioOptions(), 3459 cricket::WebRtcVoiceMediaChannel channel(&engine, cricket::AudioOptions(),
3461 call.get()); 3460 call.get());
3462 cricket::AudioRecvParameters parameters; 3461 cricket::AudioRecvParameters parameters;
3463 parameters.codecs = engine.codecs(); 3462 parameters.codecs = engine.codecs();
3464 EXPECT_TRUE(channel.SetRecvParameters(parameters)); 3463 EXPECT_TRUE(channel.SetRecvParameters(parameters));
3465 } 3464 }
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698