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

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

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, 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 | « talk/media/webrtc/webrtcvoe.h ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('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 2004 Google Inc. 3 * Copyright 2004 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 29 matching lines...) Expand all
40 #include "webrtc/base/buffer.h" 40 #include "webrtc/base/buffer.h"
41 #include "webrtc/base/byteorder.h" 41 #include "webrtc/base/byteorder.h"
42 #include "webrtc/base/logging.h" 42 #include "webrtc/base/logging.h"
43 #include "webrtc/base/scoped_ptr.h" 43 #include "webrtc/base/scoped_ptr.h"
44 #include "webrtc/base/stream.h" 44 #include "webrtc/base/stream.h"
45 #include "webrtc/base/thread_checker.h" 45 #include "webrtc/base/thread_checker.h"
46 #include "webrtc/call.h" 46 #include "webrtc/call.h"
47 #include "webrtc/common.h" 47 #include "webrtc/common.h"
48 #include "webrtc/config.h" 48 #include "webrtc/config.h"
49 49
50 namespace webrtc {
51 class VideoEngine;
52 }
53
54 namespace cricket { 50 namespace cricket {
55 51
56 class AudioDeviceModule; 52 class AudioDeviceModule;
57 class AudioRenderer; 53 class AudioRenderer;
58 class VoETraceWrapper; 54 class VoETraceWrapper;
59 class VoEWrapper; 55 class VoEWrapper;
60 class VoiceProcessor; 56 class VoiceProcessor;
61 class WebRtcVoiceMediaChannel; 57 class WebRtcVoiceMediaChannel;
62 58
63 // WebRtcVoiceEngine is a class to be used with CompositeMediaEngine. 59 // WebRtcVoiceEngine is a class to be used with CompositeMediaEngine.
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 420 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
425 421
426 // Do not lock this on the VoE media processor thread; potential for deadlock 422 // Do not lock this on the VoE media processor thread; potential for deadlock
427 // exists. 423 // exists.
428 mutable rtc::CriticalSection receive_channels_cs_; 424 mutable rtc::CriticalSection receive_channels_cs_;
429 }; 425 };
430 426
431 } // namespace cricket 427 } // namespace cricket
432 428
433 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_ 429 #endif // TALK_MEDIA_WEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoe.h ('k') | talk/media/webrtc/webrtcvoiceengine.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698