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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h

Issue 2398963003: Move usage of QualityScaler to ViEEncoder. (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 */
11 11
12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_ 12 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_ 13 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
14 14
15 #include "webrtc/base/criticalsection.h" 15 #include "webrtc/base/criticalsection.h"
16 #include "webrtc/common_video/include/bitrate_adjuster.h" 16 #include "webrtc/common_video/include/bitrate_adjuster.h"
17 #include "webrtc/common_video/rotation.h" 17 #include "webrtc/common_video/rotation.h"
18 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 18 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
19 #include "webrtc/modules/video_coding/utility/h264_bitstream_parser.h" 19 #include "webrtc/modules/video_coding/utility/h264_bitstream_parser.h"
20 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
21 20
22 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) 21 #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
23 22
24 #include <VideoToolbox/VideoToolbox.h> 23 #include <VideoToolbox/VideoToolbox.h>
25 #include <vector> 24 #include <vector>
26 25
27 // This file provides a H264 encoder implementation using the VideoToolbox 26 // This file provides a H264 encoder implementation using the VideoToolbox
28 // APIs. Since documentation is almost non-existent, this is largely based on 27 // APIs. Since documentation is almost non-existent, this is largely based on
29 // the information in the VideoToolbox header files, a talk from WWDC 2014 and 28 // the information in the VideoToolbox header files, a talk from WWDC 2014 and
30 // experimentation. 29 // experimentation.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 void SetEncoderBitrateBps(uint32_t bitrate_bps); 77 void SetEncoderBitrateBps(uint32_t bitrate_bps);
79 78
80 EncodedImageCallback* callback_; 79 EncodedImageCallback* callback_;
81 VTCompressionSessionRef compression_session_; 80 VTCompressionSessionRef compression_session_;
82 BitrateAdjuster bitrate_adjuster_; 81 BitrateAdjuster bitrate_adjuster_;
83 uint32_t target_bitrate_bps_; 82 uint32_t target_bitrate_bps_;
84 uint32_t encoder_bitrate_bps_; 83 uint32_t encoder_bitrate_bps_;
85 int32_t width_; 84 int32_t width_;
86 int32_t height_; 85 int32_t height_;
87 86
88 rtc::CriticalSection quality_scaler_crit_;
89 QualityScaler quality_scaler_ GUARDED_BY(quality_scaler_crit_);
90 H264BitstreamParser h264_bitstream_parser_; 87 H264BitstreamParser h264_bitstream_parser_;
91 bool enable_scaling_; 88 bool enable_scaling_;
92 }; // H264VideoToolboxEncoder 89 }; // H264VideoToolboxEncoder
93 90
94 } // namespace webrtc 91 } // namespace webrtc
95 92
96 #endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) 93 #endif // defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)
97 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_ 94 #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698