On Sat, Oct 4, 2014 at 12:53 PM, Luca Barbato <[email protected]> wrote: > --- > libavcodec/Makefile | 3 +- > libavcodec/vc1.h | 5 + > libavcodec/vc1_block.c | 338 ++--------------------------------------- > libavcodec/vc1_loopfilter.c | 363 > ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 380 insertions(+), 329 deletions(-) > create mode 100644 libavcodec/vc1_loopfilter.c > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 6aaf621..cda2426 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -390,7 +390,8 @@ OBJS-$(CONFIG_V410_ENCODER) += v410enc.o > OBJS-$(CONFIG_V210X_DECODER) += v210x.o > OBJS-$(CONFIG_VB_DECODER) += vb.o > OBJS-$(CONFIG_VBLE_DECODER) += vble.o > -OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1.o > vc1data.o vc1dsp.o \ > +OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o > vc1_loopfilter.o \ > + vc1.o vc1data.o vc1dsp.o \
alignment > msmpeg4dec.o msmpeg4.o > msmpeg4data.o > OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o > OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdaudio.o > diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h > index 780344a..b26632d 100644 > --- a/libavcodec/vc1.h > +++ b/libavcodec/vc1.h > @@ -400,4 +400,9 @@ void ff_vc1_init_transposed_scantables(VC1Context *v); > int ff_vc1_decode_end(AVCodecContext *avctx); > void ff_vc1_decode_blocks(VC1Context *v); > > +void ff_vc1_loop_filter_iblk(VC1Context *v, int pq); > +void ff_vc1_loop_filter_iblk_delayed(VC1Context *v, int pq); > +void ff_vc1_smooth_overlap_filter_iblk(VC1Context *v); > +void ff_vc1_apply_p_loop_filter(VC1Context *v); > + > #endif /* AVCODEC_VC1_H */ > diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c > index 28bc2e9..8b3ee21 100644 > --- a/libavcodec/vc1_block.c > +++ b/libavcodec/vc1_block.c I'd not move everything out of vc1_block after you created it in the previous commit. Imho it's fine if you squash these first two patches. > diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c > new file mode 100644 > index 0000000..f2a90ac > --- /dev/null > +++ b/libavcodec/vc1_loopfilter.c > @@ -0,0 +1,363 @@ > + > +#include "internal.h" > +#include "avcodec.h" > +#include "error_resilience.h" > +#include "mpegutils.h" > +#include "mpegvideo.h" > +#include "h263.h" > +#include "h264chroma.h" > +#include "qpeldsp.h" > +#include "vc1.h" > +#include "vc1data.h" > +#include "vc1acdata.h" > +#include "msmpeg4data.h" > +#include "unary.h" > +#include "mathops.h" karma += order -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
