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

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

Issue 2782523003: [Remoting Host] Supporting WebRTC VP9 streaming (Closed)
Patch Set: Fix Feedback Created 3 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
« no previous file with comments | « no previous file | remoting/protocol/webrtc_dummy_video_encoder.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 // 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_DUMMY_VIDEO_ENCODER_H_ 5 #ifndef REMOTING_PROTOCOL_WEBRTC_DUMMY_VIDEO_ENCODER_H_
6 #define REMOTING_PROTOCOL_WEBRTC_DUMMY_VIDEO_ENCODER_H_ 6 #define REMOTING_PROTOCOL_WEBRTC_DUMMY_VIDEO_ENCODER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 17 matching lines...) Expand all
28 // in WebrtcDummyVideoEncoderFactory. Video frames are captured and encoded 28 // in WebrtcDummyVideoEncoderFactory. Video frames are captured and encoded
29 // outside of this dummy encoder (in WebrtcVideoEncoder called from 29 // outside of this dummy encoder (in WebrtcVideoEncoder called from
30 // WebrtcVideoStream). They are passed to SendEncodedFrame() to be delivered to 30 // WebrtcVideoStream). They are passed to SendEncodedFrame() to be delivered to
31 // the network layer. 31 // the network layer.
32 class WebrtcDummyVideoEncoder : public webrtc::VideoEncoder { 32 class WebrtcDummyVideoEncoder : public webrtc::VideoEncoder {
33 public: 33 public:
34 enum State { kUninitialized = 0, kInitialized }; 34 enum State { kUninitialized = 0, kInitialized };
35 35
36 WebrtcDummyVideoEncoder( 36 WebrtcDummyVideoEncoder(
37 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 37 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
38 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer); 38 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer,
39 webrtc::VideoCodecType type);
39 ~WebrtcDummyVideoEncoder() override; 40 ~WebrtcDummyVideoEncoder() override;
40 41
41 // webrtc::VideoEncoder overrides. 42 // webrtc::VideoEncoder overrides.
42 int32_t InitEncode(const webrtc::VideoCodec* codec_settings, 43 int32_t InitEncode(const webrtc::VideoCodec* codec_settings,
43 int32_t number_of_cores, 44 int32_t number_of_cores,
44 size_t max_payload_size) override; 45 size_t max_payload_size) override;
45 int32_t RegisterEncodeCompleteCallback( 46 int32_t RegisterEncodeCompleteCallback(
46 webrtc::EncodedImageCallback* callback) override; 47 webrtc::EncodedImageCallback* callback) override;
47 int32_t Release() override; 48 int32_t Release() override;
48 int32_t Encode(const webrtc::VideoFrame& frame, 49 int32_t Encode(const webrtc::VideoFrame& frame,
49 const webrtc::CodecSpecificInfo* codec_specific_info, 50 const webrtc::CodecSpecificInfo* codec_specific_info,
50 const std::vector<webrtc::FrameType>* frame_types) override; 51 const std::vector<webrtc::FrameType>* frame_types) override;
51 int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override; 52 int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
52 int32_t SetRates(uint32_t bitrate, uint32_t framerate) override; 53 int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
53 54
54 webrtc::EncodedImageCallback::Result SendEncodedFrame( 55 webrtc::EncodedImageCallback::Result SendEncodedFrame(
55 const WebrtcVideoEncoder::EncodedFrame& frame, 56 const WebrtcVideoEncoder::EncodedFrame& frame,
56 base::TimeTicks capture_time); 57 base::TimeTicks capture_time);
57 58
58 private: 59 private:
59 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; 60 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
60 61
61 // Protects |encoded_callback_| and |state_|. 62 // Protects |encoded_callback_| and |state_|.
62 base::Lock lock_; 63 base::Lock lock_;
63 State state_; 64 State state_;
64 webrtc::EncodedImageCallback* encoded_callback_ = nullptr; 65 webrtc::EncodedImageCallback* encoded_callback_ = nullptr;
66 webrtc::VideoCodecType codec_type_;
65 67
66 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer_; 68 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer_;
67 }; 69 };
68 70
69 // This is the external encoder factory implementation that is passed to 71 // This is the external encoder factory implementation that is passed to
70 // WebRTC at the time of creation of peer connection. The external encoder 72 // WebRTC at the time of creation of peer connection. The external encoder
71 // factory primarily manages creation and destruction of encoder. 73 // factory primarily manages creation and destruction of encoder.
72 class WebrtcDummyVideoEncoderFactory 74 class WebrtcDummyVideoEncoderFactory
73 : public cricket::WebRtcVideoEncoderFactory { 75 : public cricket::WebRtcVideoEncoderFactory {
74 public: 76 public:
75 WebrtcDummyVideoEncoderFactory(); 77 WebrtcDummyVideoEncoderFactory();
76 ~WebrtcDummyVideoEncoderFactory() override; 78 ~WebrtcDummyVideoEncoderFactory() override;
77 79
78 // cricket::WebRtcVideoEncoderFactory interface. 80 // cricket::WebRtcVideoEncoderFactory interface.
79 webrtc::VideoEncoder* CreateVideoEncoder( 81 webrtc::VideoEncoder* CreateVideoEncoder(
80 webrtc::VideoCodecType type) override; 82 webrtc::VideoCodecType type) override;
81 const std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>& codecs() 83 const std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec>& codecs()
82 const override; 84 const override;
83 bool EncoderTypeHasInternalSource(webrtc::VideoCodecType type) const override; 85 bool EncoderTypeHasInternalSource(webrtc::VideoCodecType type) const override;
84 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override; 86 void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
85 87
86 webrtc::EncodedImageCallback::Result SendEncodedFrame( 88 webrtc::EncodedImageCallback::Result SendEncodedFrame(
87 const WebrtcVideoEncoder::EncodedFrame& packet, 89 const WebrtcVideoEncoder::EncodedFrame& packet,
88 base::TimeTicks capture_time); 90 base::TimeTicks capture_time);
89 91
92 // Callback will be called once the dummy encoder has been created on
93 // |main_task_runner_|.
94 void RegisterEncoderSelectedCallback(
95 const base::Callback<void(webrtc::VideoCodecType)>& callback);
96
90 void SetVideoChannelStateObserver( 97 void SetVideoChannelStateObserver(
91 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer); 98 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer);
92 base::WeakPtr<VideoChannelStateObserver> 99 base::WeakPtr<VideoChannelStateObserver>
93 get_video_channel_state_observer_for_tests() { 100 get_video_channel_state_observer_for_tests() {
94 return video_channel_state_observer_; 101 return video_channel_state_observer_;
95 } 102 }
96 103
97 private: 104 private:
98 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; 105 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
99 106
100 std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> codecs_; 107 std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> codecs_;
101 108
102 // Protects |video_channel_state_observer_| and |encoders_|. 109 // Protects |video_channel_state_observer_| and |encoders_|.
103 base::Lock lock_; 110 base::Lock lock_;
104 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer_; 111 base::WeakPtr<VideoChannelStateObserver> video_channel_state_observer_;
105 std::vector<std::unique_ptr<WebrtcDummyVideoEncoder>> encoders_; 112 std::vector<std::unique_ptr<WebrtcDummyVideoEncoder>> encoders_;
113 base::Callback<void(webrtc::VideoCodecType)> encoder_created_callback_;
106 }; 114 };
107 115
108 } // namespace protocol 116 } // namespace protocol
109 } // namespace remoting 117 } // namespace remoting
110 118
111 #endif // REMOTING_PROTOCOL_WEBRTC_DUMMY_VIDEO_ENCODER_H_ 119 #endif // REMOTING_PROTOCOL_WEBRTC_DUMMY_VIDEO_ENCODER_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/protocol/webrtc_dummy_video_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698