Fix BitrateAdjuster issues in VTVideoEncodeAccelerator

media/gpu/vt_video_encode_accelerator_mac.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
 #define MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_
 
 #include <memory>
 
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 45 matching lines @@
 
   // Encoding tasks to be run on |encoder_thread_|.
   void EncodeTask(const scoped_refptr<media::VideoFrame>& frame,
                   bool force_keyframe);
   void UseOutputBitstreamBufferTask(
       std::unique_ptr<BitstreamBufferRef> buffer_ref);
   void RequestEncodingParametersChangeTask(uint32_t bitrate,
                                            uint32_t framerate);
   void DestroyTask();
 
+  // Helper function to set bitrate.
+  void SetAdjustedBitrate(int32_t bitrate);
+
   // Helper function to notify the client of an error on |client_task_runner_|.
   void NotifyError(media::VideoEncodeAccelerator::Error error);
 
   // Compression session callback function to handle compressed frames.
   static void CompressionCallback(void* encoder_opaque,
                                   void* request_opaque,
                                   OSStatus status,
                                   VTEncodeInfoFlags info,
                                   CMSampleBufferRef sbuf);
   void CompressionCallbackTask(OSStatus status,
@@ skipping 24 matching lines @@
   // encoding work).
   void DestroyCompressionSession();
 
   // VideoToolboxGlue provides access to VideoToolbox at runtime.
   const VideoToolboxGlue* videotoolbox_glue_;
   base::ScopedCFTypeRef<VTCompressionSessionRef> compression_session_;
 
   gfx::Size input_visible_size_;
   size_t bitstream_buffer_size_;
   int32_t frame_rate_;
+  int32_t initial_bitrate_;
   int32_t target_bitrate_;
-  int32_t adjusted_bitrate_;
+  int32_t encoder_set_bitrate_;
 
   // Bitrate adjuster used to fix VideoToolbox's inconsistent bitrate issues.
   webrtc::BitrateAdjuster bitrate_adjuster_;
 
   // Bitstream buffers ready to be used to return encoded output as a FIFO.
   std::deque<std::unique_ptr<BitstreamBufferRef>> bitstream_buffer_queue_;
 
   // EncodeOutput needs to be copied into a BitstreamBufferRef as a FIFO.
   std::deque<std::unique_ptr<EncodeOutput>> encoder_output_queue_;
 
@@ skipping 19 matching lines @@
   // other destructors run.
   base::WeakPtr<VTVideoEncodeAccelerator> encoder_weak_ptr_;
   base::WeakPtrFactory<VTVideoEncodeAccelerator> encoder_task_weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VTVideoEncodeAccelerator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_VT_VIDEO_ENCODE_ACCELERATOR_MAC_H_