On Sun, 18 Mar 2012 19:06:14 +0100, Diego Biurrun <[email protected]> wrote:
> ---
>
> Before I split off the encoder first, the decoder second, but that breaks
> FATE for some reason that I don't yet understand (ideas, anyone?). So
> this version of the patch splits off the decoder first and is rebased on
> top of HEAD.
>
I wanted to look into that, but the original patch doesn't apply anymore
and my repo is missing some objects for -3, so...
> libavcodec/Makefile | 2 +-
> libavcodec/dv.c | 397
> +---------------------------------------------
> libavcodec/dv_tablegen.h | 4 +-
> libavcodec/dvdata.h | 44 +++++
> libavcodec/dvdec.c | 385 ++++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 438 insertions(+), 394 deletions(-)
> create mode 100644 libavcodec/dvdec.c
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 95ed39a..de31ba7 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -125,7 +125,7 @@ OBJS-$(CONFIG_DVBSUB_DECODER) += dvbsubdec.o
> OBJS-$(CONFIG_DVBSUB_ENCODER) += dvbsub.o
> OBJS-$(CONFIG_DVDSUB_DECODER) += dvdsubdec.o
> OBJS-$(CONFIG_DVDSUB_ENCODER) += dvdsubenc.o
> -OBJS-$(CONFIG_DVVIDEO_DECODER) += dv.o dvdata.o
> +OBJS-$(CONFIG_DVVIDEO_DECODER) += dvdec.o dv.o dvdata.o
> OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o dvdata.o
> OBJS-$(CONFIG_DXA_DECODER) += dxa.o
> OBJS-$(CONFIG_DXTORY_DECODER) += dxtory.o
> diff --git a/libavcodec/dv.c b/libavcodec/dv.c
> index 3deaa5e..a0cbcfa 100644
> --- a/libavcodec/dv.c
> +++ b/libavcodec/dv.c
> @@ -49,37 +49,8 @@
> #include "dvquant.h"
> #include "dv_tablegen.h"
>
> -//#undef NDEBUG
> -//#include <assert.h>
> -
> -typedef struct DVVideoContext {
> - const DVprofile *sys;
> - AVFrame picture;
> - AVCodecContext *avctx;
> - uint8_t *buf;
> -
> - uint8_t dv_zigzag[2][64];
> -
> - void (*get_pixels)(DCTELEM *block, const uint8_t *pixels, int line_size);
> - void (*fdct[2])(DCTELEM *block);
> - void (*idct_put[2])(uint8_t *dest, int line_size, DCTELEM *block);
> - me_cmp_func ildct_cmp;
> -} DVVideoContext;
> -
> -#define TEX_VLC_BITS 9
> -
> /* XXX: also include quantization */
> -static RL_VLC_ELEM dv_rl_vlc[1184];
> -
> -static inline int dv_work_pool_size(const DVprofile *d)
> -{
> - int size = d->n_difchan*d->difseg_size*27;
> - if (DV_PROFILE_IS_1080i50(d))
> - size -= 3*27;
> - if (DV_PROFILE_IS_720p50(d))
> - size -= 4*27;
> - return size;
> -}
> +RL_VLC_ELEM dv_rl_vlc[1184];
ff_ prefix for non-static symbols please
The rest looks fine.
Feel free to push with that change if tested and works.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
