diff options
| author | Praveen Chavan <pchavan@quicinc.com> | 2014-08-28 12:48:13 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2014-08-28 22:31:16 +0000 |
| commit | e781791a2525f5d6b444735b2f61b13539f203a9 (patch) | |
| tree | 658e145aade11e2d536ea1968a4086d1c3cb25ad | |
| parent | 620bee93bd09aaa9343d4d09043f711c16bd2a37 (diff) | |
| download | msm8x84-e781791a2525f5d6b444735b2f61b13539f203a9.tar.gz | |
msm8x84: Update video headers
Synchronize userspace headers with kernel.
Bug: 16963313
Change-Id: I4317e02c97607884c416ff0fd89dc88b33198958
| -rw-r--r-- | kernel-headers/media/msm_media_info.h | 8 | ||||
| -rw-r--r-- | original-kernel-headers/media/msm_media_info.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kernel-headers/media/msm_media_info.h b/kernel-headers/media/msm_media_info.h index ae72558..3efb8ca 100644 --- a/kernel-headers/media/msm_media_info.h +++ b/kernel-headers/media/msm_media_info.h @@ -220,8 +220,8 @@ invalid_input: static inline unsigned int VENUS_BUFFER_SIZE( int color_fmt, int width, int height) { - unsigned int uv_alignment; - unsigned int size = 0; + const unsigned int extra_size = 8*1024; + unsigned int uv_alignment = 0, size = 0; unsigned int y_plane, uv_plane, y_stride, uv_stride, y_sclines, uv_sclines; if (!width || !height) @@ -237,7 +237,7 @@ static inline unsigned int VENUS_BUFFER_SIZE( uv_alignment = 4096; y_plane = y_stride * y_sclines; uv_plane = uv_stride * uv_sclines + uv_alignment; - size = y_plane + uv_plane; + size = y_plane + uv_plane + extra_size; size = MSM_MEDIA_ALIGN(size, 4096); break; case COLOR_FMT_NV12_MVTB: @@ -245,7 +245,7 @@ static inline unsigned int VENUS_BUFFER_SIZE( y_plane = y_stride * y_sclines; uv_plane = uv_stride * uv_sclines; size = y_plane + uv_plane; - size = 2 * size + uv_alignment; + size = 2 * size + extra_size; size = MSM_MEDIA_ALIGN(size, 4096); break; default: diff --git a/original-kernel-headers/media/msm_media_info.h b/original-kernel-headers/media/msm_media_info.h index ae72558..0591ae4 100644 --- a/original-kernel-headers/media/msm_media_info.h +++ b/original-kernel-headers/media/msm_media_info.h @@ -220,8 +220,8 @@ invalid_input: static inline unsigned int VENUS_BUFFER_SIZE( int color_fmt, int width, int height) { - unsigned int uv_alignment; - unsigned int size = 0; + const unsigned int extra_size = 8*1024; + unsigned int uv_alignment = 0, size = 0; unsigned int y_plane, uv_plane, y_stride, uv_stride, y_sclines, uv_sclines; if (!width || !height) @@ -237,15 +237,15 @@ static inline unsigned int VENUS_BUFFER_SIZE( uv_alignment = 4096; y_plane = y_stride * y_sclines; uv_plane = uv_stride * uv_sclines + uv_alignment; - size = y_plane + uv_plane; + size = y_plane + uv_plane + extra_size; size = MSM_MEDIA_ALIGN(size, 4096); break; case COLOR_FMT_NV12_MVTB: uv_alignment = 4096; y_plane = y_stride * y_sclines; - uv_plane = uv_stride * uv_sclines; + uv_plane = uv_stride * uv_sclines + uv_alignment; size = y_plane + uv_plane; - size = 2 * size + uv_alignment; + size = 2 * size + extra_size; size = MSM_MEDIA_ALIGN(size, 4096); break; default: |