Propagate color space from the container to the codec.

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 2112 matching lines @@
       RETURN_AND_NOTIFY_ON_FAILURE(SendMFTMessage(MFT_MESSAGE_COMMAND_DRAIN, 0),
                                    "Failed to send drain message",
                                    PLATFORM_FAILURE, );
       sent_drain_message_ = true;
     }
   }
 
   // Attempt to retrieve an output frame from the decoder. If we have one,
   // return and proceed when the output frame is processed. If we don't have a
   // frame then we are done.
-  DoDecode(config_change_detector_->current_color_space());
+  gfx::ColorSpace color_space = config_change_detector_->current_color_space();
+  if (!color_space.IsValid())
+    color_space = config_.color_space;
+  DoDecode(color_space);
   if (OutputSamplesPresent())
     return;
 
   if (!processing_config_changed_) {
     SetState(kFlushing);
 
     main_thread_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&DXVAVideoDecodeAccelerator::NotifyFlushDone, weak_ptr_));
   } else {
@@ skipping 29 matching lines @@
 
   processing_config_changed_ = config_changed;
 
   if (config_changed) {
     pending_input_buffers_.push_back(sample);
     FlushInternal();
     return;
   }
 
   gfx::ColorSpace color_space = config_change_detector_->current_color_space();
+  if (!color_space.IsValid())
+    color_space = config_.color_space;
 
   if (!inputs_before_decode_) {
     TRACE_EVENT_ASYNC_BEGIN0("gpu", "DXVAVideoDecodeAccelerator.Decoding",
                              this);
   }
   inputs_before_decode_++;
   {
     ScopedExceptionCatcher catcher(using_ms_vp9_mft_);
     hr = decoder_->ProcessInput(0, sample.get(), 0);
   }
@@ skipping 705 matching lines @@
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 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;
 }
 
 }  // namespace media