har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

postproc: remove usage of deprecated QP_STORE_T define

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-08-30 14:43:22 -03:00
parent f7d4c60ac4
commit 2b7da70a70
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libpostproc/postprocess.c
View File

@ -558,10 +558,10 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step,
#endif #endif
typedef void (*pp_fn)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, typedef void (*pp_fn)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
const QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c2); const int8_t QPs[], int QPStride, int isColor, PPContext *c2);
static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
const QP_STORE_T QPs[], int QPStride, int isColor, pp_mode *vm, pp_context *vc) const int8_t QPs[], int QPStride, int isColor, pp_mode *vm, pp_context *vc)
{ {
pp_fn pp = postProcess_C; pp_fn pp = postProcess_C;
PPContext *c= (PPContext *)vc; PPContext *c= (PPContext *)vc;
@ -870,9 +870,9 @@ static void reallocBuffers(PPContext *c, int width, int height, int stride, int
} }
reallocAlign((void **)&c->deintTemp, 2*width+32); reallocAlign((void **)&c->deintTemp, 2*width+32);
reallocAlign((void **)&c->nonBQPTable, qpStride*mbHeight*sizeof(QP_STORE_T)); reallocAlign((void **)&c->nonBQPTable, qpStride*mbHeight*sizeof(int8_t));
reallocAlign((void **)&c->stdQPTable, qpStride*mbHeight*sizeof(QP_STORE_T)); reallocAlign((void **)&c->stdQPTable, qpStride*mbHeight*sizeof(int8_t));
reallocAlign((void **)&c->forcedQPTable, mbWidth*sizeof(QP_STORE_T)); reallocAlign((void **)&c->forcedQPTable, mbWidth*sizeof(int8_t));
} }
static const char * context_to_name(void * ptr) { static const char * context_to_name(void * ptr) {
@ -940,7 +940,7 @@ av_cold void pp_free_context(void *vc){
void pp_postprocess(const uint8_t * src[3], const int srcStride[3], void pp_postprocess(const uint8_t * src[3], const int srcStride[3],
uint8_t * dst[3], const int dstStride[3], uint8_t * dst[3], const int dstStride[3],
int width, int height, int width, int height,
const QP_STORE_T *QP_store, int QPStride, const int8_t *QP_store, int QPStride,
pp_mode *vm, void *vc, int pict_type) pp_mode *vm, void *vc, int pict_type)
{ {
int mbWidth = (width+15)>>4; int mbWidth = (width+15)>>4;

6
libpostproc/postprocess_internal.h
View File

@ -149,9 +149,9 @@ typedef struct PPContext{
DECLARE_ALIGNED(32, uint64_t, mmxDcOffset)[64]; DECLARE_ALIGNED(32, uint64_t, mmxDcOffset)[64];
DECLARE_ALIGNED(32, uint64_t, mmxDcThreshold)[64]; DECLARE_ALIGNED(32, uint64_t, mmxDcThreshold)[64];
QP_STORE_T *stdQPTable; ///< used to fix MPEG2 style qscale int8_t *stdQPTable; ///< used to fix MPEG2 style qscale
QP_STORE_T *nonBQPTable; int8_t *nonBQPTable;
QP_STORE_T *forcedQPTable; int8_t *forcedQPTable;
int QP; int QP;
int nonBQP; int nonBQP;

4
libpostproc/postprocess_template.c
View File

@ -3081,7 +3081,7 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st
#endif //TEMPLATE_PP_MMX #endif //TEMPLATE_PP_MMX
static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
const QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c); const int8_t QPs[], int QPStride, int isColor, PPContext *c);
/** /**
* Copy a block from src to dst and fixes the blacklevel. * Copy a block from src to dst and fixes the blacklevel.
@ -3309,7 +3309,7 @@ static inline void RENAME(prefetcht2)(const void *p)
* Filter array of bytes (Y or U or V values) * Filter array of bytes (Y or U or V values)
*/ */
static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height,
const QP_STORE_T QPs[], int QPStride, int isColor, PPContext *c2) const int8_t QPs[], int QPStride, int isColor, PPContext *c2)
{ {
DECLARE_ALIGNED(8, PPContext, c)= *c2; //copy to stack for faster access DECLARE_ALIGNED(8, PPContext, c)= *c2; //copy to stack for faster access
int x,y; int x,y;