Revert of Attach color space information to hardware decoded NV12 video frames.

media/gpu/dxva_video_decode_accelerator_win.cc

Index: media/gpu/dxva_video_decode_accelerator_win.cc
diff --git a/media/gpu/dxva_video_decode_accelerator_win.cc b/media/gpu/dxva_video_decode_accelerator_win.cc
index 395f55f269df998ae6401d0715ce2f22eca7a446..9768f1bf0f3ed91cdd2ec58c0b67dfd119fdf6d0 100644
--- a/media/gpu/dxva_video_decode_accelerator_win.cc
+++ b/media/gpu/dxva_video_decode_accelerator_win.cc
@@ -458,21 +458,11 @@
   return true;
 }
 
-gfx::ColorSpace H264ConfigChangeDetector::current_color_space() const {
-  // TODO(hubbe): Is using last_sps_id_ correct here?
-  const H264SPS* sps = parser_->GetSPS(last_sps_id_);
-  if (sps)
-    return sps->GetColorSpace();
-  return gfx::ColorSpace();
-}
 
 DXVAVideoDecodeAccelerator::PendingSampleInfo::PendingSampleInfo(
     int32_t buffer_id,
-    IMFSample* sample,
-    const gfx::ColorSpace& color_space)
-    : input_buffer_id(buffer_id),
-      picture_buffer_id(-1),
-      color_space(color_space) {
+    IMFSample* sample)
+    : input_buffer_id(buffer_id), picture_buffer_id(-1) {
   output_sample.Attach(sample);
 }
 
@@ -1606,7 +1596,7 @@
   return true;
 }
 
-void DXVAVideoDecodeAccelerator::DoDecode(const gfx::ColorSpace& color_space) {
+void DXVAVideoDecodeAccelerator::DoDecode() {
   TRACE_EVENT0("media", "DXVAVideoDecodeAccelerator::DoDecode");
   DCHECK(decoder_thread_task_runner_->BelongsToCurrentThread());
   // This function is also called from FlushInternal in a loop which could
@@ -1618,6 +1608,7 @@
 
   MFT_OUTPUT_DATA_BUFFER output_data_buffer = {0};
   DWORD status = 0;
+
   HRESULT hr = decoder_->ProcessOutput(0,  // No flags
                                        1,  // # of out streams to pull from
                                        &output_data_buffer, &status);
@@ -1639,7 +1630,7 @@
       } else {
         DVLOG(1) << "Received output format change from the decoder."
                     " Recursively invoking DoDecode";
-        DoDecode(color_space);
+        DoDecode();
       }
       return;
     } else if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) {
@@ -1658,14 +1649,12 @@
 
   inputs_before_decode_ = 0;
 
-  RETURN_AND_NOTIFY_ON_FAILURE(
-      ProcessOutputSample(output_data_buffer.pSample, color_space),
-      "Failed to process output sample.", PLATFORM_FAILURE, );
-}
-
-bool DXVAVideoDecodeAccelerator::ProcessOutputSample(
-    IMFSample* sample,
-    const gfx::ColorSpace& color_space) {
+  RETURN_AND_NOTIFY_ON_FAILURE(ProcessOutputSample(output_data_buffer.pSample),
+                               "Failed to process output sample.",
+                               PLATFORM_FAILURE, );
+}
+
+bool DXVAVideoDecodeAccelerator::ProcessOutputSample(IMFSample* sample) {
   RETURN_ON_FAILURE(sample, "Decode succeeded with NULL output sample", false);
 
   LONGLONG input_buffer_id = 0;
@@ -1677,7 +1666,7 @@
     base::AutoLock lock(decoder_lock_);
     DCHECK(pending_output_samples_.empty());
     pending_output_samples_.push_back(
-        PendingSampleInfo(input_buffer_id, sample, color_space));
+        PendingSampleInfo(input_buffer_id, sample));
   }
 
   if (pictures_requested_) {
@@ -1748,7 +1737,6 @@
 
       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_) {
         main_thread_task_runner_->PostTask(
             FROM_HERE,
@@ -1902,17 +1890,14 @@
   }
 }
 
-void DXVAVideoDecodeAccelerator::NotifyPictureReady(
-    int picture_buffer_id,
-    int input_buffer_id,
-    const gfx::ColorSpace& color_space) {
+void DXVAVideoDecodeAccelerator::NotifyPictureReady(int picture_buffer_id,
+                                                    int input_buffer_id) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
   // This task could execute after the decoder has been torn down.
   if (GetState() != kUninitialized && client_) {
     // TODO(henryhsu): Use correct visible size instead of (0, 0). We can't use
     // coded size here so use (0, 0) intentionally to have the client choose.
-    Picture picture(picture_buffer_id, input_buffer_id, gfx::Rect(0, 0),
-                    color_space, false);
+    Picture picture(picture_buffer_id, input_buffer_id, gfx::Rect(0, 0), false);
     client_->PictureReady(picture);
   }
 }
@@ -1991,7 +1976,7 @@
   // 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());
+  DoDecode();
   if (OutputSamplesPresent())
     return;
 
@@ -2039,8 +2024,6 @@
     FlushInternal();
     return;
   }
-
-  gfx::ColorSpace color_space = config_change_detector_->current_color_space();
 
   if (!inputs_before_decode_) {
     TRACE_EVENT_ASYNC_BEGIN0("gpu", "DXVAVideoDecodeAccelerator.Decoding",
@@ -2059,7 +2042,7 @@
   // process the input again. Failure in either of these steps is treated as a
   // decoder failure.
   if (hr == MF_E_NOTACCEPTING) {
-    DoDecode(color_space);
+    DoDecode();
     // If the DoDecode call resulted in an output frame then we should not
     // process any more input until that frame is copied to the target surface.
     if (!OutputSamplesPresent()) {
@@ -2091,7 +2074,7 @@
   RETURN_AND_NOTIFY_ON_HR_FAILURE(hr, "Failed to process input sample",
                                   PLATFORM_FAILURE, );
 
-  DoDecode(color_space);
+  DoDecode();
 
   State state = GetState();
   RETURN_AND_NOTIFY_ON_FAILURE(
@@ -2271,7 +2254,7 @@
   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);
 
   {
     base::AutoLock lock(decoder_lock_);
@@ -2323,8 +2306,7 @@
   RETURN_AND_NOTIFY_ON_FAILURE(result, "Failed to complete copying surface",
                                PLATFORM_FAILURE, );
 
-  NotifyPictureReady(picture_buffer->id(), input_buffer_id,
-                     picture_buffer->color_space());
+  NotifyPictureReady(picture_buffer->id(), input_buffer_id);
 
   {
     base::AutoLock lock(decoder_lock_);