asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "msm: media: uapi: Redefine NV12 format with different alignment"

Browse source 
Mot-CRs-Fixed: (CR)
This reverts commit cf7d4c0cc7eb9130ccac08cd7f4e08cfe0d267b3.

Change-Id: I187977996b5ffc483c4ff2eba0e625717d7a2b5c
Signed-off-by: xiaojj1 <xiaojj1@motorola.com>
Reviewed-on: https://gerrit.mot.com/1730949
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Zilong Zhang <zhangzl7@mt.com>
Reviewed-by: Ji Zhao <zhaoji1@mt.com>
Reviewed-by: Zhuoran Xu <xuzr3@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Reviewed-by: Tao Sun <suntao2@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
xiaojj1 2020-08-24 15:02:28 +08:00 committed by caoqian4
parent bbb4e4409f
commit ca4b4d3cf5
1 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
include/uapi/media/msm_media_info.h
View file

@ -2,15 +2,6 @@
#ifndef __MSM_MEDIA_INFO_H__
#define __MSM_MEDIA_INFO_H__
#include <asm/bitsperlong.h>
#if __BITS_PER_LONG == 64
#define NV12_STRIDE_ALIGNMENT 512
#define NV12_SCANLINE_ALIGNMENT 512
#else
#define NV12_STRIDE_ALIGNMENT 128
#define NV12_SCANLINE_ALIGNMENT 32
#endif
#ifdef VENUS_USE_64BIT_ALIGNMENT
#undef NV12_STRIDE_ALIGNMENT
@ -62,10 +53,10 @@ enum color_fmts {
* . . . . . . . . . . . . . . . . V
* . . . . . . . . . . . . . . . . --> Buffer size alignment
*
* Y_Stride : Width aligned to 512 or 128
* UV_Stride : Width aligned to 512 or 128
* Y_Scanlines: Height aligned to 512 or 32
* UV_Scanlines: Height/2 aligned to 256 or 16
* Y_Stride : Width aligned to 512
* UV_Stride : Width aligned to 512
* Y_Scanlines: Height aligned to 512
* UV_Scanlines: Height/2 aligned to 256
* Total size = align(Y_Stride * Y_Scanlines
* + UV_Stride * UV_Scanlines, 4096)
*/
@ -132,10 +123,10 @@ enum color_fmts {
* . . . . . . . . . . . . . . . . V
* . . . . . . . . . . . . . . . . --> Padding & Buffer size alignment
*
* Y_Stride : Width aligned to 512 or 128
* UV_Stride : Width aligned to 512 or 128
* Y_Scanlines: Height aligned to 512 or 32
* UV_Scanlines: Height/2 aligned to 256 or 16
* Y_Stride : Width aligned to 512
* UV_Stride : Width aligned to 512
* Y_Scanlines: Height aligned to 512
* UV_Scanlines: Height/2 aligned to 256
* Total size = align(Y_Stride * Y_Scanlines
* + UV_Stride * UV_Scanlines, 4096)
*/
@ -834,9 +825,6 @@ static inline unsigned int VENUS_Y_STRIDE(unsigned int color_fmt,
switch (color_fmt) {
case COLOR_FMT_NV12:
case COLOR_FMT_NV21:
alignment = NV12_STRIDE_ALIGNMENT;
stride = MSM_MEDIA_ALIGN(width, alignment);
break;
case COLOR_FMT_NV12_512:
alignment = 512;
stride = MSM_MEDIA_ALIGN(width, alignment);
@ -881,9 +869,6 @@ static inline unsigned int VENUS_UV_STRIDE(unsigned int color_fmt,
switch (color_fmt) {
case COLOR_FMT_NV21:
case COLOR_FMT_NV12:
alignment = NV12_STRIDE_ALIGNMENT;
stride = MSM_MEDIA_ALIGN(width, alignment);
break;
case COLOR_FMT_NV12_512:
alignment = 512;
stride = MSM_MEDIA_ALIGN(width, alignment);
@ -928,8 +913,6 @@ static inline unsigned int VENUS_Y_SCANLINES(unsigned int color_fmt,
switch (color_fmt) {
case COLOR_FMT_NV12:
case COLOR_FMT_NV21:
alignment = NV12_SCANLINE_ALIGNMENT;
break;
case COLOR_FMT_NV12_512:
alignment = 512;
break;
@ -968,8 +951,6 @@ static inline unsigned int VENUS_UV_SCANLINES(unsigned int color_fmt,
switch (color_fmt) {
case COLOR_FMT_NV21:
case COLOR_FMT_NV12:
alignment = NV12_SCANLINE_ALIGNMENT/2;
break;
case COLOR_FMT_NV12_512:
alignment = 256;
break;