| Index: content/common/gpu/media/generic_v4l2_video_device.h
|
| diff --git a/content/common/gpu/media/generic_v4l2_video_device.h b/content/common/gpu/media/generic_v4l2_video_device.h
|
| index 91831786512f2cff8b1f36636395595df5d9dfbc..e7560d177a05f51477eac05757c3cac179685abe 100644
|
| --- a/content/common/gpu/media/generic_v4l2_video_device.h
|
| +++ b/content/common/gpu/media/generic_v4l2_video_device.h
|
| @@ -18,29 +18,28 @@ class GenericV4L2Device : public V4L2Device {
|
| virtual ~GenericV4L2Device();
|
|
|
| // V4L2Device implementation.
|
| - int Ioctl(int request, void* arg) override;
|
| - bool Poll(bool poll_device, bool* event_pending) override;
|
| - bool SetDevicePollInterrupt() override;
|
| - bool ClearDevicePollInterrupt() override;
|
| - void* Mmap(void* addr,
|
| - unsigned int len,
|
| - int prot,
|
| - int flags,
|
| - unsigned int offset) override;
|
| - void Munmap(void* addr, unsigned int len) override;
|
| - bool Initialize() override;
|
| - bool CanCreateEGLImageFrom(uint32_t v4l2_pixfmt) override;
|
| - EGLImageKHR CreateEGLImage(EGLDisplay egl_display,
|
| - EGLContext egl_context,
|
| - GLuint texture_id,
|
| - gfx::Size frame_buffer_size,
|
| - unsigned int buffer_index,
|
| - uint32_t v4l2_pixfmt,
|
| - size_t num_v4l2_planes);
|
| - EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
|
| - EGLImageKHR egl_image) override;
|
| - GLenum GetTextureTarget() override;
|
| - uint32 PreferredInputFormat() override;
|
| + virtual int Ioctl(int request, void* arg) override;
|
| + virtual bool Poll(bool poll_device, bool* event_pending) override;
|
| + virtual bool SetDevicePollInterrupt() override;
|
| + virtual bool ClearDevicePollInterrupt() override;
|
| + virtual void* Mmap(void* addr,
|
| + unsigned int len,
|
| + int prot,
|
| + int flags,
|
| + unsigned int offset) override;
|
| + virtual void Munmap(void* addr, unsigned int len) override;
|
| + virtual bool Initialize() override;
|
| + virtual EGLImageKHR CreateEGLImage(EGLDisplay egl_display,
|
| + EGLContext egl_context,
|
| + GLuint texture_id,
|
| + gfx::Size frame_buffer_size,
|
| + unsigned int buffer_index,
|
| + size_t planes_count) override;
|
| + virtual EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
|
| + EGLImageKHR egl_image) override;
|
| + virtual GLenum GetTextureTarget() override;
|
| + virtual uint32 PreferredInputFormat() override;
|
| + virtual uint32 PreferredOutputFormat() override;
|
|
|
| private:
|
| const Type type_;
|
|
|