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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.h

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 Created 4 years, 10 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 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
12 #define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
13 13
14 #include <map> 14 #include <map>
15 #include <string> 15 #include <string>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/base/scoped_ptr.h" 19 #include "webrtc/base/scoped_ptr.h"
20 #include "webrtc/base/thread_annotations.h" 20 #include "webrtc/base/thread_annotations.h"
21 #include "webrtc/base/thread_checker.h" 21 #include "webrtc/base/thread_checker.h"
22 #include "webrtc/media/base/videosinkinterface.h" 22 #include "webrtc/media/base/videosinkinterface.h"
23 #include "webrtc/call.h" 23 #include "webrtc/call.h"
24 #include "webrtc/media/base/mediaengine.h" 24 #include "webrtc/media/base/mediaengine.h"
25 #include "webrtc/media/webrtc/webrtcvideochannelfactory.h" 25 #include "webrtc/media/engine/webrtcvideochannelfactory.h"
26 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" 26 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
27 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" 27 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
28 #include "webrtc/transport.h" 28 #include "webrtc/transport.h"
29 #include "webrtc/video_frame.h" 29 #include "webrtc/video_frame.h"
30 #include "webrtc/video_receive_stream.h" 30 #include "webrtc/video_receive_stream.h"
31 #include "webrtc/video_renderer.h" 31 #include "webrtc/video_renderer.h"
32 #include "webrtc/video_send_stream.h" 32 #include "webrtc/video_send_stream.h"
33 33
34 namespace webrtc { 34 namespace webrtc {
35 class VideoDecoder; 35 class VideoDecoder;
36 class VideoEncoder; 36 class VideoEncoder;
37 } 37 }
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 webrtc::Call::Config::BitrateConfig bitrate_config_; 505 webrtc::Call::Config::BitrateConfig bitrate_config_;
506 VideoOptions options_; 506 VideoOptions options_;
507 // TODO(deadbeef): Don't duplicate information between 507 // TODO(deadbeef): Don't duplicate information between
508 // send_params/recv_params, rtp_extensions, options, etc. 508 // send_params/recv_params, rtp_extensions, options, etc.
509 VideoSendParameters send_params_; 509 VideoSendParameters send_params_;
510 VideoRecvParameters recv_params_; 510 VideoRecvParameters recv_params_;
511 }; 511 };
512 512
513 } // namespace cricket 513 } // namespace cricket
514 514
515 #endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 515 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoencoderfactory.h ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698