[FFmpeg-cvslog] postproc: remove usage of deprecated QP_STORE_T define
James Almer
git at videolan.org
Wed Aug 30 20:45:19 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Aug 30 14:43:22 2017 -0300| [2b7da70a70fef364f9a42e69b6d34133b3d089f8] | committer: James Almer
postproc: remove usage of deprecated QP_STORE_T define
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b7da70a70fef364f9a42e69b6d34133b3d089f8
---
libpostproc/postprocess.c | 12 ++++++------
libpostproc/postprocess_internal.h | 6 +++---
libpostproc/postprocess_template.c | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 6aa4ace337..1fef8747c0 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -558,10 +558,10 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step,
#endif
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,
- 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;
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->nonBQPTable, qpStride*mbHeight*sizeof(QP_STORE_T));
- reallocAlign((void **)&c->stdQPTable, qpStride*mbHeight*sizeof(QP_STORE_T));
- reallocAlign((void **)&c->forcedQPTable, mbWidth*sizeof(QP_STORE_T));
+ reallocAlign((void **)&c->nonBQPTable, qpStride*mbHeight*sizeof(int8_t));
+ reallocAlign((void **)&c->stdQPTable, qpStride*mbHeight*sizeof(int8_t));
+ reallocAlign((void **)&c->forcedQPTable, mbWidth*sizeof(int8_t));
}
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],
uint8_t * dst[3], const int dstStride[3],
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)
{
int mbWidth = (width+15)>>4;
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index d128dfbe2f..765fdeb14a 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -149,9 +149,9 @@ typedef struct PPContext{
DECLARE_ALIGNED(32, uint64_t, mmxDcOffset)[64];
DECLARE_ALIGNED(32, uint64_t, mmxDcThreshold)[64];
- QP_STORE_T *stdQPTable; ///< used to fix MPEG2 style qscale
- QP_STORE_T *nonBQPTable;
- QP_STORE_T *forcedQPTable;
+ int8_t *stdQPTable; ///< used to fix MPEG2 style qscale
+ int8_t *nonBQPTable;
+ int8_t *forcedQPTable;
int QP;
int nonBQP;
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index 2a25ce44e3..0a43989266 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -3081,7 +3081,7 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st
#endif //TEMPLATE_PP_MMX
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.
@@ -3309,7 +3309,7 @@ static inline void RENAME(prefetcht2)(const void *p)
* 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,
- 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
int x,y;
More information about the ffmpeg-cvslog
mailing list