Chromium Code Reviews| Index: media/gpu/v4l2_video_decode_accelerator.h |
| diff --git a/media/gpu/v4l2_video_decode_accelerator.h b/media/gpu/v4l2_video_decode_accelerator.h |
| index ec2a0bdfe51797dada6eec2390817333da264441..aea6bd9a2968fd064dce81e99d4c982189605d9c 100644 |
| --- a/media/gpu/v4l2_video_decode_accelerator.h |
| +++ b/media/gpu/v4l2_video_decode_accelerator.h |
| @@ -133,8 +133,8 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator |
| kInitialized, // Initialize() returned true; ready to start decoding. |
| kDecoding, // DecodeBufferInitial() successful; decoding frames. |
| kResetting, // Presently resetting. |
| - // Performing resolution change, all remaining pre-change frames decoded |
| - // and processed. |
| + // Performing resolution change and waiting image processor to return all |
|
Pawel Osciak
2016/09/15 07:51:42
s/waiting/waiting for/
wuchengli
2016/09/21 06:44:57
Done.
|
| + // frames. |
| kChangingResolution, |
| // Requested new PictureBuffers via ProvidePictureBuffers(), awaiting |
| // AssignPictureBuffers(). |
| @@ -329,6 +329,15 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator |
| bool CreateInputBuffers(); |
| bool CreateOutputBuffers(); |
| + // Destroy buffers. |
| + void DestroyInputBuffers(); |
| + // In contrast to DestroyInputBuffers, which is called only from destructor, |
|
Pawel Osciak
2016/09/15 07:51:42
Nit: s/from destructor/on destruction/
wuchengli
2016/09/21 06:44:57
Done.
|
| + // we call DestroyOutputBuffers also during playback, on resolution change. |
| + // Even if anything fails along the way, we still want to go on and clean |
| + // up as much as possible, so return false if this happens, so that the |
| + // caller can error out on resolution change. |
| + bool DestroyOutputBuffers(); |
| + |
| // Set input and output formats before starting decode. |
| bool SetupFormats(); |
| // Return a usable input format of image processor. Return 0 if not found. |
| @@ -342,16 +351,6 @@ class MEDIA_GPU_EXPORT V4L2VideoDecodeAccelerator |
| // Methods run on child thread. |
| // |
| - // Destroy buffers. |
| - void DestroyInputBuffers(); |
| - // In contrast to DestroyInputBuffers, which is called only from destructor, |
| - // we call DestroyOutputBuffers also during playback, on resolution change. |
| - // Even if anything fails along the way, we still want to go on and clean |
| - // up as much as possible, so return false if this happens, so that the |
| - // caller can error out on resolution change. |
| - bool DestroyOutputBuffers(); |
| - void ResolutionChangeDestroyBuffers(); |
| - |
| // Send decoded pictures to PictureReady. |
| void SendPictureReady(); |