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

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

Issue 2521393004: Don't cache video codec list in VideoEngine2. (Closed)
Patch Set: Remove unnecessary test fixture and minor fixes. Created 4 years 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 WebRtcVideoEngine2(); 95 WebRtcVideoEngine2();
96 virtual ~WebRtcVideoEngine2(); 96 virtual ~WebRtcVideoEngine2();
97 97
98 // Basic video engine implementation. 98 // Basic video engine implementation.
99 void Init(); 99 void Init();
100 100
101 WebRtcVideoChannel2* CreateChannel(webrtc::Call* call, 101 WebRtcVideoChannel2* CreateChannel(webrtc::Call* call,
102 const MediaConfig& config, 102 const MediaConfig& config,
103 const VideoOptions& options); 103 const VideoOptions& options);
104 104
105 const std::vector<VideoCodec>& codecs() const; 105 std::vector<VideoCodec> codecs() const;
106 RtpCapabilities GetCapabilities() const; 106 RtpCapabilities GetCapabilities() const;
107 107
108 // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does 108 // Set a WebRtcVideoDecoderFactory for external decoding. Video engine does
109 // not take the ownership of |decoder_factory|. The caller needs to make sure 109 // not take the ownership of |decoder_factory|. The caller needs to make sure
110 // that |decoder_factory| outlives the video engine. 110 // that |decoder_factory| outlives the video engine.
111 void SetExternalDecoderFactory(WebRtcVideoDecoderFactory* decoder_factory); 111 void SetExternalDecoderFactory(WebRtcVideoDecoderFactory* decoder_factory);
112 // Set a WebRtcVideoEncoderFactory for external encoding. Video engine does 112 // Set a WebRtcVideoEncoderFactory for external encoding. Video engine does
113 // not take the ownership of |encoder_factory|. The caller needs to make sure 113 // not take the ownership of |encoder_factory|. The caller needs to make sure
114 // that |encoder_factory| outlives the video engine. 114 // that |encoder_factory| outlives the video engine.
115 virtual void SetExternalEncoderFactory( 115 virtual void SetExternalEncoderFactory(
116 WebRtcVideoEncoderFactory* encoder_factory); 116 WebRtcVideoEncoderFactory* encoder_factory);
117 117
118 private: 118 private:
119 std::vector<VideoCodec> video_codecs_;
120
121 bool initialized_; 119 bool initialized_;
122 120
123 WebRtcVideoDecoderFactory* external_decoder_factory_; 121 WebRtcVideoDecoderFactory* external_decoder_factory_;
124 WebRtcVideoEncoderFactory* external_encoder_factory_; 122 WebRtcVideoEncoderFactory* external_encoder_factory_;
125 std::unique_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_; 123 std::unique_ptr<WebRtcVideoEncoderFactory> simulcast_encoder_factory_;
126 }; 124 };
127 125
128 class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport { 126 class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
129 public: 127 public:
130 WebRtcVideoChannel2(webrtc::Call* call, 128 WebRtcVideoChannel2(webrtc::Call* call,
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 // send_params/recv_params, rtp_extensions, options, etc. 511 // send_params/recv_params, rtp_extensions, options, etc.
514 VideoSendParameters send_params_; 512 VideoSendParameters send_params_;
515 VideoOptions default_send_options_; 513 VideoOptions default_send_options_;
516 VideoRecvParameters recv_params_; 514 VideoRecvParameters recv_params_;
517 int64_t last_stats_log_ms_; 515 int64_t last_stats_log_ms_;
518 }; 516 };
519 517
520 } // namespace cricket 518 } // namespace cricket
521 519
522 #endif // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOENGINE2_H_ 520 #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