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

Side by Side Diff: remoting/protocol/webrtc_video_encoder.h

Issue 1908203002: Adapt encoder behavior to target bitrate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_ENCODER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_ENCODER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_ENCODER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_VIDEO_ENCODER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/synchronization/lock.h" 12 #include "base/synchronization/lock.h"
13 #include "remoting/proto/video.pb.h" 13 #include "remoting/proto/video.pb.h"
14 #include "third_party/webrtc/media/engine/webrtcvideoencoderfactory.h" 14 #include "third_party/webrtc/media/engine/webrtcvideoencoderfactory.h"
15 #include "third_party/webrtc/modules/video_coding/include/video_codec_interface. h" 15 #include "third_party/webrtc/modules/video_coding/include/video_codec_interface. h"
16 16
17 namespace remoting { 17 namespace remoting {
18 18
19 using TargetBitrateCallback = base::Callback<void(uint32_t)>;
20
19 // This is the interface between the WebRtc engine and the external encoder 21 // This is the interface between the WebRtc engine and the external encoder
20 // provided by remoting. WebRtc provides feedback on network bandwidth, latency 22 // provided by remoting. WebRtc provides feedback on network bandwidth, latency
21 // & RTT and in turn remoting passes encoded frames as they get encoded 23 // & RTT and in turn remoting passes encoded frames as they get encoded
22 // through the capture pipeline. 24 // through the capture pipeline.
23 class WebRtcVideoEncoder : public webrtc::VideoEncoder { 25 class WebRtcVideoEncoder : public webrtc::VideoEncoder {
24 public: 26 public:
25 enum State { kUninitialized = 0, kInitialized }; 27 enum State { kUninitialized = 0, kInitialized };
26 explicit WebRtcVideoEncoder(webrtc::VideoCodecType codec); 28 explicit WebRtcVideoEncoder(webrtc::VideoCodecType codec);
27 ~WebRtcVideoEncoder() override; 29 ~WebRtcVideoEncoder() override;
28 30
29 // webrtc::VideoEncoder overrides 31 // webrtc::VideoEncoder overrides
30 int32_t InitEncode(const webrtc::VideoCodec* codec_settings, 32 int32_t InitEncode(const webrtc::VideoCodec* codec_settings,
31 int32_t number_of_cores, 33 int32_t number_of_cores,
32 size_t max_payload_size) override; 34 size_t max_payload_size) override;
33 int32_t RegisterEncodeCompleteCallback( 35 int32_t RegisterEncodeCompleteCallback(
34 webrtc::EncodedImageCallback* callback) override; 36 webrtc::EncodedImageCallback* callback) override;
35 int32_t Release() override; 37 int32_t Release() override;
36 int32_t Encode(const webrtc::VideoFrame& frame, 38 int32_t Encode(const webrtc::VideoFrame& frame,
37 const webrtc::CodecSpecificInfo* codec_specific_info, 39 const webrtc::CodecSpecificInfo* codec_specific_info,
38 const std::vector<webrtc::FrameType>* frame_types) override; 40 const std::vector<webrtc::FrameType>* frame_types) override;
39 int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override; 41 int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
40 int32_t SetRates(uint32_t bitrate, uint32_t framerate) override; 42 int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
41 43
42 int SendEncodedFrame(int64_t capture_timestamp_ms, 44 int SendEncodedFrame(int64_t capture_timestamp_ms,
43 std::unique_ptr<VideoPacket> pkt); 45 std::unique_ptr<VideoPacket> pkt);
44 void SetKeyFrameRequestCallback(const base::Closure& key_frame_request); 46 void SetKeyFrameRequestCallback(const base::Closure& key_frame_request);
47 void SetTargetBitrateCallback(const TargetBitrateCallback& target_bitrate_cb);
45 48
46 private: 49 private:
47 // Protects |encoded_callback_|, |key_frame_request_| and |state_|. 50 // Protects |encoded_callback_|, |key_frame_request_|,
51 // |target_bitrate_cb_| and |state_|.
48 base::Lock lock_; 52 base::Lock lock_;
49 State state_; 53 State state_;
50 webrtc::EncodedImageCallback* encoded_callback_; 54 webrtc::EncodedImageCallback* encoded_callback_;
51 55
52 base::Closure key_frame_request_; 56 base::Closure key_frame_request_;
57 TargetBitrateCallback target_bitrate_cb_;
53 webrtc::VideoCodecType video_codec_type_; 58 webrtc::VideoCodecType video_codec_type_;
54 uint32_t target_bitrate_;
55 }; 59 };
56 60
57 // This is the external encoder factory implementation that is passed to 61 // This is the external encoder factory implementation that is passed to
58 // WebRTC at the time of creation of peer connection. The external encoder 62 // WebRTC at the time of creation of peer connection. The external encoder
59 // factory primarily manages creation and destruction of encoder. 63 // factory primarily manages creation and destruction of encoder.
60 class WebRtcVideoEncoderFactory : public cricket::WebRtcVideoEncoderFactory { 64 class WebRtcVideoEncoderFactory : public cricket::WebRtcVideoEncoderFactory {
61 public: 65 public:
62 WebRtcVideoEncoderFactory(); 66 WebRtcVideoEncoderFactory();
63 ~WebRtcVideoEncoderFactory() override; 67 ~WebRtcVideoEncoderFactory() override;
64 68
65 webrtc::VideoEncoder* CreateVideoEncoder( 69 webrtc::VideoEncoder* CreateVideoEncoder(
66 webrtc::VideoCodecType type) override; 70 webrtc::VideoCodecType type) override;
67 const std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>& codecs() 71 const std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>& codecs()
68 const override; 72 const override;
69 73
70 // Returns true to directly provide encoded frames to webrtc 74 // Returns true to directly provide encoded frames to webrtc
71 bool EncoderTypeHasInternalSource(webrtc::VideoCodecType type) const override; 75 bool EncoderTypeHasInternalSource(webrtc::VideoCodecType type) const override;
72 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; 76 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
73 77
74 int SendEncodedFrame(int64_t capture_timestamp_ms, 78 int SendEncodedFrame(int64_t capture_timestamp_ms,
75 std::unique_ptr<VideoPacket> pkt); 79 std::unique_ptr<VideoPacket> pkt);
76 80
77 void SetKeyFrameRequestCallback(const base::Closure& key_frame_request); 81 void SetKeyFrameRequestCallback(const base::Closure& key_frame_request);
82 void SetTargetBitrateCallback(const TargetBitrateCallback& target_bitrate_cb);
78 83
79 private: 84 private:
80 // Protects |key_frame_request_|. 85 // Protects |key_frame_request_| and |target_bitrate_cb_|.
81 base::Lock lock_; 86 base::Lock lock_;
82 base::Closure key_frame_request_; 87 base::Closure key_frame_request_;
88 TargetBitrateCallback target_bitrate_cb_;
83 std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> codecs_; 89 std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> codecs_;
84 std::vector<std::unique_ptr<WebRtcVideoEncoder>> encoders_; 90 std::vector<std::unique_ptr<WebRtcVideoEncoder>> encoders_;
85 }; 91 };
86 92
87 } // namespace remoting 93 } // namespace remoting
88 94
89 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_ENCODER_H_ 95 #endif // REMOTING_PROTOCOL_WEBRTC_VIDEO_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698