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

Side by Side Diff: talk/media/webrtc/fakewebrtcvoiceengine.h

Issue 1267683002: Hooked up RtcEventLog. It lives in Voice Engine and pointers are propagated to ACM and Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed Henrik's review comments. Created 5 years, 4 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 return 0; 526 return 0;
527 } 527 }
528 WEBRTC_STUB(GetVersion, (char version[1024])); 528 WEBRTC_STUB(GetVersion, (char version[1024]));
529 WEBRTC_STUB(LastError, ()); 529 WEBRTC_STUB(LastError, ());
530 WEBRTC_FUNC(AssociateSendChannel, (int channel, 530 WEBRTC_FUNC(AssociateSendChannel, (int channel,
531 int accociate_send_channel)) { 531 int accociate_send_channel)) {
532 WEBRTC_CHECK_CHANNEL(channel); 532 WEBRTC_CHECK_CHANNEL(channel);
533 channels_[channel]->associate_send_channel = accociate_send_channel; 533 channels_[channel]->associate_send_channel = accociate_send_channel;
534 return 0; 534 return 0;
535 } 535 }
536 webrtc::RtcEventLog* GetEventLog() { return nullptr; }
536 537
537 // webrtc::VoECodec 538 // webrtc::VoECodec
538 WEBRTC_FUNC(NumOfCodecs, ()) { 539 WEBRTC_FUNC(NumOfCodecs, ()) {
539 return num_codecs_; 540 return num_codecs_;
540 } 541 }
541 WEBRTC_FUNC(GetCodec, (int index, webrtc::CodecInst& codec)) { 542 WEBRTC_FUNC(GetCodec, (int index, webrtc::CodecInst& codec)) {
542 if (index < 0 || index >= NumOfCodecs()) { 543 if (index < 0 || index >= NumOfCodecs()) {
543 return -1; 544 return -1;
544 } 545 }
545 const cricket::AudioCodec& c(*codecs_[index]); 546 const cricket::AudioCodec& c(*codecs_[index]);
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 DtmfInfo dtmf_info_; 1281 DtmfInfo dtmf_info_;
1281 webrtc::VoEMediaProcess* media_processor_; 1282 webrtc::VoEMediaProcess* media_processor_;
1282 FakeAudioProcessing audio_processing_; 1283 FakeAudioProcessing audio_processing_;
1283 }; 1284 };
1284 1285
1285 #undef WEBRTC_CHECK_HEADER_EXTENSION_ID 1286 #undef WEBRTC_CHECK_HEADER_EXTENSION_ID
1286 1287
1287 } // namespace cricket 1288 } // namespace cricket
1288 1289
1289 #endif // TALK_SESSION_PHONE_FAKEWEBRTCVOICEENGINE_H_ 1290 #endif // TALK_SESSION_PHONE_FAKEWEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('j') | webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698