OLD | NEW |
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 <set> | 16 #include <set> |
16 #include <string> | 17 #include <string> |
17 #include <vector> | 18 #include <vector> |
18 | 19 |
19 #include "webrtc/base/criticalsection.h" | 20 #include "webrtc/base/criticalsection.h" |
20 #include "webrtc/base/scoped_ptr.h" | |
21 #include "webrtc/base/thread_annotations.h" | 21 #include "webrtc/base/thread_annotations.h" |
22 #include "webrtc/base/thread_checker.h" | 22 #include "webrtc/base/thread_checker.h" |
23 #include "webrtc/media/base/videosinkinterface.h" | 23 #include "webrtc/media/base/videosinkinterface.h" |
24 #include "webrtc/media/base/videosourceinterface.h" | 24 #include "webrtc/media/base/videosourceinterface.h" |
25 #include "webrtc/call.h" | 25 #include "webrtc/call.h" |
26 #include "webrtc/media/base/mediaengine.h" | 26 #include "webrtc/media/base/mediaengine.h" |
27 #include "webrtc/media/engine/webrtcvideochannelfactory.h" | 27 #include "webrtc/media/engine/webrtcvideochannelfactory.h" |
28 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" | 28 #include "webrtc/media/engine/webrtcvideodecoderfactory.h" |
29 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" | 29 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" |
30 #include "webrtc/transport.h" | 30 #include "webrtc/transport.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 | 119 |
120 private: | 120 private: |
121 std::vector<VideoCodec> GetSupportedCodecs() const; | 121 std::vector<VideoCodec> GetSupportedCodecs() const; |
122 | 122 |
123 std::vector<VideoCodec> video_codecs_; | 123 std::vector<VideoCodec> video_codecs_; |
124 | 124 |
125 bool initialized_; | 125 bool initialized_; |
126 | 126 |
127 WebRtcVideoDecoderFactory* external_decoder_factory_; | 127 WebRtcVideoDecoderFactory* external_decoder_factory_; |
128 WebRtcVideoEncoderFactory* external_encoder_factory_; | 128 WebRtcVideoEncoderFactory* external_encoder_factory_; |
129 rtc::scoped_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_; | 129 std::unique_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_; |
130 }; | 130 }; |
131 | 131 |
132 class WebRtcVideoChannel2 : public VideoMediaChannel, | 132 class WebRtcVideoChannel2 : public VideoMediaChannel, |
133 public webrtc::Transport, | 133 public webrtc::Transport, |
134 public webrtc::LoadObserver { | 134 public webrtc::LoadObserver { |
135 public: | 135 public: |
136 WebRtcVideoChannel2(webrtc::Call* call, | 136 WebRtcVideoChannel2(webrtc::Call* call, |
137 const MediaConfig& config, | 137 const MediaConfig& config, |
138 const VideoOptions& options, | 138 const VideoOptions& options, |
139 const std::vector<VideoCodec>& recv_codecs, | 139 const std::vector<VideoCodec>& recv_codecs, |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 webrtc::Call::Config::BitrateConfig bitrate_config_; | 516 webrtc::Call::Config::BitrateConfig bitrate_config_; |
517 // TODO(deadbeef): Don't duplicate information between | 517 // TODO(deadbeef): Don't duplicate information between |
518 // send_params/recv_params, rtp_extensions, options, etc. | 518 // send_params/recv_params, rtp_extensions, options, etc. |
519 VideoSendParameters send_params_; | 519 VideoSendParameters send_params_; |
520 VideoRecvParameters recv_params_; | 520 VideoRecvParameters recv_params_; |
521 }; | 521 }; |
522 | 522 |
523 } // namespace cricket | 523 } // namespace cricket |
524 | 524 |
525 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ | 525 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ |
OLD | NEW |