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

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

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Make rotation check clearer. Created 3 years, 11 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_ENGINE_WEBRTCVIDEOENGINE2_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
13 13
14 #include <map> 14 #include <map>
15 #include <memory> 15 #include <memory>
16 #include <set> 16 #include <set>
17 #include <string> 17 #include <string>
18 #include <vector> 18 #include <vector>
19 19
20 #include "webrtc/api/call/transport.h" 20 #include "webrtc/api/call/transport.h"
21 #include "webrtc/api/video/video_frame.h"
21 #include "webrtc/base/asyncinvoker.h" 22 #include "webrtc/base/asyncinvoker.h"
22 #include "webrtc/base/criticalsection.h" 23 #include "webrtc/base/criticalsection.h"
23 #include "webrtc/base/networkroute.h" 24 #include "webrtc/base/networkroute.h"
24 #include "webrtc/base/thread_annotations.h" 25 #include "webrtc/base/thread_annotations.h"
25 #include "webrtc/base/thread_checker.h" 26 #include "webrtc/base/thread_checker.h"
26 #include "webrtc/media/base/videosinkinterface.h" 27 #include "webrtc/media/base/videosinkinterface.h"
27 #include "webrtc/media/base/videosourceinterface.h" 28 #include "webrtc/media/base/videosourceinterface.h"
28 #include "webrtc/call/call.h" 29 #include "webrtc/call/call.h"
29 #include "webrtc/media/base/mediaengine.h" 30 #include "webrtc/media/base/mediaengine.h"
30 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" 31 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
31 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 32 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
32 #include "webrtc/video_frame.h"
33 #include "webrtc/video_receive_stream.h" 33 #include "webrtc/video_receive_stream.h"
34 #include "webrtc/video_send_stream.h" 34 #include "webrtc/video_send_stream.h"
35 35
36 namespace webrtc { 36 namespace webrtc {
37 class VideoDecoder; 37 class VideoDecoder;
38 class VideoEncoder; 38 class VideoEncoder;
39 struct MediaConfig; 39 struct MediaConfig;
40 } 40 }
41 41
42 namespace rtc { 42 namespace rtc {
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // send_params/recv_params, rtp_extensions, options, etc. 511 // send_params/recv_params, rtp_extensions, options, etc.
512 VideoSendParameters send_params_; 512 VideoSendParameters send_params_;
513 VideoOptions default_send_options_; 513 VideoOptions default_send_options_;
514 VideoRecvParameters recv_params_; 514 VideoRecvParameters recv_params_;
515 int64_t last_stats_log_ms_; 515 int64_t last_stats_log_ms_;
516 }; 516 };
517 517
518 } // namespace cricket 518 } // namespace cricket
519 519
520 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 520 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698