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

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: Another rebase Created 5 years, 3 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 | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('j') | 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 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 return 0; 529 return 0;
530 } 530 }
531 WEBRTC_STUB(GetVersion, (char version[1024])); 531 WEBRTC_STUB(GetVersion, (char version[1024]));
532 WEBRTC_STUB(LastError, ()); 532 WEBRTC_STUB(LastError, ());
533 WEBRTC_FUNC(AssociateSendChannel, (int channel, 533 WEBRTC_FUNC(AssociateSendChannel, (int channel,
534 int accociate_send_channel)) { 534 int accociate_send_channel)) {
535 WEBRTC_CHECK_CHANNEL(channel); 535 WEBRTC_CHECK_CHANNEL(channel);
536 channels_[channel]->associate_send_channel = accociate_send_channel; 536 channels_[channel]->associate_send_channel = accociate_send_channel;
537 return 0; 537 return 0;
538 } 538 }
539 webrtc::RtcEventLog* GetEventLog() { return nullptr; }
539 540
540 // webrtc::VoECodec 541 // webrtc::VoECodec
541 WEBRTC_FUNC(NumOfCodecs, ()) { 542 WEBRTC_FUNC(NumOfCodecs, ()) {
542 return num_codecs_; 543 return num_codecs_;
543 } 544 }
544 WEBRTC_FUNC(GetCodec, (int index, webrtc::CodecInst& codec)) { 545 WEBRTC_FUNC(GetCodec, (int index, webrtc::CodecInst& codec)) {
545 if (index < 0 || index >= NumOfCodecs()) { 546 if (index < 0 || index >= NumOfCodecs()) {
546 return -1; 547 return -1;
547 } 548 }
548 const cricket::AudioCodec& c(*codecs_[index]); 549 const cricket::AudioCodec& c(*codecs_[index]);
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 DtmfInfo dtmf_info_; 1284 DtmfInfo dtmf_info_;
1284 webrtc::VoEMediaProcess* media_processor_; 1285 webrtc::VoEMediaProcess* media_processor_;
1285 FakeAudioProcessing audio_processing_; 1286 FakeAudioProcessing audio_processing_;
1286 }; 1287 };
1287 1288
1288 #undef WEBRTC_CHECK_HEADER_EXTENSION_ID 1289 #undef WEBRTC_CHECK_HEADER_EXTENSION_ID
1289 1290
1290 } // namespace cricket 1291 } // namespace cricket
1291 1292
1292 #endif // TALK_SESSION_PHONE_FAKEWEBRTCVOICEENGINE_H_ 1293 #endif // TALK_SESSION_PHONE_FAKEWEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698