Drop frames until first IDR in VTVDA.

content/common/gpu/media/vt_video_decode_accelerator_mac.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>
 #include <stddef.h>
@@ skipping 284 matching lines @@
     const base::Callback<void(uint32_t, uint32_t, scoped_refptr<gl::GLImage>)>&
         bind_image)
     : make_context_current_(make_context_current),
       bind_image_(bind_image),
       client_(nullptr),
       state_(STATE_DECODING),
       format_(nullptr),
       session_(nullptr),
       last_sps_id_(-1),
       last_pps_id_(-1),
+      config_changed_(false),
+      missing_idr_logged_(false),
       gpu_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       decoder_thread_("VTDecoderThread"),
       weak_this_factory_(this) {
   DCHECK(!make_context_current_.is_null());
   callback_.decompressionOutputCallback = OutputThunk;
   callback_.decompressionOutputRefCon = this;
   weak_this_ = weak_this_factory_.GetWeakPtr();
 }
 
 VTVideoDecodeAccelerator::~VTVideoDecodeAccelerator() {
@@ skipping 288 matching lines @@
         }
         has_slice = true;
       default:
         nalus.push_back(nalu);
         data_size += kNALUHeaderLength + nalu.size;
         break;
     }
   }
 
   // Initialize VideoToolbox.
-  bool config_changed = false;
   if (!sps.empty() && sps != last_sps_) {
     last_sps_.swap(sps);
     last_spsext_.swap(spsext);
-    config_changed = true;
+    config_changed_ = true;
   }
   if (!pps.empty() && pps != last_pps_) {
     last_pps_.swap(pps);
-    config_changed = true;
+    config_changed_ = true;
   }
-  if (config_changed) {
+  if (config_changed_) {
     if (last_sps_.empty()) {
+      config_changed_ = false;
       DLOG(ERROR) << "Invalid configuration; no SPS";
       NotifyError(INVALID_ARGUMENT, SFT_INVALID_STREAM);
       return;
     }
     if (last_pps_.empty()) {
+      config_changed_ = false;
       DLOG(ERROR) << "Invalid configuration; no PPS";
       NotifyError(INVALID_ARGUMENT, SFT_INVALID_STREAM);
       return;
     }
 
-    // If it's not an IDR frame, we can't reconfigure the decoder anyway. We
-    // assume that any config change not on an IDR must be compatible.
-    if (frame->is_idr && !ConfigureDecoder())
-      return;
+    // Only reconfigure at IDRs to avoid corruption.
+    if (frame->is_idr) {
+      config_changed_ = false;
+
+      // ConfigureDecoder() calls NotifyError() on failure.
+      if (!ConfigureDecoder())
+        return;
+    }
   }
 
-  // If there are no image slices, drop the bitstream buffer by returning an
+  // If no IDR has been seen yet, skip decoding.
+  if (has_slice && !session_ && config_changed_) {
+    if (!missing_idr_logged_) {
+      LOG(ERROR) << "Illegal attempt to decode without IDR. "
+                 << "Discarding decode requests until next IDR.";
+      missing_idr_logged_ = true;

[DaleCurtis, 2016/02/05 23:50:08]

Do you want to reset this to false after the first real IDR?

[sandersd (OOO until July 31), 2016/02/05 23:53:52]

We could do that, but I'm mostly just concerned with making sure there is a log
message at all. One other option would be to switch from LOG to DLOG after the
first message.

+    }
+    has_slice = false;
+  }
+
+  // If there is nothing to decode, drop the bitstream buffer by returning an
   // empty frame.
   if (!has_slice) {
+    // Keep everything in order by flushing first.
     if (!FinishDelayedFrames())
       return;
     gpu_task_runner_->PostTask(FROM_HERE, base::Bind(
         &VTVideoDecodeAccelerator::DecodeDone, weak_this_, frame));
     return;
   }
 
   // If the session is not configured by this point, fail.
   if (!session_) {
     DLOG(ERROR) << "Cannot decode without configuration";
@@ skipping 483 matching lines @@
     SupportedProfile profile;
     profile.profile = supported_profile;
     profile.min_resolution.SetSize(16, 16);
     profile.max_resolution.SetSize(4096, 2160);
     profiles.push_back(profile);
   }
   return profiles;
 }
 
 }  // namespace content