| Index: media/capture/ipc/capture_param_traits.h
|
| diff --git a/media/gpu/ipc/common/media_param_traits.h b/media/capture/ipc/capture_param_traits.h
|
| similarity index 55%
|
| copy from media/gpu/ipc/common/media_param_traits.h
|
| copy to media/capture/ipc/capture_param_traits.h
|
| index cd7154604bc2f007157d2d45ead9317a6c8c196b..cf5f217869446d5f1d015853263fe39a5a77e575 100644
|
| --- a/media/gpu/ipc/common/media_param_traits.h
|
| +++ b/media/capture/ipc/capture_param_traits.h
|
| @@ -2,17 +2,22 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_H_
|
| -#define MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_H_
|
| +#ifndef MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_H_
|
| +#define MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_H_
|
|
|
| -#include "media/base/bitstream_buffer.h"
|
| -#include "media/gpu/ipc/common/media_param_traits_macros.h"
|
| +#include "ipc/ipc_message.h"
|
| +#include "ipc/ipc_param_traits.h"
|
| +#include "media/capture/ipc/capture_param_traits_macros.h"
|
| +
|
| +namespace media {
|
| +struct VideoCaptureFormat;
|
| +}
|
|
|
| namespace IPC {
|
|
|
| template <>
|
| -struct ParamTraits<media::BitstreamBuffer> {
|
| - using param_type = media::BitstreamBuffer;
|
| +struct ParamTraits<media::VideoCaptureFormat> {
|
| + typedef media::VideoCaptureFormat param_type;
|
| static void GetSize(base::PickleSizer* s, const param_type& p);
|
| static void Write(base::Pickle* m, const param_type& p);
|
| static bool Read(const base::Pickle* m,
|
| @@ -23,4 +28,4 @@ struct ParamTraits<media::BitstreamBuffer> {
|
|
|
| } // namespace IPC
|
|
|
| -#endif // MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_H_
|
| +#endif // MEDIA_CAPTURE_IPC_CAPTURE_PARAM_TRAITS_H_
|
|
|