virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
Code Issues Releases Activity

h.261 loop filter fix

Browse Source 
closes bug #1033108

Originally committed as revision 3574 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-10-08 22:57:39 +00:00
parent 8c7aaf5b6d
commit 5f6c92d40c
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h261.c
View File

@ -57,14 +57,17 @@ typedef struct H261Context{
int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
}H261Context; }H261Context;
void ff_h261_loop_filter(H261Context * h){ void ff_h261_loop_filter(MpegEncContext *s){
MpegEncContext * const s = &h->s; H261Context * h= (H261Context*)s;
const int linesize = s->linesize; const int linesize = s->linesize;
const int uvlinesize= s->uvlinesize; const int uvlinesize= s->uvlinesize;
uint8_t *dest_y = s->dest[0]; uint8_t *dest_y = s->dest[0];
uint8_t *dest_cb= s->dest[1]; uint8_t *dest_cb= s->dest[1];
uint8_t *dest_cr= s->dest[2]; uint8_t *dest_cr= s->dest[2];
if(!(IS_FIL (h->mtype)))
return;
s->dsp.h261_loop_filter(dest_y , linesize); s->dsp.h261_loop_filter(dest_y , linesize);
s->dsp.h261_loop_filter(dest_y + 8, linesize); s->dsp.h261_loop_filter(dest_y + 8, linesize);
s->dsp.h261_loop_filter(dest_y + 8 * linesize , linesize); s->dsp.h261_loop_filter(dest_y + 8 * linesize , linesize);
@ -256,6 +259,7 @@ static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2 )
s->mv[0][0][0] = 0; s->mv[0][0][0] = 0;
s->mv[0][0][1] = 0; s->mv[0][0][1] = 0;
s->mb_skiped = 1; s->mb_skiped = 1;
h->mtype &= ~MB_TYPE_H261_FIL;
MPV_decode_mb(s, s->block); MPV_decode_mb(s, s->block);
} }
@ -388,10 +392,6 @@ intra:
MPV_decode_mb(s, s->block); MPV_decode_mb(s, s->block);
if(IS_FIL (h->mtype)){
ff_h261_loop_filter(h);
}
return SLICE_OK; return SLICE_OK;
} }

4
libavcodec/mpegvideo.c
View File

@ -2608,6 +2608,9 @@ if(s->quarter_sample)
pix_op[s->chroma_x_shift][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift); pix_op[s->chroma_x_shift][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift);
pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift); pix_op[s->chroma_x_shift][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift);
} }
if(s->out_format == FMT_H261){
ff_h261_loop_filter(s);
}
} }
/* apply one mpeg motion vector to the three components */ /* apply one mpeg motion vector to the three components */
@ -2704,6 +2707,7 @@ static always_inline void mpeg_motion_lowres(MpegEncContext *s,
pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
} }
//FIXME h261 lowres loop filter
} }
//FIXME move to dsputil, avg variant, 16x16 version //FIXME move to dsputil, avg variant, 16x16 version

3
libavcodec/mpegvideo.h
View File

@ -863,6 +863,9 @@ extern const int16_t ff_mpeg4_default_non_intra_matrix[64];
extern const uint8_t ff_h263_chroma_qscale_table[32]; extern const uint8_t ff_h263_chroma_qscale_table[32];
extern const uint8_t ff_h263_loop_filter_strength[32]; extern const uint8_t ff_h263_loop_filter_strength[32];
/* h261.c */
void ff_h261_loop_filter(MpegEncContext *s);
/* h263.c, h263dec.c */ /* h263.c, h263dec.c */
int ff_h263_decode_init(AVCodecContext *avctx); int ff_h263_decode_init(AVCodecContext *avctx);