zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder

Browse Source 
Currently, ownership of the wrapped hardware encoder is handled outside
VideoEncoderSoftwareFallbackWrapper. It's easier if
VideoEncoderSoftwareFallbackWrapper owns and relases it instead.

BUG=webrtc:7925

Review-Url: https://codereview.webrtc.org/3007683002
Cr-Commit-Position: refs/heads/master@{#19572}
This commit is contained in:
magjed
2017-08-29 00:58:52 -07:00
committed by Commit Bot
parent d4495312dc
commit f52d34d682
5 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/media/engine/webrtcvideoengine.h
View File

@ -317,7 +317,7 @@ class WebRtcVideoChannel : public VideoMediaChannel, public webrtc::Transport {
AllocatedEncoder& operator=(AllocatedEncoder&&) = default;
AllocatedEncoder(std::unique_ptr<webrtc::VideoEncoder> encoder,
std::unique_ptr<webrtc::VideoEncoder> external_encoder,
bool is_external,
const cricket::VideoCodec& codec,
bool has_internal_source);
@ -326,7 +326,7 @@ class WebRtcVideoChannel : public VideoMediaChannel, public webrtc::Transport {
webrtc::VideoEncoder* encoder() { return encoder_.get(); }
// Returns true if the encoder is external.
bool IsExternal() { return static_cast<bool>(external_encoder_); }
bool IsExternal() { return is_external_; }
cricket::VideoCodec codec() { return codec_; }
@ -337,11 +337,7 @@ class WebRtcVideoChannel : public VideoMediaChannel, public webrtc::Transport {
private:
std::unique_ptr<webrtc::VideoEncoder> encoder_;
// TODO(magjed): |external_encoder_| is not used except for managing
// the lifetime when we use VideoEncoderSoftwareFallbackWrapper. Let
// VideoEncoderSoftwareFallbackWrapper own the external encoder instead
// and remove this member variable.
std::unique_ptr<webrtc::VideoEncoder> external_encoder_;
bool is_external_;
cricket::VideoCodec codec_;
bool has_internal_source_;
};