virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

same dc skip behavior for chroma & luma elimination, its confusing otherwise imho

Browse Source 
Originally committed as revision 854 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-08-18 00:42:58 +00:00
parent f5866a0340
commit c9178d868a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mpegvideo.c
View File

@@ -1571,7 +1571,7 @@ void MPV_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
emms_c(); //FIXME remove emms_c(); //FIXME remove
} }
static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold, int skip_dc) static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int threshold)
{ {
static const char tab[64]= static const char tab[64]=
{3,2,2,1,1,1,1,1, {3,2,2,1,1,1,1,1,
@@ -1587,12 +1587,13 @@ static inline void dct_single_coeff_elimination(MpegEncContext *s, int n, int th
int i; int i;
DCTELEM *block= s->block[n]; DCTELEM *block= s->block[n];
const int last_index= s->block_last_index[n]; const int last_index= s->block_last_index[n];
int skip_dc;
if(skip_dc) skip_dc=1;
if(threshold<0){ if(threshold<0){
skip_dc=0; skip_dc=0;
threshold= -threshold; threshold= -threshold;
} }else
skip_dc=1;
/* are all which we could set to zero are allready zero? */ /* are all which we could set to zero are allready zero? */
if(last_index<=skip_dc - 1) return; if(last_index<=skip_dc - 1) return;
@@ -1811,10 +1812,10 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
} }
if(s->luma_elim_threshold && !s->mb_intra) if(s->luma_elim_threshold && !s->mb_intra)
for(i=0; i<4; i++) for(i=0; i<4; i++)
dct_single_coeff_elimination(s, i, s->luma_elim_threshold, 0); dct_single_coeff_elimination(s, i, s->luma_elim_threshold);
if(s->chroma_elim_threshold && !s->mb_intra) if(s->chroma_elim_threshold && !s->mb_intra)
for(i=4; i<6; i++) for(i=4; i<6; i++)
dct_single_coeff_elimination(s, i, s->chroma_elim_threshold, 1); dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
} }
if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){