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

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

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 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 | « webrtc/media/engine/payload_type_mapper.h ('k') | webrtc/modules/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 * 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_WEBRTCVIDEOENGINE_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ 12 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_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/optional.h"
21 #include "webrtc/api/video/video_frame.h" 22 #include "webrtc/api/video/video_frame.h"
22 #include "webrtc/call/call.h" 23 #include "webrtc/call/call.h"
23 #include "webrtc/call/flexfec_receive_stream.h" 24 #include "webrtc/call/flexfec_receive_stream.h"
24 #include "webrtc/call/video_receive_stream.h" 25 #include "webrtc/call/video_receive_stream.h"
25 #include "webrtc/call/video_send_stream.h" 26 #include "webrtc/call/video_send_stream.h"
26 #include "webrtc/media/base/mediaengine.h" 27 #include "webrtc/media/base/mediaengine.h"
27 #include "webrtc/media/base/videosinkinterface.h" 28 #include "webrtc/media/base/videosinkinterface.h"
28 #include "webrtc/media/base/videosourceinterface.h" 29 #include "webrtc/media/base/videosourceinterface.h"
29 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" 30 #include "webrtc/media/engine/webrtcvideodecoderfactory.h"
30 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 31 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
31 #include "webrtc/rtc_base/asyncinvoker.h" 32 #include "webrtc/rtc_base/asyncinvoker.h"
32 #include "webrtc/rtc_base/criticalsection.h" 33 #include "webrtc/rtc_base/criticalsection.h"
33 #include "webrtc/rtc_base/networkroute.h" 34 #include "webrtc/rtc_base/networkroute.h"
34 #include "webrtc/rtc_base/optional.h"
35 #include "webrtc/rtc_base/thread_annotations.h" 35 #include "webrtc/rtc_base/thread_annotations.h"
36 #include "webrtc/rtc_base/thread_checker.h" 36 #include "webrtc/rtc_base/thread_checker.h"
37 37
38 namespace webrtc { 38 namespace webrtc {
39 class VideoDecoder; 39 class VideoDecoder;
40 class VideoEncoder; 40 class VideoEncoder;
41 struct MediaConfig; 41 struct MediaConfig;
42 } 42 }
43 43
44 namespace rtc { 44 namespace rtc {
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 const std::string codec_name_; 530 const std::string codec_name_;
531 const int max_qp_; 531 const int max_qp_;
532 const int max_framerate_; 532 const int max_framerate_;
533 const bool is_screencast_; 533 const bool is_screencast_;
534 const bool conference_mode_; 534 const bool conference_mode_;
535 }; 535 };
536 536
537 } // namespace cricket 537 } // namespace cricket
538 538
539 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_ 539 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/engine/payload_type_mapper.h ('k') | webrtc/modules/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698