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

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

Issue 2489173004: Revert of Stop caching supported codecs in WebRtcVideoEngine2 (Closed)
Patch Set: Created 4 years, 1 month 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/base/mediaengine.h ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('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
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 WebRtcVideoEngine2(); 98 WebRtcVideoEngine2();
99 virtual ~WebRtcVideoEngine2(); 99 virtual ~WebRtcVideoEngine2();
100 100
101 // Basic video engine implementation. 101 // Basic video engine implementation.
102 void Init(); 102 void Init();
103 103
104 WebRtcVideoChannel2* CreateChannel(webrtc::Call* call, 104 WebRtcVideoChannel2* CreateChannel(webrtc::Call* call,
105 const MediaConfig& config, 105 const MediaConfig& config,
106 const VideoOptions& options); 106 const VideoOptions& options);
107 107
108 const std::vector<VideoCodec> codecs() const; 108 const std::vector<VideoCodec>& codecs() const;
109 RtpCapabilities GetCapabilities() const; 109 RtpCapabilities GetCapabilities() const;
110 110
111 // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does 111 // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does
112 // not take the ownership of |decoder_factory|. The caller needs to make sure 112 // not take the ownership of |decoder_factory|. The caller needs to make sure
113 // that |decoder_factory| outlives the video engine. 113 // that |decoder_factory| outlives the video engine.
114 void SetExternalDecoderFactory(WebRtcVideoDecoderFactory* decoder_factory); 114 void SetExternalDecoderFactory(WebRtcVideoDecoderFactory* decoder_factory);
115 // Set a WebRtcVideoEncoderFactory for external encoding. Video engine does 115 // Set a WebRtcVideoEncoderFactory for external encoding. Video engine does
116 // not take the ownership of |encoder_factory|. The caller needs to make sure 116 // not take the ownership of |encoder_factory|. The caller needs to make sure
117 // that |encoder_factory| outlives the video engine. 117 // that |encoder_factory| outlives the video engine.
118 virtual void SetExternalEncoderFactory( 118 virtual void SetExternalEncoderFactory(
119 WebRtcVideoEncoderFactory* encoder_factory); 119 WebRtcVideoEncoderFactory* encoder_factory);
120 120
121 private: 121 private:
122 std::vector<VideoCodec> video_codecs_;
123
122 bool initialized_; 124 bool initialized_;
123 125
124 WebRtcVideoDecoderFactory* external_decoder_factory_; 126 WebRtcVideoDecoderFactory* external_decoder_factory_;
125 WebRtcVideoEncoderFactory* external_encoder_factory_; 127 WebRtcVideoEncoderFactory* external_encoder_factory_;
126 std::unique_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_; 128 std::unique_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_;
127 }; 129 };
128 130
129 class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { 131 class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
130 public: 132 public:
131 WebRtcVideoChannel2(webrtc::Call* call, 133 WebRtcVideoChannel2(webrtc::Call* call,
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 VideoSendParameters send_params_; 521 VideoSendParameters send_params_;
520 VideoOptions default_send_options_; 522 VideoOptions default_send_options_;
521 VideoRecvParameters recv_params_; 523 VideoRecvParameters recv_params_;
522 bool red_disabled_by_remote_side_; 524 bool red_disabled_by_remote_side_;
523 int64_t last_stats_log_ms_; 525 int64_t last_stats_log_ms_;
524 }; 526 };
525 527
526 } // namespace cricket 528 } // namespace cricket
527 529
528 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 530 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/mediaengine.h ('k') | webrtc/media/engine/webrtcvideoengine2.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698