mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 03:40:35 +09:00
di: fix pulldown crash for 1080i&1088i timing
PD#159599: di: fix pulldown crash for 1080i&1088i timing Change-Id: I1f89920e195feaaa643f94d9227bf2e1a0268b15 Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
This commit is contained in:
Bencheng Jing
committed by
Jianxin Pan
Jianxin Pan
parent
962ff2bb1d
commit
827be37207
@@ -14266,3 +14266,7 @@ F: drivers/amlogic/media/vout/lcd/lcd_extern/mipi_P070ACB.c
|
||||
AMLOGIC ADD SOUND EXTERNAL LOOPBACK FEATURE
|
||||
M: Peipeng Zhao <peipeng.zhao@amlogic.com>
|
||||
F: Documentation/devicetree/bindings/amlogic/axg-sound-loopback.txt
|
||||
|
||||
AMLOGIC RM FILM_VOF_SOFT.H IN DI DRIVER
|
||||
M: Bencheng Jing <bencheng.jing@amlogic.com>
|
||||
F: drivers/amlogic/media/deinterlace/film_vof_soft.h
|
||||
|
||||
@@ -153,10 +153,6 @@ struct FlmDectRes {
|
||||
};
|
||||
|
||||
UINT8 FlmVOFSftInt(struct sFlmSftPar *pPar);
|
||||
/* Get 1-Row combing information, 1bit */
|
||||
/* iHSCMB[9]; 9x32=288 */
|
||||
UINT8 Get1RCmb(UINT32 *iHSCMB, UINT32 iRow);
|
||||
|
||||
int FlmModsDet(struct sFlmDatSt *pRDat, int nDif01, int nDif02);
|
||||
|
||||
/* */
|
||||
|
||||
@@ -76,6 +76,21 @@ static unsigned int flmxx_no_cmb[7] = {8, 32, 8, 8, 8, 32, 32};
|
||||
static unsigned int flmxx_nn_cmb = 7;
|
||||
module_param_array(flmxx_no_cmb, uint, &flmxx_nn_cmb, 0664);
|
||||
|
||||
/* Get 1-Row combing information, 1bit */
|
||||
/* iHSCMB[9]; 9x32=288 */
|
||||
static UINT8 Get1RCmb(UINT32 *iHSCMB, UINT32 iRow, int nRow)
|
||||
{
|
||||
UINT8 nR1 = 0;
|
||||
UINT8 nBt = 0;
|
||||
|
||||
if (nRow > 288)
|
||||
iRow >>= 1;
|
||||
nR1 = ((iRow >> 5) & 0xf);/* iRow/32; 0--8 */
|
||||
iHSCMB[nR1] = nR1 > 8 ? 0 : iHSCMB[nR1];
|
||||
nBt = (iRow & 0x1f);/* iRow%32 */
|
||||
return (iHSCMB[nR1] >> nBt) & 0x1;
|
||||
}
|
||||
|
||||
int VOFSftTop(UINT8 *rFlmPstGCm, UINT8 *rFlmSltPre, UINT8 *rFlmPstMod,
|
||||
UShort *rPstCYWnd0, UShort *rPstCYWnd1,
|
||||
UShort *rPstCYWnd2, UShort *rPstCYWnd3, int nMod,
|
||||
@@ -621,23 +636,23 @@ int VOFDetSub1(int *VOFWnd, int *nCNum, int nMod, UINT32 *nRCmb, int nROW,
|
||||
nT1 = nROW - 1 - nT0;
|
||||
|
||||
/* if(nRCmb[nT0]==1) */
|
||||
if (Get1RCmb(nRCmb, nT1)) {
|
||||
if (Get1RCmb(nRCmb, nT1, nROW)) {
|
||||
nCSUM += 1; /* Total */
|
||||
if (nT0 == 0)
|
||||
nBgn = nT0;
|
||||
else if (nT0 == nROW - 1) {
|
||||
if (Get1RCmb(nRCmb, 1)) {
|
||||
if (Get1RCmb(nRCmb, 1, nROW)) {
|
||||
/* at least (2-Row combing) */
|
||||
nEnd = nT0;
|
||||
fEND = 1;
|
||||
}
|
||||
} else if (!Get1RCmb(nRCmb, nT1 + 1)) {
|
||||
} else if (!Get1RCmb(nRCmb, nT1 + 1, nROW)) {
|
||||
/* (nRCmb[nT0-1]==0) */
|
||||
nBgn = nT0;
|
||||
}
|
||||
} else {
|
||||
/* nRCmb[nT0]==0 */
|
||||
if (nT0 != 0 && Get1RCmb(nRCmb, nT1 + 1)) {
|
||||
if (nT0 != 0 && Get1RCmb(nRCmb, nT1 + 1, nROW)) {
|
||||
nEnd = nT0; /* nT0-1 */
|
||||
fEND = 1;
|
||||
}
|
||||
@@ -677,17 +692,3 @@ int VOFDetSub1(int *VOFWnd, int *nCNum, int nMod, UINT32 *nRCmb, int nROW,
|
||||
return nIDx;
|
||||
}
|
||||
|
||||
|
||||
/* Get 1-Row combing information, 1bit */
|
||||
/* iHSCMB[9]; 9x32=288 */
|
||||
UINT8 Get1RCmb(UINT32 *iHSCMB, UINT32 iRow)
|
||||
{
|
||||
UINT8 nR1 = 0;
|
||||
UINT8 nBt = 0;
|
||||
|
||||
nR1 = ((iRow >> 5) & 0xf);/* iRow/32; 0--8 */
|
||||
iHSCMB[nR1] = nR1 > 8 ? 0 : iHSCMB[nR1];
|
||||
nBt = (iRow & 0x1f);/* iRow%32 */
|
||||
return (iHSCMB[nR1] >> nBt) & 0x1;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,215 +0,0 @@
|
||||
/*
|
||||
* drivers/amlogic/media/deinterlace/film_vof_soft.h
|
||||
*
|
||||
* Copyright (C) 2017 Amlogic, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _FLMVOFSFT_H_
|
||||
#define _FLMVOFSFT_H_
|
||||
|
||||
/* Film Detection and VOF detection Software implementation */
|
||||
/* Designer: Xin.Hu@amlogic.com */
|
||||
/* Date: 12/06/13 */
|
||||
|
||||
/* Difference Windows Number (Last one is the global/total dif) */
|
||||
/* 5wind+global */
|
||||
/* #define DIFWNDNUM 6 */
|
||||
#define HISDIFNUM 10
|
||||
#define HISCMBNUM 10
|
||||
/* detection history information */
|
||||
#define HISDETNUM 6
|
||||
/* The number of VOF window */
|
||||
#define VOFWNDNUM 4
|
||||
|
||||
#define PDXX_PT_NUM 7
|
||||
|
||||
/* 288Row, 1bit/row -> (288/32)=9 */
|
||||
#define ROWCMBNUM 288
|
||||
#define ROWCMBLEN 9
|
||||
|
||||
#ifndef UINT32
|
||||
#define UINT32 unsigned int
|
||||
#endif
|
||||
|
||||
#ifndef UINT8
|
||||
#define UINT8 unsigned char
|
||||
#endif
|
||||
|
||||
#ifndef UShort
|
||||
#define UShort unsigned short
|
||||
#endif
|
||||
|
||||
extern uint pr_pd;
|
||||
extern bool prt_flg;
|
||||
extern char debug_str[];
|
||||
|
||||
/* Software: Film Detection and VOF parameters */
|
||||
struct sFlmDatSt {
|
||||
UINT8 pFlg32[HISDETNUM]; /* history information */
|
||||
UINT8 pMod32[HISDETNUM];
|
||||
UINT8 mNum32[HISDETNUM];
|
||||
|
||||
UINT8 pFld32[HISDETNUM];
|
||||
UINT8 pFrm32[HISDETNUM];
|
||||
UINT8 pFrm32t[HISDETNUM]; /* history information: spacial processing */
|
||||
|
||||
UINT8 pFlg22[HISDETNUM];
|
||||
UINT8 pMod22[HISDETNUM];
|
||||
UINT8 mNum22[HISDETNUM];
|
||||
|
||||
UINT8 pStp22[HISDETNUM];
|
||||
UINT8 pSmp22[HISDETNUM];
|
||||
|
||||
UINT8 pModXx[HISDETNUM]; /* mode */
|
||||
UINT8 pFlgXx[HISDETNUM]; /* pre-1, nxt-0 */
|
||||
UINT8 pLvlXx[HISDETNUM]; /* mode level */
|
||||
|
||||
int TCNm[HISCMBNUM];/* history: the number of combing-rows */
|
||||
|
||||
UINT32 *rROFrmDif02;
|
||||
|
||||
/* size of the image */
|
||||
int iHeight;
|
||||
int iWidth;
|
||||
};
|
||||
|
||||
/* Software parameters */
|
||||
struct sFlmSftPar {
|
||||
/* software */
|
||||
int sFrmDifAvgRat; /* 16; //0~32 */
|
||||
/* 4096; //The Large Decision should be: (large>average+LgDifThrd) */
|
||||
int sFrmDifLgTDif;
|
||||
int sF32StpWgt01; /* 15; */
|
||||
int sF32StpWgt02; /* 15; */
|
||||
int sF32DifLgRat; /* 16; //Dif>Rat*Min --> Larger */
|
||||
|
||||
int sFlm2MinAlpha; /* = 32; // [0~63] */
|
||||
int sFlm2MinBelta; /* = 32; // [0~63] */
|
||||
int sFlm20ftAlpha; /* = 16; // [0~63] */
|
||||
int sFlm2LgDifThd; /* = 4096; // [0~63] %LgDifThrd */
|
||||
int sFlm2LgFlgThd; /* = 8; */
|
||||
|
||||
int sF32Dif01A1; /* 65; */
|
||||
int sF32Dif01T1; /* 128; */
|
||||
int sF32Dif01A2; /* 65; */
|
||||
int sF32Dif01T2; /* 128; */
|
||||
|
||||
int rCmbRwMinCt0; /* 8; //for film 3-2 */
|
||||
int rCmbRwMinCt1; /* =7; //for film 2-2 */
|
||||
|
||||
UINT8 sFlm32NCmb; /* absolute no combing for film 32 */
|
||||
|
||||
/* pre-processing (t-0), post-processing f(t-mPstDlyPre); // No RTL */
|
||||
int mPstDlyPre;
|
||||
/* pre-processing (t-0), pre-processing f(t+mNxtDlySft); default=1 */
|
||||
int mNxtDlySft;
|
||||
int cmb22_nocmb_num;
|
||||
int flm22_en;
|
||||
int flm32_en;
|
||||
int flm22_flag;
|
||||
int flm2224_flag;
|
||||
int flm22_comlev;
|
||||
int flm22_comlev1;
|
||||
int flm22_comlev2;
|
||||
int flm22_comnum;
|
||||
int flm22_comth;
|
||||
int flm22_dif01_avgth;
|
||||
int dif01rate;
|
||||
int flag_di01th;
|
||||
int numthd;
|
||||
|
||||
UINT32 sF32Dif02M0; /* mpeg-4096, cvbs-8192 */
|
||||
UINT32 sF32Dif02M1; /* mpeg-4096, cvbs-8192 */
|
||||
};
|
||||
|
||||
struct FlmModReg_t {
|
||||
UINT32 rROFrmDif02[6]; /* Read only */
|
||||
UINT32 rROFldDif01[6]; /* Read only */
|
||||
UINT32 rROCmbInf[9];/* Inf[0]-[31:0], First-[31], Lst-[0] (Only 0/1) */
|
||||
};
|
||||
|
||||
struct FlmDectRes {
|
||||
UINT8 rCmb32Spcl;
|
||||
UINT8 rFlmPstGCm;
|
||||
UINT8 rFlmSltPre;
|
||||
UINT8 rFlmPstMod;
|
||||
UINT8 dif01flag;
|
||||
UShort rPstCYWnd0[3];
|
||||
UShort rPstCYWnd1[3];
|
||||
UShort rPstCYWnd2[3];
|
||||
UShort rPstCYWnd3[3];
|
||||
UShort rPstCYWnd4[3];
|
||||
UShort rF22Flag;
|
||||
};
|
||||
|
||||
UINT8 FlmVOFSftInt(struct sFlmSftPar *pPar);
|
||||
/* Get 1-Row combing information, 1bit */
|
||||
/* iHSCMB[9]; 9x32=288 */
|
||||
UINT8 Get1RCmb(UINT32 *iHSCMB, UINT32 iRow);
|
||||
|
||||
int FlmModsDet(struct sFlmDatSt *pRDat, int nDif01, int nDif02);
|
||||
|
||||
|
||||
/* */
|
||||
int FlmVOFSftTop(UINT8 *rCmb32Spcl, unsigned short *rPstCYWnd0,
|
||||
unsigned short *rPstCYWnd1, unsigned short *rPstCYWnd2,
|
||||
unsigned short *rPstCYWnd3, unsigned short *rPstCYWnd4,
|
||||
UINT8 *rFlmPstGCm, UINT8 *rFlmSltPre, UINT8 *rFlmPstMod,
|
||||
UINT8 *dif01flag, UINT32 *rROFldDif01, UINT32 *rROFrmDif02,
|
||||
UINT32 *rROCmbInf, UINT32 glb_frame_mot_num,
|
||||
UINT32 glb_field_mot_num, int *tTCNm,
|
||||
struct sFlmSftPar *pPar, int nROW, int nCOL,
|
||||
unsigned int *frame_diff_avg, bool reverse);
|
||||
|
||||
/* length of pFlm01/nDif01: [0:5]; */
|
||||
/* iDx: index of minimum dif02 ([0:5] */
|
||||
int Cal32Flm01(UINT8 *pFlm01, int *nDif01, int iDx, struct sFlmSftPar *pPar);
|
||||
|
||||
/* Film Detection Software implementation */
|
||||
/* nDif01: Fild Difference */
|
||||
/* nDif02: Frame Difference */
|
||||
/* WND: The index of Window */
|
||||
int FlmDetSft(struct sFlmDatSt *pRDat, int *nDif01, int *nDif02, int WND,
|
||||
struct sFlmSftPar *pPar);
|
||||
|
||||
int VOFDetSub1(int *PREWV, int *nCNum, int nMod, UINT32 *nRCmb, int nROW,
|
||||
struct sFlmSftPar *pPar);
|
||||
|
||||
/* Video on Film Detection Software implementaion */
|
||||
int VOFDetSft(int *VOFWnd, int *nCNum, int *nGCmb,
|
||||
UINT32 HSCMB[HISCMBNUM][ROWCMBLEN], int nMod, UINT8 *PREWV,
|
||||
int nROW, struct sFlmSftPar *pPar);
|
||||
|
||||
/* */
|
||||
int Flm32DetSft(struct sFlmDatSt *pRDat, int *nDif02, int *nDif01,
|
||||
struct sFlmSftPar *pPar);
|
||||
|
||||
/* Film2-2 Detection */
|
||||
int Flm22DetSft(struct sFlmDatSt *pRDat, int *nDif02,
|
||||
int *nDif01, struct sFlmSftPar *pPar);
|
||||
|
||||
/* length: [0:5] */
|
||||
/* MIX: [1~5] */
|
||||
int Flm32DetSub1(struct sFlmDatSt *pRDat, UINT8 *nFlg12, UINT8 *pFlm02t,
|
||||
UINT8 *nFlg01, UINT8 *nFlg02, UINT8 MIX);
|
||||
|
||||
int VOFSftTop(UINT8 *rFlmPstGCm, UINT8 *rFlmSltPre, UINT8 *rFlmPstMod,
|
||||
UShort *rPstCYWnd0, UShort *rPstCYWnd1, UShort *rPstCYWnd2,
|
||||
UShort *rPstCYWnd3, int nMod, UINT32 *rROCmbInf,
|
||||
struct sFlmDatSt *pRDat, struct sFlmSftPar *pPar,
|
||||
int nROW, int nCOL, bool reverse);
|
||||
|
||||
extern UINT32 field_count;
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user