Fix broken SurfaceView usage on < M devices.

media/filters/gpu_video_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 "media/filters/gpu_video_decoder.h"
 
 #include <algorithm>
 #include <array>
 #include <utility>
 
@@ skipping 306 matching lines @@
     // If we have a surface request callback we should call it and complete
     // initialization with the returned surface.
     request_surface_cb_.Run(
         requires_restart_for_external_output_surface,
         BindToCurrentLoop(base::Bind(&GpuVideoDecoder::OnSurfaceAvailable,
                                      weak_factory_.GetWeakPtr())));
     return;
   }
 
   // If external surfaces are not supported we can complete initialization now.
-  CompleteInitialization();
+  CompleteInitialization(SurfaceManager::kNoSurfaceID);
 }
 
 void GpuVideoDecoder::OnSurfaceAvailable(int surface_id) {
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
 
   // It's possible for the vda to become null if NotifyError is called.
   if (!vda_) {
     if (!init_cb_.is_null())
       base::ResetAndReturn(&init_cb_).Run(false);
     return;
   }
 
-  vda_->SetSurface(surface_id);
-
-  // If initialization has already completed, there's nothing left to do.
-  if (init_cb_.is_null())
+  // If initialization has already completed, there's nothing to do but try to
+  // set the surface. If we're still initializing, we must pass the surface via
+  // the config since the remote VDA has not yet been created.
+  if (init_cb_.is_null()) {
+    vda_->SetSurface(surface_id);
     return;
+  }
 
   // Otherwise initialization was waiting for the surface, so complete it now.
-  CompleteInitialization();
+  CompleteInitialization(surface_id);
 }
 
-void GpuVideoDecoder::CompleteInitialization() {
+void GpuVideoDecoder::CompleteInitialization(int surface_id) {
   DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent();
   DCHECK(vda_);
   DCHECK(!init_cb_.is_null());
 
   VideoDecodeAccelerator::Config vda_config;
   vda_config.profile = config_.profile();
   vda_config.cdm_id = cdm_id_;
   vda_config.is_encrypted = config_.is_encrypted();
+  vda_config.surface_id = surface_id;
   vda_config.is_deferred_initialization_allowed = true;
   vda_config.initial_expected_coded_size = config_.coded_size();
 
 #if defined(OS_ANDROID) && defined(USE_PROPRIETARY_CODECS)
   // We pass the SPS and PPS on Android because it lets us initialize
   // MediaCodec more reliably (http://crbug.com/649185).
   if (config_.codec() == kCodecH264)
     ExtractSpsAndPps(config_.extra_data(), &vda_config.sps, &vda_config.pps);
 #endif
 
@@ skipping 523 matching lines @@
   }
   return false;
 }
 
 void GpuVideoDecoder::DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent()
     const {
   DCHECK(factories_->GetTaskRunner()->BelongsToCurrentThread());
 }
 
 }  // namespace media