Browse Source

QP_store==null bugfix and no opendivx bugfix

Originally committed as revision 2809 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
tags/v0.5
Michael Niedermayer 24 years ago
parent
commit
815cbfe71e
2 changed files with 30 additions and 0 deletions
  1. +15
    -0
      postproc/postprocess.c
  2. +15
    -0
      postproc/postprocess_template.c

+ 15
- 0
postproc/postprocess.c View File

@@ -2750,12 +2750,14 @@ struct PPMode getPPModeByNameAndQuality(char *name, int quality)
ppMode.error += numOfUnknownOptions;
}

#ifdef HAVE_ODIVX_POSTPROCESS
if(ppMode.lumMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_H;
if(ppMode.lumMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_V;
if(ppMode.chromMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_H;
if(ppMode.chromMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_V;
if(ppMode.lumMode & DERING) ppMode.oldMode |= PP_DERING_Y;
if(ppMode.chromMode & DERING) ppMode.oldMode |= PP_DERING_C;
#endif

return ppMode;
}
@@ -2781,6 +2783,12 @@ void postprocess(unsigned char * src[], int src_stride,

return;
*/
static QP_STORE_T zeroArray[2048/8];
if(QP_store==NULL)
{
QP_store= zeroArray;
QP_stride= 0;
}

#ifdef HAVE_ODIVX_POSTPROCESS
// Note: I could make this shit outside of this file, but it would mean one
@@ -2823,6 +2831,13 @@ void postprocess2(unsigned char * src[], int src_stride,
struct PPMode *mode)
{

static QP_STORE_T zeroArray[2048/8];
if(QP_store==NULL)
{
QP_store= zeroArray;
QP_stride= 0;
}

#ifdef HAVE_ODIVX_POSTPROCESS
// Note: I could make this shit outside of this file, but it would mean one
// more function call...


+ 15
- 0
postproc/postprocess_template.c View File

@@ -2750,12 +2750,14 @@ struct PPMode getPPModeByNameAndQuality(char *name, int quality)
ppMode.error += numOfUnknownOptions;
}

#ifdef HAVE_ODIVX_POSTPROCESS
if(ppMode.lumMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_H;
if(ppMode.lumMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_Y_V;
if(ppMode.chromMode & H_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_H;
if(ppMode.chromMode & V_DEBLOCK) ppMode.oldMode |= PP_DEBLOCK_C_V;
if(ppMode.lumMode & DERING) ppMode.oldMode |= PP_DERING_Y;
if(ppMode.chromMode & DERING) ppMode.oldMode |= PP_DERING_C;
#endif

return ppMode;
}
@@ -2781,6 +2783,12 @@ void postprocess(unsigned char * src[], int src_stride,

return;
*/
static QP_STORE_T zeroArray[2048/8];
if(QP_store==NULL)
{
QP_store= zeroArray;
QP_stride= 0;
}

#ifdef HAVE_ODIVX_POSTPROCESS
// Note: I could make this shit outside of this file, but it would mean one
@@ -2823,6 +2831,13 @@ void postprocess2(unsigned char * src[], int src_stride,
struct PPMode *mode)
{

static QP_STORE_T zeroArray[2048/8];
if(QP_store==NULL)
{
QP_store= zeroArray;
QP_stride= 0;
}

#ifdef HAVE_ODIVX_POSTPROCESS
// Note: I could make this shit outside of this file, but it would mean one
// more function call...


Loading…
Cancel
Save