preserve color space when copy_nv12_textures_ is true

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 1735 matching lines @@
       }
 
       if (width != index->second->size().width() ||
           height != index->second->size().height()) {
         HandleResolutionChanged(width, height);
         return;
       }
 
       pending_sample->picture_buffer_id = index->second->id();
       index->second->set_bound();
-      index->second->set_color_space(pending_sample->color_space);
+      if (share_nv12_textures_ || copy_nv12_textures_) {

[sandersd (OOO until July 31), 2016/11/03 23:31:58]

Would it be possible to have the color conversion step clear the color space,
instead of not setting it here?

[hubbe, 2016/11/04 03:49:31]

Possible: Yes, Pretty: No

The copy happens on another thread, so modifications wouldn't be thread-safe. In
addition, the dx11 path doesn't have a natural place
to put the clear because the copy_nv12_texures_ test only happens in the setup
code, so we might as well do it here.

[sandersd (OOO until July 31), 2016/11/04 17:51:34]

This really needs a comment if it's not changing.

+        index->second->set_color_space(pending_sample->color_space);
+      }
+
       if (share_nv12_textures_) {
         main_thread_task_runner_->PostTask(
             FROM_HERE,
             base::Bind(&DXVAVideoDecodeAccelerator::BindPictureBufferToSample,
                        weak_ptr_, pending_sample->output_sample,
                        pending_sample->picture_buffer_id,
                        pending_sample->input_buffer_id));
         continue;
       }
 
@@ skipping 502 matching lines @@
   RETURN_AND_NOTIFY_ON_FAILURE(make_context_current_cb_.Run(),
                                "Failed to make context current",
                                PLATFORM_FAILURE, );
 
   DCHECK(!output_picture_buffers_.empty());
 
   bool result = picture_buffer->CopySurfaceComplete(src_surface, dest_surface);
   RETURN_AND_NOTIFY_ON_FAILURE(result, "Failed to complete copying surface",
                                PLATFORM_FAILURE, );
 
-  NotifyPictureReady(picture_buffer->id(), input_buffer_id, gfx::ColorSpace());
+  NotifyPictureReady(picture_buffer->id(), input_buffer_id,
+                     picture_buffer->color_space());
 
   {
     base::AutoLock lock(decoder_lock_);
     if (!pending_output_samples_.empty())
       pending_output_samples_.pop_front();
   }
 
   if (pending_flush_ || processing_config_changed_) {
     decoder_thread_task_runner_->PostTask(
         FROM_HERE, base::Bind(&DXVAVideoDecodeAccelerator::FlushInternal,
@@ skipping 419 matching lines @@
   SetState(kConfigChange);
   Invalidate();
   Initialize(config_, client_);
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 }  // namespace media