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

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

Issue 2398963003: Move usage of QualityScaler to ViEEncoder. (Closed)
Patch Set: Code review comments Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
index cb7ca34e61ef255e3e0e75fbe7da5b0416b4fb4d..6b0176f10980bc9aeb5e5ca7c68f63c6d6f69870 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
+++ b/webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
@@ -17,7 +17,6 @@
#include "webrtc/common_video/rotation.h"
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/utility/h264_bitstream_parser.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
@@ -47,7 +46,6 @@ class H264VideoToolboxEncoder : public H264Encoder {
int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
- void OnDroppedFrame() override;
int SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
int SetRates(uint32_t new_bitrate_kbit, uint32_t frame_rate) override;
@@ -68,6 +66,8 @@ class H264VideoToolboxEncoder : public H264Encoder {
uint32_t timestamp,
VideoRotation rotation);
+ rtc::Optional<VideoEncoder::QPThresholds> GetQPThresholds() override;
+
private:
int ResetCompressionSession();
void ConfigureCompressionSession();
@@ -85,10 +85,7 @@ class H264VideoToolboxEncoder : public H264Encoder {
int32_t width_;
int32_t height_;
- rtc::CriticalSection quality_scaler_crit_;
- QualityScaler quality_scaler_ GUARDED_BY(quality_scaler_crit_);
H264BitstreamParser h264_bitstream_parser_;
- bool enable_scaling_;
}; // H264VideoToolboxEncoder
} // namespace webrtc

Powered by Google App Engine
This is Rietveld 408576698