DXVA: Avoid infinite recursion

media/gpu/dxva_video_decode_accelerator_win.cc

 // Copyright (c) 2012 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 "media/gpu/dxva_video_decode_accelerator_win.h"
 
 #include <memory>
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
@@ skipping 1760 matching lines @@
   // This function is also called from FlushInternal in a loop which could
   // result in the state transitioning to kStopped due to no decoded output.
   State state = GetState();
   RETURN_AND_NOTIFY_ON_FAILURE(
       (state == kNormal || state == kFlushing || state == kStopped),
       "DoDecode: not in normal/flushing/stopped state", ILLEGAL_STATE, );
 
   if (D3D11Device())
     g_last_device_removed_reason = D3D11Device()->GetDeviceRemovedReason();
 
-  MFT_OUTPUT_DATA_BUFFER output_data_buffer = {0};
-  DWORD status = 0;
-  HRESULT hr;
-  {
-    ScopedExceptionCatcher catcher(using_ms_vp9_mft_);
-    g_last_process_output_time = GetCurrentQPC();
-    hr = decoder_->ProcessOutput(0,  // No flags
-                                 1,  // # of out streams to pull from
-                                 &output_data_buffer, &status);
-  }
-  IMFCollection* events = output_data_buffer.pEvents;
-  if (events != NULL) {
-    DVLOG(1) << "Got events from ProcessOuput, but discarding";
-    events->Release();
-  }
   base::win::ScopedComPtr<IMFSample> output_sample;
-  output_sample.Attach(output_data_buffer.pSample);
-  if (FAILED(hr)) {
-    // A stream change needs further ProcessInput calls to get back decoder
-    // output which is why we need to set the state to stopped.
-    if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
-      if (!SetDecoderOutputMediaType(MFVideoFormat_NV12) &&
-          !SetDecoderOutputMediaType(MFVideoFormat_P010) &&
-          !SetDecoderOutputMediaType(MFVideoFormat_P016)) {
-        // Decoder didn't let us set NV12 output format. Not sure as to why
-        // this can happen. Give up in disgust.
-        NOTREACHED() << "Failed to set decoder output media type to NV12";
+  int retries = 10;
+  while (true) {
+    MFT_OUTPUT_DATA_BUFFER output_data_buffer = {0};

[jbauman, 2017/04/29 00:03:44]

output_sample.Reset(); here in case the previous iteration output a sample for
some reason.

[hubbe, 2017/05/01 22:39:33]

Done.

+    DWORD status = 0;
+    HRESULT hr;
+    {
+      ScopedExceptionCatcher catcher(using_ms_vp9_mft_);
+      g_last_process_output_time = GetCurrentQPC();
+      hr = decoder_->ProcessOutput(0,  // No flags
+                                   1,  // # of out streams to pull from
+                                   &output_data_buffer, &status);
+    }
+    IMFCollection* events = output_data_buffer.pEvents;
+    if (events != NULL) {
+      DVLOG(1) << "Got events from ProcessOuput, but discarding";
+      events->Release();
+    }
+    output_sample.Attach(output_data_buffer.pSample);
+    if (FAILED(hr)) {
+      // A stream change needs further ProcessInput calls to get back decoder
+      // output which is why we need to set the state to stopped.
+      if (hr == MF_E_TRANSFORM_STREAM_CHANGE) {
+        if (!SetDecoderOutputMediaType(MFVideoFormat_NV12) &&
+            !SetDecoderOutputMediaType(MFVideoFormat_P010) &&
+            !SetDecoderOutputMediaType(MFVideoFormat_P016)) {
+          // Decoder didn't let us set NV12 output format. Not sure as to why
+          // this can happen. Give up in disgust.
+          NOTREACHED() << "Failed to set decoder output media type to NV12";
+          SetState(kStopped);
+        } else {
+          if (retries-- > 0) {
+            DVLOG(1) << "Received format change from the decoder, retrying.";
+            continue;  // Retry
+          } else {
+            DVLOG(1) << "Received too many format changes from decoder.";

[jbauman, 2017/04/29 00:03:44]

Use RETURN_AND_NOTIFY_ON_FAILURE here so we can detect this in release builds.

[hubbe, 2017/05/01 22:39:33]

Done.

+            return;
+          }
+        }
+        return;
+      } else if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
+        // No more output from the decoder. Stop playback.
         SetState(kStopped);
+        return;
       } else {
-        DVLOG(1) << "Received output format change from the decoder."
-                    " Recursively invoking DoDecode";
-        DoDecode(color_space);
+        NOTREACHED() << "Unhandled error in DoDecode()";
+        g_last_unhandled_error = hr;
+        return;
       }
-      return;
-    } else if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
-      // No more output from the decoder. Stop playback.
-      SetState(kStopped);
-      return;
-    } else {
-      NOTREACHED() << "Unhandled error in DoDecode()";
-      g_last_unhandled_error = hr;
-      return;
     }
+
+    break;  // No more retries needed.
   }
   TRACE_EVENT_ASYNC_END0("gpu", "DXVAVideoDecodeAccelerator.Decoding", this);
 
   TRACE_COUNTER1("DXVA Decoding", "TotalPacketsBeforeDecode",
                  inputs_before_decode_);
 
   inputs_before_decode_ = 0;
 
   RETURN_AND_NOTIFY_ON_FAILURE(ProcessOutputSample(output_sample, color_space),
                                "Failed to process output sample.",
@@ skipping 1172 matching lines @@
 uint32_t DXVAVideoDecodeAccelerator::GetTextureTarget() const {
   bool provide_nv12_textures = share_nv12_textures_ || copy_nv12_textures_;
   return provide_nv12_textures ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
 }
 
 ID3D11Device* DXVAVideoDecodeAccelerator::D3D11Device() const {
   return share_nv12_textures_ ? angle_device_.Get() : d3d11_device_.Get();
 }
 
 }  // namespace media