Commit 153a9028 authored by fsamuel's avatar fsamuel Committed by Commit bot

gpu_param_traits_macros: Remove Media Dependency

I accidentally added a media dependency in my last CL:
https://codereview.chromium.org/1799713002/

This CL removes the dependency since we're trying to decouple
media from gpu.

BUG=586384

Review URL: https://codereview.chromium.org/1807263002

Cr-Commit-Position: refs/heads/master@{#381839}
parent cddc4684
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "gpu/command_buffer/common/gpu_memory_allocation.h" #include "gpu/command_buffer/common/gpu_memory_allocation.h"
#include "gpu/config/gpu_info.h" #include "gpu/config/gpu_info.h"
#include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_macros.h"
#include "media/base/video_codecs.h"
#include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gfx/ipc/gfx_param_traits.h" #include "ui/gfx/ipc/gfx_param_traits.h"
#include "ui/gfx/swap_result.h" #include "ui/gfx/swap_result.h"
...@@ -21,10 +20,6 @@ ...@@ -21,10 +20,6 @@
#undef IPC_MESSAGE_EXPORT #undef IPC_MESSAGE_EXPORT
#define IPC_MESSAGE_EXPORT CONTENT_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
media::VIDEO_CODEC_PROFILE_MIN,
media::VIDEO_CODEC_PROFILE_MAX)
IPC_STRUCT_TRAITS_BEGIN(gpu::VideoDecodeAcceleratorSupportedProfile) IPC_STRUCT_TRAITS_BEGIN(gpu::VideoDecodeAcceleratorSupportedProfile)
IPC_STRUCT_TRAITS_MEMBER(profile) IPC_STRUCT_TRAITS_MEMBER(profile)
IPC_STRUCT_TRAITS_MEMBER(max_resolution) IPC_STRUCT_TRAITS_MEMBER(max_resolution)
......
...@@ -40,10 +40,14 @@ struct ParamTraits<media::BitstreamBuffer> { ...@@ -40,10 +40,14 @@ struct ParamTraits<media::BitstreamBuffer> {
#endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_MESSAGES_H_ #endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_MESSAGES_H_
IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
media::VIDEO_CODEC_PROFILE_MIN,
media::VIDEO_CODEC_PROFILE_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::JpegDecodeAccelerator::Error, IPC_ENUM_TRAITS_MAX_VALUE(media::JpegDecodeAccelerator::Error,
media::JpegDecodeAccelerator::LARGEST_ERROR_ENUM) media::JpegDecodeAccelerator::LARGEST_ERROR_ENUM)
IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error, IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,
media::VideoEncodeAccelerator::kErrorMax) media::VideoEncodeAccelerator::kErrorMax)
IPC_STRUCT_BEGIN(AcceleratedJpegDecoderMsg_Decode_Params) IPC_STRUCT_BEGIN(AcceleratedJpegDecoderMsg_Decode_Params)
IPC_STRUCT_MEMBER(media::BitstreamBuffer, input_buffer) IPC_STRUCT_MEMBER(media::BitstreamBuffer, input_buffer)
IPC_STRUCT_MEMBER(gfx::Size, coded_size) IPC_STRUCT_MEMBER(gfx::Size, coded_size)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment