mac: Remove more media/base/mac glue unneeded now that we target 10.9

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 <deque>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
-#include "media/base/mac/videotoolbox_glue.h"
 #include "media/base/mac/videotoolbox_helpers.h"
 #include "media/gpu/media_gpu_export.h"
 #include "media/video/video_encode_accelerator.h"
 #include "third_party/webrtc/common_video/include/bitrate_adjuster.h"
 
 namespace media {
 
 // VideoToolbox.framework implementation of the VideoEncodeAccelerator
 // interface for MacOSX. VideoToolbox makes no guarantees that it is thread
 // safe, so this object is pinned to the thread on which it is constructed.
@@ skipping 11 matching lines @@
                   uint32_t initial_bitrate,
                   Client* client) override;
   void Encode(const scoped_refptr<VideoFrame>& frame,
               bool force_keyframe) override;
   void UseOutputBitstreamBuffer(const BitstreamBuffer& buffer) override;
   void RequestEncodingParametersChange(uint32_t bitrate,
                                        uint32_t framerate) override;
   void Destroy() override;
 
  private:
-  using CMSampleBufferRef = CoreMediaGlue::CMSampleBufferRef;
-  using VTCompressionSessionRef = VideoToolboxGlue::VTCompressionSessionRef;
-  using VTEncodeInfoFlags = VideoToolboxGlue::VTEncodeInfoFlags;
-
   // Holds the associated data of a video frame being processed.
   struct InProgressFrameEncode;
 
   // Holds output buffers coming from the encoder.
   struct EncodeOutput;
 
   // Holds output buffers coming from the client ready to be filled.
   struct BitstreamBufferRef;
 
   // Encoding tasks to be run on |encoder_thread_|.
@@ skipping 37 matching lines @@
       bool require_hw_encoding);
 
   // Configure the current compression session using current encoder settings.
   bool ConfigureCompressionSession();
 
   // Destroy the current compression session if any. Blocks until all pending
   // frames have been flushed out (similar to EmitFrames without doing any
   // 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 encoder_set_bitrate_;
 
   // Bitrate adjuster used to fix VideoToolbox's inconsistent bitrate issues.
@@ skipping 27 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_