Revert of Attach color space information to hardware decoded NV12 video frames. (patchset #11 id:20…

media/gpu/ipc/common/media_messages.h

 // Copyright 2016 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.
 
 // Multiply-included message file, hence no include guard here, but see below
 // for a much smaller-than-usual include guard section.
 
 #include <stdint.h>
 
 #include "base/unguessable_token.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/ipc/common/gpu_param_traits_macros.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/param_traits_macros.h"
 #include "media/gpu/ipc/common/media_param_traits.h"
 #include "media/video/jpeg_decode_accelerator.h"
 #include "media/video/video_decode_accelerator.h"
 #include "media/video/video_encode_accelerator.h"
-#include "ui/gfx/ipc/color/gfx_param_traits.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 #define IPC_MESSAGE_START MediaMsgStart
 
 IPC_STRUCT_BEGIN(AcceleratedJpegDecoderMsg_Decode_Params)
   IPC_STRUCT_MEMBER(media::BitstreamBuffer, input_buffer)
   IPC_STRUCT_MEMBER(gfx::Size, coded_size)
   IPC_STRUCT_MEMBER(base::SharedMemoryHandle, output_video_frame_handle)
   IPC_STRUCT_MEMBER(uint32_t, output_buffer_size)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(AcceleratedVideoEncoderMsg_Encode_Params)
   IPC_STRUCT_MEMBER(int32_t, frame_id)
   IPC_STRUCT_MEMBER(base::TimeDelta, timestamp)
   IPC_STRUCT_MEMBER(base::SharedMemoryHandle, buffer_handle)
   IPC_STRUCT_MEMBER(uint32_t, buffer_offset)
   IPC_STRUCT_MEMBER(uint32_t, buffer_size)
   IPC_STRUCT_MEMBER(bool, force_keyframe)
 IPC_STRUCT_END()
 
 IPC_STRUCT_BEGIN(AcceleratedVideoEncoderMsg_Encode_Params2)
   IPC_STRUCT_MEMBER(int32_t, frame_id)
   IPC_STRUCT_MEMBER(base::TimeDelta, timestamp)
   IPC_STRUCT_MEMBER(std::vector<gfx::GpuMemoryBufferHandle>,
                     gpu_memory_buffer_handles)
   IPC_STRUCT_MEMBER(gfx::Size, size)
   IPC_STRUCT_MEMBER(bool, force_keyframe)
 IPC_STRUCT_END()
 
-IPC_STRUCT_BEGIN(AcceleratedVideoDecoderHostMsg_PictureReady_Params)
-  IPC_STRUCT_MEMBER(int32_t, picture_buffer_id)
-  IPC_STRUCT_MEMBER(int32_t, bitstream_buffer_id)
-  IPC_STRUCT_MEMBER(gfx::Rect, visible_rect)
-  IPC_STRUCT_MEMBER(gfx::ColorSpace, color_space)
-  IPC_STRUCT_MEMBER(bool, allow_overlay)
-  IPC_STRUCT_MEMBER(bool, size_changed)
-IPC_STRUCT_END()
-
 //------------------------------------------------------------------------------
 // Utility Messages
 
 // Sent from Renderer to GPU process to request a token identifying the channel.
 // These tokens can be used to prove ownership of the channel. The intended use
 // case is to share the command buffer with MojoMediaApplication.
 IPC_SYNC_MESSAGE_CONTROL0_1(GpuCommandBufferMsg_GetChannelToken,
                             base::UnguessableToken /* channel_token */)
 
 //------------------------------------------------------------------------------
@@ skipping 55 matching lines @@
                     uint32_t,                /* Number of textures per frame */
                     gfx::Size,               /* Requested size of buffer */
                     uint32_t)                /* Texture target */
 
 // Decoder reports that a picture is ready and buffer does not need to be passed
 // back to the decoder.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_DismissPictureBuffer,
                     int32_t) /* Picture buffer ID */
 
 // Decoder reports that a picture is ready.
-IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_PictureReady,
-                    AcceleratedVideoDecoderHostMsg_PictureReady_Params)
+IPC_MESSAGE_ROUTED5(AcceleratedVideoDecoderHostMsg_PictureReady,
+                    int32_t,   /* Picture buffer ID */
+                    int32_t,   /* Bitstream buffer ID */
+                    gfx::Rect, /* Visible rectangle */
+                    bool,      /* Buffer is HW overlay capable */
+                    bool)      /* VDA updated picture size */
 
 // Confirm decoder has been flushed.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone)
 
 // Confirm decoder has been reset.
 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone)
 
 // Video decoder has encountered an error.
 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification,
                     uint32_t /* Error ID */)
@@ skipping 86 matching lines @@
 IPC_MESSAGE_ROUTED0(AcceleratedJpegDecoderMsg_Destroy)
 
 //------------------------------------------------------------------------------
 // Accelerated JPEG Decoder Host Messages
 // These messages are sent from the GPU process to Browser process.
 //
 // Report decode status.
 IPC_MESSAGE_ROUTED2(AcceleratedJpegDecoderHostMsg_DecodeAck,
                     int32_t, /* bitstream_buffer_id */
                     media::JpegDecodeAccelerator::Error /* error */)