Flush correctly in VTVideoDecodeAccelerator.

content/common/gpu/media/vt_video_decode_accelerator.cc

 // Copyright 2014 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.
 
 #include <algorithm>
 
 #include <CoreVideo/CoreVideo.h>
 #include <OpenGL/CGLIOSurface.h>
 #include <OpenGL/gl.h>
 
@@ skipping 228 matching lines @@
   // Spawn a thread to handle parsing and calling VideoToolbox.
   if (!decoder_thread_.Start())
     return false;
 
   return true;
 }
 
 bool VTVideoDecodeAccelerator::FinishDelayedFrames() {
   DCHECK(decoder_thread_.message_loop_proxy()->BelongsToCurrentThread());
   if (session_) {
-    OSStatus status = VTDecompressionSessionFinishDelayedFrames(session_);
+    OSStatus status = VTDecompressionSessionWaitForAsynchronousFrames(session_);

[DaleCurtis, 2014/12/02 18:28:01]

Does blocking the decoder thread for this prevent other necessary actions on the
thread?

[sandersd (OOO until July 31), 2014/12/02 18:30:39]

There are no necessary actions on the decoder thread.

     if (status) {
-      NOTIFY_STATUS("VTDecompressionSessionFinishDelayedFrames()", status);
+      NOTIFY_STATUS("VTDecompressionSessionWaitForAsynchronousFrames()",
+                    status);
       return false;
     }
   }
   return true;
 }
 
 bool VTVideoDecodeAccelerator::ConfigureDecoder() {
   DCHECK(decoder_thread_.message_loop_proxy()->BelongsToCurrentThread());
   DCHECK(!last_sps_.empty());
   DCHECK(!last_pps_.empty());
@@ skipping 49 matching lines @@
 
   CFDictionarySetValue(
       decoder_config,
       // kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder
       CFSTR("EnableHardwareAcceleratedVideoDecoder"),
       kCFBooleanTrue);
 
   base::ScopedCFTypeRef<CFMutableDictionaryRef> image_config(
       BuildImageConfig(coded_dimensions));
 
-  // TODO(sandersd): Does the old session need to be flushed first?
+  if (!FinishDelayedFrames())
+    return false;
   session_.reset();
   status = VTDecompressionSessionCreate(
       kCFAllocatorDefault,
       format_,              // video_format_description
       decoder_config,       // video_decoder_specification
       image_config,         // destination_image_buffer_attributes
       &callback_,           // output_callback
       session_.InitializeInto());
   if (status) {
     NOTIFY_STATUS("VTDecompressionSessionCreate()", status);
@@ skipping 553 matching lines @@
   assigned_bitstream_ids_.clear();
   state_ = STATE_DESTROYING;
   QueueFlush(TASK_DESTROY);
 }
 
 bool VTVideoDecodeAccelerator::CanDecodeOnIOThread() {
   return false;
 }
 
 }  // namespace content