media: Set ColorSpace on decoded frames in DecryptingVideoDecoder

media/filters/decrypting_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/decrypting_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 257 matching lines @@
 
   if (status == Decryptor::kNeedMoreData) {
     DVLOG(2) << "DeliverFrame() - kNeedMoreData";
     state_ = scoped_pending_buffer_to_decode->end_of_stream() ? kDecodeFinished
                                                               : kIdle;
     base::ResetAndReturn(&decode_cb_).Run(DecodeStatus::OK);
     return;
   }
 
   DCHECK_EQ(status, Decryptor::kSuccess);
-  // No frame returned with kSuccess should be end-of-stream frame.
+  // Frame returned with kSuccess should not be an end-of-stream frame.
   DCHECK(!frame->metadata()->IsTrue(VideoFrameMetadata::END_OF_STREAM));
+
+  // If color space is not set, use the color space in the |config_|.
+  if (frame->ColorSpace() == gfx::ColorSpace() &&

[hubbe, 2017/05/10 17:23:11]

It's probably better to use frame->ColorSpace().IsValid() now.

[xhwang, 2017/05/10 20:17:23]

Done and improved this block.

+      config_.color_space_info() != VideoColorSpace()) {
+    frame->metadata()->SetInteger(VideoFrameMetadata::COLOR_SPACE,
+                                  config_.color_space());
+    frame->set_color_space(config_.color_space_info().ToGfxColorSpace());
+  }
+
   output_cb_.Run(frame);
 
   if (scoped_pending_buffer_to_decode->end_of_stream()) {
     // Set |pending_buffer_to_decode_| back as we need to keep flushing the
     // decryptor.
     pending_buffer_to_decode_ = scoped_pending_buffer_to_decode;
     DecodePendingBuffer();
     return;
   }
 
@@ skipping 19 matching lines @@
 }
 
 void DecryptingVideoDecoder::DoReset() {
   DCHECK(init_cb_.is_null());
   DCHECK(decode_cb_.is_null());
   state_ = kIdle;
   base::ResetAndReturn(&reset_cb_).Run();
 }
 
 }  // namespace media