| Index: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
|
| diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
|
| index 1e461b992f7c60d7526479c1dd3ae9c9939de855..ca28eb325006bd3be6d427f7416c6bf2a3c61e3c 100644
|
| --- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
|
| +++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
|
| @@ -44,7 +44,8 @@ class H264EncoderImpl : public H264Encoder {
|
|
|
| int32_t RegisterEncodeCompleteCallback(
|
| EncodedImageCallback* callback) override;
|
| - int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
|
| + int32_t SetRateAllocation(const BitrateAllocation& bitrate_allocation,
|
| + uint32_t framerate) override;
|
|
|
| // The result of encoding - an EncodedImage and RTPFragmentationHeader - are
|
| // passed to the encode complete callback.
|
| @@ -74,8 +75,8 @@ class H264EncoderImpl : public H264Encoder {
|
| int width_;
|
| int height_;
|
| float max_frame_rate_;
|
| - unsigned int target_bps_;
|
| - unsigned int max_bps_;
|
| + uint32_t target_bps_;
|
| + uint32_t max_bps_;
|
| VideoCodecMode mode_;
|
| // H.264 specifc parameters
|
| bool frame_dropping_on_;
|
|
|