VAVDA: Fix a crash if we fail parsing SPS/DecodeInitial.

content/common/gpu/media/vaapi_h264_decoder.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 <dlfcn.h>
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 305 matching lines @@
   curr_sps_id_ = -1;
   curr_pps_id_ = -1;
   pic_width_ = -1;
   pic_height_ = -1;
   max_frame_num_ = 0;
   max_pic_num_ = 0;
   max_long_term_frame_idx_ = 0;
   max_pic_order_cnt_lsb_ = 0;
   state_ = kUninitialized;
   num_available_decode_surfaces_ = 0;
+  va_context_created_ = false;
 }
 
 VaapiH264Decoder::~VaapiH264Decoder() {
   Destroy();
 }
 
 // This puts the decoder in state where it keeps stream data and is ready
 // to resume playback from a random location in the stream, but drops all
 // inputs and outputs and makes all surfaces available for use.
 void VaapiH264Decoder::Reset() {
@@ skipping 241 matching lines @@
                                va_surface_ids_, GetRequiredNumOfPictures(),
                                &va_context_id_);
 
   if (va_res != VA_STATUS_SUCCESS) {
     DVLOG(1) << "Error creating a decoding surface (binding to texture?)";
     VAAPI_DestroySurfaces(va_display_, va_surface_ids_,
                           GetRequiredNumOfPictures());
     return false;
   }
 
+  va_context_created_ = true;
+
   return true;
 }
 
 void VaapiH264Decoder::DestroyVASurfaces() {
   DCHECK(state_ == kDecoding || state_ == kError || state_ == kAfterReset);
   decode_surfaces_.clear();
 
+  // This can happen if we fail during DecodeInitial.
+  if (!va_context_created_)
+    return;
+
   VAStatus va_res = VAAPI_DestroyContext(va_display_, va_context_id_);
   VA_LOG_ON_ERROR(va_res, "vaDestroyContext failed");
 
   va_res = VAAPI_DestroySurfaces(va_display_, va_surface_ids_,
                                  GetRequiredNumOfPictures());
   VA_LOG_ON_ERROR(va_res, "vaDestroySurfaces failed");
+
+  va_context_created_ = false;
 }
 
 void VaapiH264Decoder::DestroyPendingBuffers() {
   while (!pending_slice_bufs_.empty()) {
     VABufferID buffer = pending_slice_bufs_.front();
     VAStatus va_res = VAAPI_DestroyBuffer(va_display_, buffer);
     VA_LOG_ON_ERROR(va_res, "vaDestroyBuffer failed");
     pending_slice_bufs_.pop();
   }
   while (!pending_va_bufs_.empty()) {
@@ skipping 1543 matching lines @@
       VAAPI_SyncSurface &&
       VAAPI_BeginPicture &&
       VAAPI_RenderPicture &&
       VAAPI_EndPicture &&
       VAAPI_CreateBuffer &&
       VAAPI_DestroyBuffer &&
       VAAPI_ErrorStr;
 }
 
 }  // namespace content