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

Side by Side Diff: webrtc/modules/video_coding/video_coding_impl.h

Issue 1904983002: Use vcm::VideoSender in ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove more dead code 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
« no previous file with comments | « tools/valgrind-webrtc/memcheck/suppressions.txt ('k') | webrtc/video/video_send_stream.h » ('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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 int64_t Period() const; 44 int64_t Period() const;
45 int64_t TimeUntilProcess() const; 45 int64_t TimeUntilProcess() const;
46 void Processed(); 46 void Processed();
47 47
48 private: 48 private:
49 Clock* _clock; 49 Clock* _clock;
50 int64_t _periodMs; 50 int64_t _periodMs;
51 int64_t _latestMs; 51 int64_t _latestMs;
52 }; 52 };
53 53
54 class VideoSender { 54 class VideoSender : public Module {
55 public: 55 public:
56 typedef VideoCodingModule::SenderNackMode SenderNackMode; 56 typedef VideoCodingModule::SenderNackMode SenderNackMode;
57 57
58 VideoSender(Clock* clock, 58 VideoSender(Clock* clock,
59 EncodedImageCallback* post_encode_callback, 59 EncodedImageCallback* post_encode_callback,
60 VideoEncoderRateObserver* encoder_rate_observer, 60 VideoEncoderRateObserver* encoder_rate_observer,
61 VCMQMSettingsCallback* qm_settings_callback); 61 VCMQMSettingsCallback* qm_settings_callback);
62 62
63 ~VideoSender(); 63 ~VideoSender();
64 64
(...skipping 24 matching lines...) Expand all
89 int32_t AddVideoFrame(const VideoFrame& videoFrame, 89 int32_t AddVideoFrame(const VideoFrame& videoFrame,
90 const VideoContentMetrics* _contentMetrics, 90 const VideoContentMetrics* _contentMetrics,
91 const CodecSpecificInfo* codecSpecificInfo); 91 const CodecSpecificInfo* codecSpecificInfo);
92 92
93 int32_t IntraFrameRequest(int stream_index); 93 int32_t IntraFrameRequest(int stream_index);
94 int32_t EnableFrameDropper(bool enable); 94 int32_t EnableFrameDropper(bool enable);
95 95
96 void SuspendBelowMinBitrate(); 96 void SuspendBelowMinBitrate();
97 bool VideoSuspended() const; 97 bool VideoSuspended() const;
98 98
99 int64_t TimeUntilNextProcess(); 99 int64_t TimeUntilNextProcess() override;
100 void Process(); 100 void Process() override;
101 101
102 private: 102 private:
103 void SetEncoderParameters(EncoderParameters params) 103 void SetEncoderParameters(EncoderParameters params)
104 EXCLUSIVE_LOCKS_REQUIRED(encoder_crit_); 104 EXCLUSIVE_LOCKS_REQUIRED(encoder_crit_);
105 105
106 Clock* const clock_; 106 Clock* const clock_;
107 107
108 rtc::CriticalSection process_crit_; 108 rtc::CriticalSection process_crit_;
109 rtc::CriticalSection encoder_crit_; 109 rtc::CriticalSection encoder_crit_;
110 VCMGenericEncoder* _encoder; 110 VCMGenericEncoder* _encoder;
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 VCMProcessTimer _receiveStatsTimer; 216 VCMProcessTimer _receiveStatsTimer;
217 VCMProcessTimer _retransmissionTimer; 217 VCMProcessTimer _retransmissionTimer;
218 VCMProcessTimer _keyRequestTimer; 218 VCMProcessTimer _keyRequestTimer;
219 QpParser qp_parser_; 219 QpParser qp_parser_;
220 ThreadUnsafeOneTimeEvent first_frame_received_; 220 ThreadUnsafeOneTimeEvent first_frame_received_;
221 }; 221 };
222 222
223 } // namespace vcm 223 } // namespace vcm
224 } // namespace webrtc 224 } // namespace webrtc
225 #endif // WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_ 225 #endif // WEBRTC_MODULES_VIDEO_CODING_VIDEO_CODING_IMPL_H_
OLDNEW
« no previous file with comments | « tools/valgrind-webrtc/memcheck/suppressions.txt ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698