Merge 58: Enforce MaxFrameDelayCount in VTVideoEncodeAccelerator and cleanups

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>
 
@@ skipping 69 matching lines @@
   // Copy CMSampleBuffer into a BitstreamBuffer and return it to the |client_|.
   void ReturnBitstreamBuffer(
       std::unique_ptr<EncodeOutput> encode_output,
       std::unique_ptr<VTVideoEncodeAccelerator::BitstreamBufferRef> buffer_ref);
 
   // Reset the encoder's compression session by destroying the existing one
   // using DestroyCompressionSession() and creating a new one. The new session
   // is configured using ConfigureCompressionSession().
   bool ResetCompressionSession();
 
-  // Create a compression session, with HW encoder enforced if
-  // |require_hw_encoding| is set.
-  bool CreateCompressionSession(
-      base::ScopedCFTypeRef<CFDictionaryRef> attributes,
-      const gfx::Size& input_size,
-      bool require_hw_encoding);
+  // Create a compression session.
+  bool CreateCompressionSession(const gfx::Size& input_size);
 
   // 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();
 
   base::ScopedCFTypeRef<VTCompressionSessionRef> compression_session_;
@@ skipping 36 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_