Index: content/common/gpu/media/v4l2_video_decode_accelerator.h |
diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.h b/content/common/gpu/media/v4l2_video_decode_accelerator.h |
index 0c6a4930714de29f9a10d33975255dc90d011f26..077e5616d54de538baa7662514c3eb5cfcb2f9b9 100644 |
--- a/content/common/gpu/media/v4l2_video_decode_accelerator.h |
+++ b/content/common/gpu/media/v4l2_video_decode_accelerator.h |
@@ -155,7 +155,6 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator |
~OutputRecord(); |
bool at_device; // held by device. |
bool at_client; // held by client. |
- int fds[2]; // file descriptors for each plane. |
EGLImageKHR egl_image; // EGLImageKHR for the output buffer. |
EGLSyncKHR egl_sync; // sync the compositor's use of the EGLImage. |
int32 picture_id; // picture buffer id as returned to PictureReady(). |
@@ -294,6 +293,13 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator |
// Callback that indicates a picture has been cleared. |
void PictureCleared(); |
+ // This method determines whether a resolution change event processing |
+ // is indeed required by returning true if either: |
Ami GONE FROM CHROMIUM
2014/03/28 17:10:01
s/if either/iff/
shivdasp
2014/03/28 18:54:11
Done.
|
+ // - width or height of the new format is different than previous format. |
Ami GONE FROM CHROMIUM
2014/03/28 17:10:01
s/./; or/
shivdasp
2014/03/28 18:54:11
Done.
|
+ // - V4L2_CID_MIN_BUFFERS_FOR_CAPTURE has changed. |
+ // Returns false otherwise. |
Ami GONE FROM CHROMIUM
2014/03/28 17:10:01
drop this line if you take my suggestion at l.297
shivdasp
2014/03/28 18:54:11
Done.
|
+ bool IsResolutionChangeNecessary(); |
+ |
// Our original calling message loop for the child thread. |
scoped_refptr<base::MessageLoopProxy> child_message_loop_proxy_; |
@@ -426,6 +432,9 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator |
// The codec we'll be decoding for. |
media::VideoCodecProfile video_profile_; |
+ // Stores the number of planes (i.e. separate memory buffers) for output. |
Ami GONE FROM CHROMIUM
2014/03/28 17:10:01
This is decoder-thread state so belongs above. I
shivdasp
2014/03/28 18:54:11
I will move this to l.397 but I don't think adding
|
+ size_t output_planes_count_; |
+ |
DISALLOW_COPY_AND_ASSIGN(V4L2VideoDecodeAccelerator); |
}; |