| Index: content/common/gpu/media/v4l2_jpeg_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/v4l2_jpeg_decode_accelerator.h b/content/common/gpu/media/v4l2_jpeg_decode_accelerator.h
|
| index a05f21af338da2f172cc4a4f1a51fc6602da3838..a2b2a5e1641cdc8d50696af0027d40d5247a742b 100644
|
| --- a/content/common/gpu/media/v4l2_jpeg_decode_accelerator.h
|
| +++ b/content/common/gpu/media/v4l2_jpeg_decode_accelerator.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/thread.h"
|
| #include "content/common/content_export.h"
|
| +#include "content/common/gpu/media/shared_memory_region.h"
|
| #include "content/common/gpu/media/v4l2_device.h"
|
| #include "media/base/bitstream_buffer.h"
|
| #include "media/base/video_frame.h"
|
| @@ -54,16 +55,16 @@ class CONTENT_EXPORT V4L2JpegDecodeAccelerator
|
| // the time of submission we may not have one available (and don't need one
|
| // to submit input to the device).
|
| struct JobRecord {
|
| - JobRecord(media::BitstreamBuffer bitstream_buffer,
|
| + JobRecord(const media::BitstreamBuffer& bitstream_buffer,
|
| scoped_refptr<media::VideoFrame> video_frame);
|
| ~JobRecord();
|
|
|
| - // Input image buffer.
|
| - media::BitstreamBuffer bitstream_buffer;
|
| + // Input image buffer ID.
|
| + int32_t bitstream_buffer_id;
|
| + // Memory mapped from |bitstream_buffer|.
|
| + SharedMemoryRegion shm;
|
| // Output frame buffer.
|
| scoped_refptr<media::VideoFrame> out_frame;
|
| - // Memory mapped from |bitstream_buffer|.
|
| - scoped_ptr<base::SharedMemory> shm;
|
| };
|
|
|
| void EnqueueInput();
|
|
|