diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2015-05-27 00:06:39 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2015-05-27 19:29:51 +0000 |
| commit | a3766b1714d55a176b34d8182f1ae25d16c3db70 (patch) | |
| tree | ac7e46aa34bb7f38344584c6e220de75ded1049c | |
| parent | 8146afa01da7a850974f86e4467cc40ac6bcd04b (diff) | |
| download | msm8x74-a3766b1714d55a176b34d8182f1ae25d16c3db70.tar.gz | |
msm8x74: update msm_media_info.h
Bug: 21327516
Change-Id: I56012ec092a61357ce0e66f68a929e6c43131e6e
| -rw-r--r-- | kernel-headers/media/msm_media_info.h | 10 | ||||
| -rw-r--r-- | original-kernel-headers/media/msm_media_info.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/kernel-headers/media/msm_media_info.h b/kernel-headers/media/msm_media_info.h index cf59bbe..8273250 100644 --- a/kernel-headers/media/msm_media_info.h +++ b/kernel-headers/media/msm_media_info.h @@ -231,8 +231,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 = VENUS_EXTRADATA_SIZE(width, height); + unsigned int uv_alignment = 0, size = 0; unsigned int y_plane, uv_plane, y_stride, uv_stride, y_sclines, uv_sclines; if (!width || !height) @@ -248,15 +248,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: diff --git a/original-kernel-headers/media/msm_media_info.h b/original-kernel-headers/media/msm_media_info.h index cf59bbe..8273250 100644 --- a/original-kernel-headers/media/msm_media_info.h +++ b/original-kernel-headers/media/msm_media_info.h @@ -231,8 +231,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 = VENUS_EXTRADATA_SIZE(width, height); + unsigned int uv_alignment = 0, size = 0; unsigned int y_plane, uv_plane, y_stride, uv_stride, y_sclines, uv_sclines; if (!width || !height) @@ -248,15 +248,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: |