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

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

Issue 1272163002: Tiny cleanups. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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
« no previous file with comments | « talk/media/base/videoengine_unittest.h ('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 2011 Google Inc. 3 * Copyright 2011 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 #ifndef TALK_MEDIA_WEBRTCMEDIAENGINE_H_ 28 #ifndef TALK_MEDIA_WEBRTCMEDIAENGINE_H_
29 #define TALK_MEDIA_WEBRTCMEDIAENGINE_H_ 29 #define TALK_MEDIA_WEBRTCMEDIAENGINE_H_
30 30
31 #include "talk/media/base/mediaengine.h" 31 #include "talk/media/base/mediaengine.h"
32 32
33 namespace webrtc { 33 namespace webrtc {
34 class AudioDeviceModule; 34 class AudioDeviceModule;
35 class VideoCaptureModule;
36 } 35 }
37 namespace cricket { 36 namespace cricket {
38 class WebRtcVideoDecoderFactory; 37 class WebRtcVideoDecoderFactory;
39 class WebRtcVideoEncoderFactory; 38 class WebRtcVideoEncoderFactory;
40 } 39 }
41 40
42 namespace cricket { 41 namespace cricket {
43 42
44 class WebRtcMediaEngineFactory { 43 class WebRtcMediaEngineFactory {
45 public: 44 public:
46 static MediaEngineInterface* Create();
47 static MediaEngineInterface* Create( 45 static MediaEngineInterface* Create(
48 webrtc::AudioDeviceModule* adm, 46 webrtc::AudioDeviceModule* adm,
49 WebRtcVideoEncoderFactory* encoder_factory, 47 WebRtcVideoEncoderFactory* encoder_factory,
50 WebRtcVideoDecoderFactory* decoder_factory); 48 WebRtcVideoDecoderFactory* decoder_factory);
51 }; 49 };
52 50
53 } // namespace cricket 51 } // namespace cricket
54 52
55 #endif // TALK_MEDIA_WEBRTCMEDIAENGINE_H_ 53 #endif // TALK_MEDIA_WEBRTCMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « talk/media/base/videoengine_unittest.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698