From 30981a966f175b424fe94ef04f56c1e9bebe47dd Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 14 Jan 2013 22:30:30 +0100 Subject: lavc: split snow and dirac DWTs There is only about 4 lines of common code, so it alot cleaner when seperated. Signed-off-by: Michael Niedermayer --- libavcodec/Makefile | 7 +- libavcodec/dirac_dwt.c | 585 ++++++++++++++++++ libavcodec/dirac_dwt.h | 126 ++++ libavcodec/diracdec.c | 2 +- libavcodec/dwt.c | 1402 -------------------------------------------- libavcodec/dwt.h | 215 ------- libavcodec/ivi_dsp.c | 5 +- libavcodec/snow.c | 2 +- libavcodec/snow.h | 4 +- libavcodec/snow_dwt.c | 865 +++++++++++++++++++++++++++ libavcodec/snow_dwt.h | 127 ++++ libavcodec/snowdec.c | 2 +- libavcodec/snowenc.c | 2 +- libavcodec/x86/Makefile | 8 +- libavcodec/x86/dirac_dwt.c | 202 +++++++ libavcodec/x86/dirac_dwt.h | 30 + libavcodec/x86/dwt.c | 202 ------- libavcodec/x86/dwt.h | 30 - libavcodec/x86/snowdsp.c | 4 +- 19 files changed, 1952 insertions(+), 1868 deletions(-) create mode 100644 libavcodec/dirac_dwt.c create mode 100644 libavcodec/dirac_dwt.h delete mode 100644 libavcodec/dwt.c delete mode 100644 libavcodec/dwt.h create mode 100644 libavcodec/snow_dwt.c create mode 100644 libavcodec/snow_dwt.h create mode 100644 libavcodec/x86/dirac_dwt.c create mode 100644 libavcodec/x86/dirac_dwt.h delete mode 100644 libavcodec/x86/dwt.c delete mode 100644 libavcodec/x86/dwt.h diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 52e6fce6fe..0925e9606b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -41,7 +41,6 @@ OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o OBJS-$(CONFIG_AC3DSP) += ac3dsp.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o -OBJS-$(CONFIG_DWT) += dwt.o snow.o OBJS-$(CONFIG_DXVA2) += dxva2.o OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o @@ -158,7 +157,7 @@ OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \ dca_parser.o synth_filter.o OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dca.o OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o diracdsp.o \ - dirac_arith.o mpeg12data.o dwt.o + dirac_arith.o mpeg12data.o dirac_dwt.o OBJS-$(CONFIG_DFA_DECODER) += dfa.o OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o @@ -396,8 +395,8 @@ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \ OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o OBJS-$(CONFIG_SMC_DECODER) += smc.o -OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o -OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o \ +OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o snow_dwt.o +OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o snow_dwt.o \ h263.o ituh263enc.o OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_SONIC_DECODER) += sonic.o diff --git a/libavcodec/dirac_dwt.c b/libavcodec/dirac_dwt.c new file mode 100644 index 0000000000..a2848f01ac --- /dev/null +++ b/libavcodec/dirac_dwt.c @@ -0,0 +1,585 @@ +/* + * Copyright (C) 2004-2010 Michael Niedermayer + * Copyright (C) 2008 David Conrad + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/attributes.h" +#include "libavutil/avassert.h" +#include "libavutil/common.h" +#include "dsputil.h" +#include "dirac_dwt.h" +#include "libavcodec/x86/dirac_dwt.h" + + +static inline int mirror(int v, int m) +{ + while ((unsigned)v > (unsigned)m) { + v = -v; + if (v < 0) + v += 2 * m; + } + return v; +} + +static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] -= (b0[i] + b2[i] + 2) >> 2; +} + + +static av_always_inline +void interleave(IDWTELEM *dst, IDWTELEM *src0, IDWTELEM *src1, int w2, int add, int shift) +{ + int i; + for (i = 0; i < w2; i++) { + dst[2*i ] = (src0[i] + add) >> shift; + dst[2*i+1] = (src1[i] + add) >> shift; + } +} + +static void horizontal_compose_dirac53i(IDWTELEM *b, IDWTELEM *temp, int w) +{ + const int w2 = w >> 1; + int x; + + temp[0] = COMPOSE_53iL0(b[w2], b[0], b[w2]); + for (x = 1; x < w2; x++) { + temp[x ] = COMPOSE_53iL0 (b[x+w2-1], b[x ], b[x+w2]); + temp[x+w2-1] = COMPOSE_DIRAC53iH0(temp[x-1], b[x+w2-1], temp[x]); + } + temp[w-1] = COMPOSE_DIRAC53iH0(temp[w2-1], b[w-1], temp[w2-1]); + + interleave(b, temp, temp+w2, w2, 1, 1); +} + +static void horizontal_compose_dd97i(IDWTELEM *b, IDWTELEM *tmp, int w) +{ + const int w2 = w >> 1; + int x; + + tmp[0] = COMPOSE_53iL0(b[w2], b[0], b[w2]); + for (x = 1; x < w2; x++) + tmp[x] = COMPOSE_53iL0(b[x+w2-1], b[x], b[x+w2]); + + // extend the edges + tmp[-1] = tmp[0]; + tmp[w2+1] = tmp[w2] = tmp[w2-1]; + + for (x = 0; x < w2; x++) { + b[2*x ] = (tmp[x] + 1)>>1; + b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; + } +} + +static void horizontal_compose_dd137i(IDWTELEM *b, IDWTELEM *tmp, int w) +{ + const int w2 = w >> 1; + int x; + + tmp[0] = COMPOSE_DD137iL0(b[w2], b[w2], b[0], b[w2 ], b[w2+1]); + tmp[1] = COMPOSE_DD137iL0(b[w2], b[w2], b[1], b[w2+1], b[w2+2]); + for (x = 2; x < w2-1; x++) + tmp[x] = COMPOSE_DD137iL0(b[x+w2-2], b[x+w2-1], b[x], b[x+w2], b[x+w2+1]); + tmp[w2-1] = COMPOSE_DD137iL0(b[w-3], b[w-2], b[w2-1], b[w-1], b[w-1]); + + // extend the edges + tmp[-1] = tmp[0]; + tmp[w2+1] = tmp[w2] = tmp[w2-1]; + + for (x = 0; x < w2; x++) { + b[2*x ] = (tmp[x] + 1)>>1; + b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; + } +} + +static av_always_inline +void horizontal_compose_haari(IDWTELEM *b, IDWTELEM *temp, int w, int shift) +{ + const int w2 = w >> 1; + int x; + + for (x = 0; x < w2; x++) { + temp[x ] = COMPOSE_HAARiL0(b[x ], b[x+w2]); + temp[x+w2] = COMPOSE_HAARiH0(b[x+w2], temp[x]); + } + + interleave(b, temp, temp+w2, w2, shift, shift); +} + +static void horizontal_compose_haar0i(IDWTELEM *b, IDWTELEM *temp, int w) +{ + horizontal_compose_haari(b, temp, w, 0); +} + +static void horizontal_compose_haar1i(IDWTELEM *b, IDWTELEM *temp, int w) +{ + horizontal_compose_haari(b, temp, w, 1); +} + +static void horizontal_compose_fidelityi(IDWTELEM *b, IDWTELEM *tmp, int w) +{ + const int w2 = w >> 1; + int i, x; + IDWTELEM v[8]; + + for (x = 0; x < w2; x++) { + for (i = 0; i < 8; i++) + v[i] = b[av_clip(x-3+i, 0, w2-1)]; + tmp[x] = COMPOSE_FIDELITYiH0(v[0], v[1], v[2], v[3], b[x+w2], v[4], v[5], v[6], v[7]); + } + + for (x = 0; x < w2; x++) { + for (i = 0; i < 8; i++) + v[i] = tmp[av_clip(x-4+i, 0, w2-1)]; + tmp[x+w2] = COMPOSE_FIDELITYiL0(v[0], v[1], v[2], v[3], b[x], v[4], v[5], v[6], v[7]); + } + + interleave(b, tmp+w2, tmp, w2, 0, 0); +} + +static void horizontal_compose_daub97i(IDWTELEM *b, IDWTELEM *temp, int w) +{ + const int w2 = w >> 1; + int x, b0, b1, b2; + + temp[0] = COMPOSE_DAUB97iL1(b[w2], b[0], b[w2]); + for (x = 1; x < w2; x++) { + temp[x ] = COMPOSE_DAUB97iL1(b[x+w2-1], b[x ], b[x+w2]); + temp[x+w2-1] = COMPOSE_DAUB97iH1(temp[x-1], b[x+w2-1], temp[x]); + } + temp[w-1] = COMPOSE_DAUB97iH1(temp[w2-1], b[w-1], temp[w2-1]); + + // second stage combined with interleave and shift + b0 = b2 = COMPOSE_DAUB97iL0(temp[w2], temp[0], temp[w2]); + b[0] = (b0 + 1) >> 1; + for (x = 1; x < w2; x++) { + b2 = COMPOSE_DAUB97iL0(temp[x+w2-1], temp[x ], temp[x+w2]); + b1 = COMPOSE_DAUB97iH0( b0, temp[x+w2-1], b2 ); + b[2*x-1] = (b1 + 1) >> 1; + b[2*x ] = (b2 + 1) >> 1; + b0 = b2; + } + b[w-1] = (COMPOSE_DAUB97iH0(b2, temp[w-1], b2) + 1) >> 1; +} + +static void vertical_compose_dirac53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width) +{ + int i; + + for(i=0; ivertical_compose_l0; + vertical_compose_5tap vertical_compose_h0 = (void*)d->vertical_compose_h0; + DWTCompose *cs = d->cs + level; + + int i, y = cs->y; + IDWTELEM *b[8]; + for (i = 0; i < 6; i++) + b[i] = cs->b[i]; + b[6] = d->buffer + av_clip(y+5, 0, height-2)*stride; + b[7] = d->buffer + av_clip(y+6, 1, height-1)*stride; + + if(y+5<(unsigned)height) vertical_compose_l0( b[5], b[6], b[7], width); + if(y+1<(unsigned)height) vertical_compose_h0(b[0], b[2], b[3], b[4], b[6], width); + + if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); + if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); + + for (i = 0; i < 6; i++) + cs->b[i] = b[i+2]; + cs->y += 2; +} + +static void spatial_compose_dirac53i_dy(DWTContext *d, int level, int width, int height, int stride) +{ + vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0; + vertical_compose_3tap vertical_compose_h0 = (void*)d->vertical_compose_h0; + DWTCompose *cs = d->cs + level; + + int y= cs->y; + IDWTELEM *b[4] = { cs->b[0], cs->b[1] }; + b[2] = d->buffer + mirror(y+1, height-1)*stride; + b[3] = d->buffer + mirror(y+2, height-1)*stride; + + if(y+1<(unsigned)height) vertical_compose_l0(b[1], b[2], b[3], width); + if(y+0<(unsigned)height) vertical_compose_h0(b[0], b[1], b[2], width); + + if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); + if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); + + cs->b[0] = b[2]; + cs->b[1] = b[3]; + cs->y += 2; +} + + +static void spatial_compose_dd137i_dy(DWTContext *d, int level, int width, int height, int stride) +{ + vertical_compose_5tap vertical_compose_l0 = (void*)d->vertical_compose_l0; + vertical_compose_5tap vertical_compose_h0 = (void*)d->vertical_compose_h0; + DWTCompose *cs = d->cs + level; + + int i, y = cs->y; + IDWTELEM *b[10]; + for (i = 0; i < 8; i++) + b[i] = cs->b[i]; + b[8] = d->buffer + av_clip(y+7, 0, height-2)*stride; + b[9] = d->buffer + av_clip(y+8, 1, height-1)*stride; + + if(y+5<(unsigned)height) vertical_compose_l0(b[3], b[5], b[6], b[7], b[9], width); + if(y+1<(unsigned)height) vertical_compose_h0(b[0], b[2], b[3], b[4], b[6], width); + + if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); + if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); + + for (i = 0; i < 8; i++) + cs->b[i] = b[i+2]; + cs->y += 2; +} + +// haar makes the assumption that height is even (always true for dirac) +static void spatial_compose_haari_dy(DWTContext *d, int level, int width, int height, int stride) +{ + vertical_compose_2tap vertical_compose = (void*)d->vertical_compose; + int y = d->cs[level].y; + IDWTELEM *b0 = d->buffer + (y-1)*stride; + IDWTELEM *b1 = d->buffer + (y )*stride; + + vertical_compose(b0, b1, width); + d->horizontal_compose(b0, d->temp, width); + d->horizontal_compose(b1, d->temp, width); + + d->cs[level].y += 2; +} + +// Don't do sliced idwt for fidelity; the 9 tap filter makes it a bit annoying +// Fortunately, this filter isn't used in practice. +static void spatial_compose_fidelity(DWTContext *d, int level, int width, int height, int stride) +{ + vertical_compose_9tap vertical_compose_l0 = (void*)d->vertical_compose_l0; + vertical_compose_9tap vertical_compose_h0 = (void*)d->vertical_compose_h0; + int i, y; + IDWTELEM *b[8]; + + for (y = 1; y < height; y += 2) { + for (i = 0; i < 8; i++) + b[i] = d->buffer + av_clip((y-7 + 2*i), 0, height-2)*stride; + vertical_compose_h0(d->buffer + y*stride, b, width); + } + + for (y = 0; y < height; y += 2) { + for (i = 0; i < 8; i++) + b[i] = d->buffer + av_clip((y-7 + 2*i), 1, height-1)*stride; + vertical_compose_l0(d->buffer + y*stride, b, width); + } + + for (y = 0; y < height; y++) + d->horizontal_compose(d->buffer + y*stride, d->temp, width); + + d->cs[level].y = height+1; +} + +static void spatial_compose_daub97i_dy(DWTContext *d, int level, int width, int height, int stride) +{ + vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0; + vertical_compose_3tap vertical_compose_h0 = (void*)d->vertical_compose_h0; + vertical_compose_3tap vertical_compose_l1 = (void*)d->vertical_compose_l1; + vertical_compose_3tap vertical_compose_h1 = (void*)d->vertical_compose_h1; + DWTCompose *cs = d->cs + level; + + int i, y = cs->y; + IDWTELEM *b[6]; + for (i = 0; i < 4; i++) + b[i] = cs->b[i]; + b[4] = d->buffer + mirror(y+3, height-1)*stride; + b[5] = d->buffer + mirror(y+4, height-1)*stride; + + if(y+3<(unsigned)height) vertical_compose_l1(b[3], b[4], b[5], width); + if(y+2<(unsigned)height) vertical_compose_h1(b[2], b[3], b[4], width); + if(y+1<(unsigned)height) vertical_compose_l0(b[1], b[2], b[3], width); + if(y+0<(unsigned)height) vertical_compose_h0(b[0], b[1], b[2], width); + + if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); + if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); + + for (i = 0; i < 4; i++) + cs->b[i] = b[i+2]; + cs->y += 2; +} + + +static void spatial_compose97i_init2(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) +{ + cs->b[0] = buffer + mirror(-3-1, height-1)*stride; + cs->b[1] = buffer + mirror(-3 , height-1)*stride; + cs->b[2] = buffer + mirror(-3+1, height-1)*stride; + cs->b[3] = buffer + mirror(-3+2, height-1)*stride; + cs->y = -3; +} + +static void spatial_compose53i_init2(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) +{ + cs->b[0] = buffer + mirror(-1-1, height-1)*stride; + cs->b[1] = buffer + mirror(-1 , height-1)*stride; + cs->y = -1; +} + +static void spatial_compose_dd97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) +{ + cs->b[0] = buffer + av_clip(-5-1, 0, height-2)*stride; + cs->b[1] = buffer + av_clip(-5 , 1, height-1)*stride; + cs->b[2] = buffer + av_clip(-5+1, 0, height-2)*stride; + cs->b[3] = buffer + av_clip(-5+2, 1, height-1)*stride; + cs->b[4] = buffer + av_clip(-5+3, 0, height-2)*stride; + cs->b[5] = buffer + av_clip(-5+4, 1, height-1)*stride; + cs->y = -5; +} + +static void spatial_compose_dd137i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) +{ + cs->b[0] = buffer + av_clip(-5-1, 0, height-2)*stride; + cs->b[1] = buffer + av_clip(-5 , 1, height-1)*stride; + cs->b[2] = buffer + av_clip(-5+1, 0, height-2)*stride; + cs->b[3] = buffer + av_clip(-5+2, 1, height-1)*stride; + cs->b[4] = buffer + av_clip(-5+3, 0, height-2)*stride; + cs->b[5] = buffer + av_clip(-5+4, 1, height-1)*stride; + cs->b[6] = buffer + av_clip(-5+5, 0, height-2)*stride; + cs->b[7] = buffer + av_clip(-5+6, 1, height-1)*stride; + cs->y = -5; +} + +int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height, + int stride, enum dwt_type type, int decomposition_count, + IDWTELEM *temp) +{ + int level; + + d->buffer = buffer; + d->width = width; + d->height = height; + d->stride = stride; + d->decomposition_count = decomposition_count; + d->temp = temp + 8; + + for(level=decomposition_count-1; level>=0; level--){ + int hl = height >> level; + int stride_l = stride << level; + + switch(type){ + case DWT_DIRAC_DD9_7: + spatial_compose_dd97i_init(d->cs+level, buffer, hl, stride_l); + break; + case DWT_DIRAC_LEGALL5_3: + spatial_compose53i_init2(d->cs+level, buffer, hl, stride_l); + break; + case DWT_DIRAC_DD13_7: + spatial_compose_dd137i_init(d->cs+level, buffer, hl, stride_l); + break; + case DWT_DIRAC_HAAR0: + case DWT_DIRAC_HAAR1: + d->cs[level].y = 1; + break; + case DWT_DIRAC_DAUB9_7: + spatial_compose97i_init2(d->cs+level, buffer, hl, stride_l); + break; + default: + d->cs[level].y = 0; + break; + } + } + + switch (type) { + case DWT_DIRAC_DD9_7: + d->spatial_compose = spatial_compose_dd97i_dy; + d->vertical_compose_l0 = (void*)vertical_compose53iL0; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0; + d->horizontal_compose = horizontal_compose_dd97i; + d->support = 7; + break; + case DWT_DIRAC_LEGALL5_3: + d->spatial_compose = spatial_compose_dirac53i_dy; + d->vertical_compose_l0 = (void*)vertical_compose53iL0; + d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0; + d->horizontal_compose = horizontal_compose_dirac53i; + d->support = 3; + break; + case DWT_DIRAC_DD13_7: + d->spatial_compose = spatial_compose_dd137i_dy; + d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0; + d->horizontal_compose = horizontal_compose_dd137i; + d->support = 7; + break; + case DWT_DIRAC_HAAR0: + case DWT_DIRAC_HAAR1: + d->spatial_compose = spatial_compose_haari_dy; + d->vertical_compose = (void*)vertical_compose_haar; + if (type == DWT_DIRAC_HAAR0) + d->horizontal_compose = horizontal_compose_haar0i; + else + d->horizontal_compose = horizontal_compose_haar1i; + d->support = 1; + break; + case DWT_DIRAC_FIDELITY: + d->spatial_compose = spatial_compose_fidelity; + d->vertical_compose_l0 = (void*)vertical_compose_fidelityiL0; + d->vertical_compose_h0 = (void*)vertical_compose_fidelityiH0; + d->horizontal_compose = horizontal_compose_fidelityi; + break; + case DWT_DIRAC_DAUB9_7: + d->spatial_compose = spatial_compose_daub97i_dy; + d->vertical_compose_l0 = (void*)vertical_compose_daub97iL0; + d->vertical_compose_h0 = (void*)vertical_compose_daub97iH0; + d->vertical_compose_l1 = (void*)vertical_compose_daub97iL1; + d->vertical_compose_h1 = (void*)vertical_compose_daub97iH1; + d->horizontal_compose = horizontal_compose_daub97i; + d->support = 5; + break; + default: + av_log(NULL, AV_LOG_ERROR, "Unknown wavelet type %d\n", type); + return -1; + } + + if (HAVE_MMX) ff_spatial_idwt_init_mmx(d, type); + + return 0; +} + +void ff_spatial_idwt_slice2(DWTContext *d, int y) +{ + int level, support = d->support; + + for (level = d->decomposition_count-1; level >= 0; level--) { + int wl = d->width >> level; + int hl = d->height >> level; + int stride_l = d->stride << level; + + while (d->cs[level].y <= FFMIN((y>>level)+support, hl)) + d->spatial_compose(d, level, wl, hl, stride_l); + } +} + +int ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, int stride, + enum dwt_type type, int decomposition_count, IDWTELEM *temp) +{ + DWTContext d; + int y; + + if (ff_spatial_idwt_init2(&d, buffer, width, height, stride, type, decomposition_count, temp)) + return -1; + + for (y = 0; y < d.height; y += 4) + ff_spatial_idwt_slice2(&d, y); + + return 0; +} diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h new file mode 100644 index 0000000000..9514e9575b --- /dev/null +++ b/libavcodec/dirac_dwt.h @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2004-2010 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_DIRAC_DWT_H +#define AVCODEC_DIRAC_DWT_H + +#include + +typedef int DWTELEM; +typedef short IDWTELEM; + +#define MAX_DWT_SUPPORT 8 +#define MAX_DECOMPOSITIONS 8 + +typedef struct DWTCompose { + IDWTELEM *b[MAX_DWT_SUPPORT]; + int y; +} DWTCompose; + +struct DWTContext; + +// Possible prototypes for vertical_compose functions +typedef void (*vertical_compose_2tap)(IDWTELEM *b0, IDWTELEM *b1, int width); +typedef void (*vertical_compose_3tap)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); +typedef void (*vertical_compose_5tap)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width); +typedef void (*vertical_compose_9tap)(IDWTELEM *dst, IDWTELEM *b[8], int width); + +typedef struct DWTContext { + IDWTELEM *buffer; + IDWTELEM *temp; + int width; + int height; + int stride; + int decomposition_count; + int support; + + void (*spatial_compose)(struct DWTContext *cs, int level, int width, int height, int stride); + void (*vertical_compose_l0)(void); + void (*vertical_compose_h0)(void); + void (*vertical_compose_l1)(void); + void (*vertical_compose_h1)(void); + void (*vertical_compose)(void); ///< one set of lowpass and highpass combined + void (*horizontal_compose)(IDWTELEM *b, IDWTELEM *tmp, int width); + + DWTCompose cs[MAX_DECOMPOSITIONS]; +} DWTContext; + +enum dwt_type { + DWT_SNOW_DAUB9_7, + DWT_SNOW_LEGALL5_3, + DWT_DIRAC_DD9_7, + DWT_DIRAC_LEGALL5_3, + DWT_DIRAC_DD13_7, + DWT_DIRAC_HAAR0, + DWT_DIRAC_HAAR1, + DWT_DIRAC_FIDELITY, + DWT_DIRAC_DAUB9_7, + DWT_NUM_TYPES +}; + +// -1 if an error occurred, e.g. the dwt_type isn't recognized +int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height, + int stride, enum dwt_type type, int decomposition_count, + IDWTELEM *temp); + +int ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, int stride, + enum dwt_type type, int decomposition_count, IDWTELEM *temp); + +void ff_spatial_idwt_slice2(DWTContext *d, int y); + +// shared stuff for simd optimiztions +#define COMPOSE_53iL0(b0, b1, b2)\ + (b1 - ((b0 + b2 + 2) >> 2)) + +#define COMPOSE_DIRAC53iH0(b0, b1, b2)\ + (b1 + ((b0 + b2 + 1) >> 1)) + +#define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\ + (b2 + ((-b0 + 9*b1 + 9*b3 - b4 + 8) >> 4)) + +#define COMPOSE_DD137iL0(b0, b1, b2, b3, b4)\ + (b2 - ((-b0 + 9*b1 + 9*b3 - b4 + 16) >> 5)) + +#define COMPOSE_HAARiL0(b0, b1)\ + (b0 - ((b1 + 1) >> 1)) + +#define COMPOSE_HAARiH0(b0, b1)\ + (b0 + b1) + +#define COMPOSE_FIDELITYiL0(b0, b1, b2, b3, b4, b5, b6, b7, b8)\ + (b4 - ((-8*(b0+b8) + 21*(b1+b7) - 46*(b2+b6) + 161*(b3+b5) + 128) >> 8)) + +#define COMPOSE_FIDELITYiH0(b0, b1, b2, b3, b4, b5, b6, b7, b8)\ + (b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8)) + +#define COMPOSE_DAUB97iL1(b0, b1, b2)\ + (b1 - ((1817*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iH1(b0, b1, b2)\ + (b1 - (( 113*(b0 + b2) + 64) >> 7)) + +#define COMPOSE_DAUB97iL0(b0, b1, b2)\ + (b1 + (( 217*(b0 + b2) + 2048) >> 12)) + +#define COMPOSE_DAUB97iH0(b0, b1, b2)\ + (b1 + ((6497*(b0 + b2) + 2048) >> 12)) + + +#endif /* AVCODEC_DWT_H */ diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index c431b97019..a9191cd9cd 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -34,7 +34,7 @@ #include "golomb.h" #include "dirac_arith.h" #include "mpeg12data.h" -#include "dwt.h" +#include "dirac_dwt.h" #include "dirac.h" #include "diracdsp.h" diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c deleted file mode 100644 index d36d25d1a6..0000000000 --- a/libavcodec/dwt.c +++ /dev/null @@ -1,1402 +0,0 @@ -/* - * Copyright (C) 2004-2010 Michael Niedermayer - * Copyright (C) 2008 David Conrad - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavutil/attributes.h" -#include "libavutil/avassert.h" -#include "libavutil/common.h" -#include "dsputil.h" -#include "dwt.h" -#include "libavcodec/x86/dwt.h" - -int ff_slice_buffer_init(slice_buffer *buf, int line_count, - int max_allocated_lines, int line_width, - IDWTELEM *base_buffer) -{ - int i; - - buf->base_buffer = base_buffer; - buf->line_count = line_count; - buf->line_width = line_width; - buf->data_count = max_allocated_lines; - buf->line = av_mallocz(sizeof(IDWTELEM *) * line_count); - if (!buf->line) - return AVERROR(ENOMEM); - buf->data_stack = av_malloc(sizeof(IDWTELEM *) * max_allocated_lines); - if (!buf->data_stack) { - av_freep(&buf->line); - return AVERROR(ENOMEM); - } - - for (i = 0; i < max_allocated_lines; i++) { - buf->data_stack[i] = av_malloc(sizeof(IDWTELEM) * line_width); - if (!buf->data_stack[i]) { - for (i--; i >=0; i--) - av_freep(&buf->data_stack[i]); - av_freep(&buf->data_stack); - av_freep(&buf->line); - return AVERROR(ENOMEM); - } - } - - buf->data_stack_top = max_allocated_lines - 1; - return 0; -} - -IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line) -{ - IDWTELEM *buffer; - - av_assert0(buf->data_stack_top >= 0); -// av_assert1(!buf->line[line]); - if (buf->line[line]) - return buf->line[line]; - - buffer = buf->data_stack[buf->data_stack_top]; - buf->data_stack_top--; - buf->line[line] = buffer; - - return buffer; -} - -void ff_slice_buffer_release(slice_buffer *buf, int line) -{ - IDWTELEM *buffer; - - av_assert1(line >= 0 && line < buf->line_count); - av_assert1(buf->line[line]); - - buffer = buf->line[line]; - buf->data_stack_top++; - buf->data_stack[buf->data_stack_top] = buffer; - buf->line[line] = NULL; -} - -void ff_slice_buffer_flush(slice_buffer *buf) -{ - int i; - for (i = 0; i < buf->line_count; i++) - if (buf->line[i]) - ff_slice_buffer_release(buf, i); -} - -void ff_slice_buffer_destroy(slice_buffer *buf) -{ - int i; - ff_slice_buffer_flush(buf); - - for (i = buf->data_count - 1; i >= 0; i--) - av_freep(&buf->data_stack[i]); - av_freep(&buf->data_stack); - av_freep(&buf->line); -} - -static inline int mirror(int v, int m) -{ - while ((unsigned)v > (unsigned)m) { - v = -v; - if (v < 0) - v += 2 * m; - } - return v; -} - -static av_always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, - int dst_step, int src_step, int ref_step, - int width, int mul, int add, int shift, - int highpass, int inverse) -{ - const int mirror_left = !highpass; - const int mirror_right = (width & 1) ^ highpass; - const int w = (width >> 1) - 1 + (highpass & width); - int i; - -#define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref))) - if (mirror_left) { - dst[0] = LIFT(src[0], ((mul * 2 * ref[0] + add) >> shift), inverse); - dst += dst_step; - src += src_step; - } - - for (i = 0; i < w; i++) - dst[i * dst_step] = LIFT(src[i * src_step], - ((mul * (ref[i * ref_step] + - ref[(i + 1) * ref_step]) + - add) >> shift), - inverse); - - if (mirror_right) - dst[w * dst_step] = LIFT(src[w * src_step], - ((mul * 2 * ref[w * ref_step] + add) >> shift), - inverse); -} - -static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, - int dst_step, int src_step, int ref_step, - int width, int mul, int add, int shift, - int highpass, int inverse) -{ - const int mirror_left = !highpass; - const int mirror_right = (width & 1) ^ highpass; - const int w = (width >> 1) - 1 + (highpass & width); - int i; - - av_assert1(shift == 4); -#define LIFTS(src, ref, inv) \ - ((inv) ? (src) + (((ref) + 4 * (src)) >> shift) \ - : -((-16 * (src) + (ref) + add / \ - 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23))) - if (mirror_left) { - dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse); - dst += dst_step; - src += src_step; - } - - for (i = 0; i < w; i++) - dst[i * dst_step] = LIFTS(src[i * src_step], - mul * (ref[i * ref_step] + - ref[(i + 1) * ref_step]) + add, - inverse); - - if (mirror_right) - dst[w * dst_step] = LIFTS(src[w * src_step], - mul * 2 * ref[w * ref_step] + add, - inverse); -} - -static void horizontal_decompose53i(DWTELEM *b, DWTELEM *temp, int width) -{ - const int width2 = width >> 1; - int x; - const int w2 = (width + 1) >> 1; - - for (x = 0; x < width2; x++) { - temp[x] = b[2 * x]; - temp[x + w2] = b[2 * x + 1]; - } - if (width & 1) - temp[x] = b[2 * x]; - lift(b + w2, temp + w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0); - lift(b, temp, b + w2, 1, 1, 1, width, 1, 2, 2, 0, 0); -} - -static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] -= (b0[i] + b2[i]) >> 1; -} - -static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] += (b0[i] + b2[i] + 2) >> 2; -} - -static void spatial_decompose53i(DWTELEM *buffer, DWTELEM *temp, - int width, int height, int stride) -{ - int y; - DWTELEM *b0 = buffer + mirror(-2 - 1, height - 1) * stride; - DWTELEM *b1 = buffer + mirror(-2, height - 1) * stride; - - for (y = -2; y < height; y += 2) { - DWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; - DWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride; - - if (y + 1 < (unsigned)height) - horizontal_decompose53i(b2, temp, width); - if (y + 2 < (unsigned)height) - horizontal_decompose53i(b3, temp, width); - - if (y + 1 < (unsigned)height) - vertical_decompose53iH0(b1, b2, b3, width); - if (y + 0 < (unsigned)height) - vertical_decompose53iL0(b0, b1, b2, width); - - b0 = b2; - b1 = b3; - } -} - -static void horizontal_decompose97i(DWTELEM *b, DWTELEM *temp, int width) -{ - const int w2 = (width + 1) >> 1; - - lift(temp + w2, b + 1, b, 1, 2, 2, width, W_AM, W_AO, W_AS, 1, 1); - liftS(temp, b, temp + w2, 1, 2, 1, width, W_BM, W_BO, W_BS, 0, 0); - lift(b + w2, temp + w2, temp, 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0); - lift(b, temp, b + w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 0); -} - -static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] -= (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; -} - -static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] += (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; -} - -static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] = (16 * 4 * b1[i] - 4 * (b0[i] + b2[i]) + W_BO * 5 + (5 << 27)) / - (5 * 16) - (1 << 23); -} - -static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] += (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; -} - -static void spatial_decompose97i(DWTELEM *buffer, DWTELEM *temp, - int width, int height, int stride) -{ - int y; - DWTELEM *b0 = buffer + mirror(-4 - 1, height - 1) * stride; - DWTELEM *b1 = buffer + mirror(-4, height - 1) * stride; - DWTELEM *b2 = buffer + mirror(-4 + 1, height - 1) * stride; - DWTELEM *b3 = buffer + mirror(-4 + 2, height - 1) * stride; - - for (y = -4; y < height; y += 2) { - DWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; - DWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride; - - if (y + 3 < (unsigned)height) - horizontal_decompose97i(b4, temp, width); - if (y + 4 < (unsigned)height) - horizontal_decompose97i(b5, temp, width); - - if (y + 3 < (unsigned)height) - vertical_decompose97iH0(b3, b4, b5, width); - if (y + 2 < (unsigned)height) - vertical_decompose97iL0(b2, b3, b4, width); - if (y + 1 < (unsigned)height) - vertical_decompose97iH1(b1, b2, b3, width); - if (y + 0 < (unsigned)height) - vertical_decompose97iL1(b0, b1, b2, width); - - b0 = b2; - b1 = b3; - b2 = b4; - b3 = b5; - } -} - -void ff_spatial_dwt(DWTELEM *buffer, DWTELEM *temp, int width, int height, - int stride, int type, int decomposition_count) -{ - int level; - - for (level = 0; level < decomposition_count; level++) { - switch (type) { - case DWT_97: - spatial_decompose97i(buffer, temp, - width >> level, height >> level, - stride << level); - break; - case DWT_53: - spatial_decompose53i(buffer, temp, - width >> level, height >> level, - stride << level); - break; - } - } -} - -static void horizontal_compose53i(IDWTELEM *b, IDWTELEM *temp, int width) -{ - const int width2 = width >> 1; - const int w2 = (width + 1) >> 1; - int x; - - for (x = 0; x < width2; x++) { - temp[2 * x] = b[x]; - temp[2 * x + 1] = b[x + w2]; - } - if (width & 1) - temp[2 * x] = b[x]; - - b[0] = temp[0] - ((temp[1] + 1) >> 1); - for (x = 2; x < width - 1; x += 2) { - b[x] = temp[x] - ((temp[x - 1] + temp[x + 1] + 2) >> 2); - b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1); - } - if (width & 1) { - b[x] = temp[x] - ((temp[x - 1] + 1) >> 1); - b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1); - } else - b[x - 1] = temp[x - 1] + b[x - 2]; -} - -static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] += (b0[i] + b2[i]) >> 1; -} - -static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] -= (b0[i] + b2[i] + 2) >> 2; -} - -static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer *sb, - int height, int stride_line) -{ - cs->b0 = slice_buffer_get_line(sb, - mirror(-1 - 1, height - 1) * stride_line); - cs->b1 = slice_buffer_get_line(sb, mirror(-1, height - 1) * stride_line); - cs->y = -1; -} - -static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, - int height, int stride) -{ - cs->b0 = buffer + mirror(-1 - 1, height - 1) * stride; - cs->b1 = buffer + mirror(-1, height - 1) * stride; - cs->y = -1; -} - -static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer *sb, - IDWTELEM *temp, - int width, int height, - int stride_line) -{ - int y = cs->y; - - IDWTELEM *b0 = cs->b0; - IDWTELEM *b1 = cs->b1; - IDWTELEM *b2 = slice_buffer_get_line(sb, - mirror(y + 1, height - 1) * - stride_line); - IDWTELEM *b3 = slice_buffer_get_line(sb, - mirror(y + 2, height - 1) * - stride_line); - - if (y + 1 < (unsigned)height && y < (unsigned)height) { - int x; - - for (x = 0; x < width; x++) { - b2[x] -= (b1[x] + b3[x] + 2) >> 2; - b1[x] += (b0[x] + b2[x]) >> 1; - } - } else { - if (y + 1 < (unsigned)height) - vertical_compose53iL0(b1, b2, b3, width); - if (y + 0 < (unsigned)height) - vertical_compose53iH0(b0, b1, b2, width); - } - - if (y - 1 < (unsigned)height) - horizontal_compose53i(b0, temp, width); - if (y + 0 < (unsigned)height) - horizontal_compose53i(b1, temp, width); - - cs->b0 = b2; - cs->b1 = b3; - cs->y += 2; -} - -static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, - IDWTELEM *temp, int width, int height, - int stride) -{ - int y = cs->y; - IDWTELEM *b0 = cs->b0; - IDWTELEM *b1 = cs->b1; - IDWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; - IDWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride; - - if (y + 1 < (unsigned)height) - vertical_compose53iL0(b1, b2, b3, width); - if (y + 0 < (unsigned)height) - vertical_compose53iH0(b0, b1, b2, width); - - if (y - 1 < (unsigned)height) - horizontal_compose53i(b0, temp, width); - if (y + 0 < (unsigned)height) - horizontal_compose53i(b1, temp, width); - - cs->b0 = b2; - cs->b1 = b3; - cs->y += 2; -} - -void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width) -{ - const int w2 = (width + 1) >> 1; - int x; - - temp[0] = b[0] - ((3 * b[w2] + 2) >> 2); - for (x = 1; x < (width >> 1); x++) { - temp[2 * x] = b[x] - ((3 * (b[x + w2 - 1] + b[x + w2]) + 4) >> 3); - temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x]; - } - if (width & 1) { - temp[2 * x] = b[x] - ((3 * b[x + w2 - 1] + 2) >> 2); - temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x]; - } else - temp[2 * x - 1] = b[x + w2 - 1] - 2 * temp[2 * x - 2]; - - b[0] = temp[0] + ((2 * temp[0] + temp[1] + 4) >> 3); - for (x = 2; x < width - 1; x += 2) { - b[x] = temp[x] + ((4 * temp[x] + temp[x - 1] + temp[x + 1] + 8) >> 4); - b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1); - } - if (width & 1) { - b[x] = temp[x] + ((2 * temp[x] + temp[x - 1] + 4) >> 3); - b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1); - } else - b[x - 1] = temp[x - 1] + 3 * b[x - 2]; -} - -static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; -} - -static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] -= (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; -} - -static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] += (W_BM * (b0[i] + b2[i]) + 4 * b1[i] + W_BO) >> W_BS; -} - -static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - int width) -{ - int i; - - for (i = 0; i < width; i++) - b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; -} - -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width) -{ - int i; - - for (i = 0; i < width; i++) { - b4[i] -= (W_DM * (b3[i] + b5[i]) + W_DO) >> W_DS; - b3[i] -= (W_CM * (b2[i] + b4[i]) + W_CO) >> W_CS; - b2[i] += (W_BM * (b1[i] + b3[i]) + 4 * b2[i] + W_BO) >> W_BS; - b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; - } -} - -static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer *sb, - int height, int stride_line) -{ - cs->b0 = slice_buffer_get_line(sb, mirror(-3 - 1, height - 1) * stride_line); - cs->b1 = slice_buffer_get_line(sb, mirror(-3, height - 1) * stride_line); - cs->b2 = slice_buffer_get_line(sb, mirror(-3 + 1, height - 1) * stride_line); - cs->b3 = slice_buffer_get_line(sb, mirror(-3 + 2, height - 1) * stride_line); - cs->y = -3; -} - -static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, - int stride) -{ - cs->b0 = buffer + mirror(-3 - 1, height - 1) * stride; - cs->b1 = buffer + mirror(-3, height - 1) * stride; - cs->b2 = buffer + mirror(-3 + 1, height - 1) * stride; - cs->b3 = buffer + mirror(-3 + 2, height - 1) * stride; - cs->y = -3; -} - -static void spatial_compose97i_dy_buffered(DWTContext *dsp, DWTCompose *cs, - slice_buffer * sb, IDWTELEM *temp, - int width, int height, - int stride_line) -{ - int y = cs->y; - - IDWTELEM *b0 = cs->b0; - IDWTELEM *b1 = cs->b1; - IDWTELEM *b2 = cs->b2; - IDWTELEM *b3 = cs->b3; - IDWTELEM *b4 = slice_buffer_get_line(sb, - mirror(y + 3, height - 1) * - stride_line); - IDWTELEM *b5 = slice_buffer_get_line(sb, - mirror(y + 4, height - 1) * - stride_line); - - if (y > 0 && y + 4 < height) { - dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width); - } else { - if (y + 3 < (unsigned)height) - vertical_compose97iL1(b3, b4, b5, width); - if (y + 2 < (unsigned)height) - vertical_compose97iH1(b2, b3, b4, width); - if (y + 1 < (unsigned)height) - vertical_compose97iL0(b1, b2, b3, width); - if (y + 0 < (unsigned)height) - vertical_compose97iH0(b0, b1, b2, width); - } - - if (y - 1 < (unsigned)height) - dsp->horizontal_compose97i(b0, temp, width); - if (y + 0 < (unsigned)height) - dsp->horizontal_compose97i(b1, temp, width); - - cs->b0 = b2; - cs->b1 = b3; - cs->b2 = b4; - cs->b3 = b5; - cs->y += 2; -} - -static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, - IDWTELEM *temp, int width, int height, - int stride) -{ - int y = cs->y; - IDWTELEM *b0 = cs->b0; - IDWTELEM *b1 = cs->b1; - IDWTELEM *b2 = cs->b2; - IDWTELEM *b3 = cs->b3; - IDWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; - IDWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride; - - if (y + 3 < (unsigned)height) - vertical_compose97iL1(b3, b4, b5, width); - if (y + 2 < (unsigned)height) - vertical_compose97iH1(b2, b3, b4, width); - if (y + 1 < (unsigned)height) - vertical_compose97iL0(b1, b2, b3, width); - if (y + 0 < (unsigned)height) - vertical_compose97iH0(b0, b1, b2, width); - - if (y - 1 < (unsigned)height) - ff_snow_horizontal_compose97i(b0, temp, width); - if (y + 0 < (unsigned)height) - ff_snow_horizontal_compose97i(b1, temp, width); - - cs->b0 = b2; - cs->b1 = b3; - cs->b2 = b4; - cs->b3 = b5; - cs->y += 2; -} - -void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, - int height, int stride_line, int type, - int decomposition_count) -{ - int level; - for (level = decomposition_count - 1; level >= 0; level--) { - switch (type) { - case DWT_97: - spatial_compose97i_buffered_init(cs + level, sb, height >> level, - stride_line << level); - break; - case DWT_53: - spatial_compose53i_buffered_init(cs + level, sb, height >> level, - stride_line << level); - break; - } - } -} - -void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, - slice_buffer *slice_buf, IDWTELEM *temp, - int width, int height, int stride_line, - int type, int decomposition_count, int y) -{ - const int support = type == 1 ? 3 : 5; - int level; - if (type == 2) - return; - - for (level = decomposition_count - 1; level >= 0; level--) - while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { - switch (type) { - case DWT_97: - spatial_compose97i_dy_buffered(dsp, cs + level, slice_buf, temp, - width >> level, - height >> level, - stride_line << level); - break; - case DWT_53: - spatial_compose53i_dy_buffered(cs + level, slice_buf, temp, - width >> level, - height >> level, - stride_line << level); - break; - } - } -} - -static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, - int height, int stride, int type, - int decomposition_count) -{ - int level; - for (level = decomposition_count - 1; level >= 0; level--) { - switch (type) { - case DWT_97: - spatial_compose97i_init(cs + level, buffer, height >> level, - stride << level); - break; - case DWT_53: - spatial_compose53i_init(cs + level, buffer, height >> level, - stride << level); - break; - } - } -} - -static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, - IDWTELEM *temp, int width, int height, - int stride, int type, - int decomposition_count, int y) -{ - const int support = type == 1 ? 3 : 5; - int level; - if (type == 2) - return; - - for (level = decomposition_count - 1; level >= 0; level--) - while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { - switch (type) { - case DWT_97: - spatial_compose97i_dy(cs + level, buffer, temp, width >> level, - height >> level, stride << level); - break; - case DWT_53: - spatial_compose53i_dy(cs + level, buffer, temp, width >> level, - height >> level, stride << level); - break; - } - } -} - -void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, - int stride, int type, int decomposition_count) -{ - DWTCompose cs[MAX_DECOMPOSITIONS]; - int y; - ff_spatial_idwt_init(cs, buffer, width, height, stride, type, - decomposition_count); - for (y = 0; y < height; y += 4) - ff_spatial_idwt_slice(cs, buffer, temp, width, height, stride, type, - decomposition_count, y); -} - -static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, - int w, int h, int type) -{ - int s, i, j; - const int dec_count = w == 8 ? 3 : 4; - int tmp[32 * 32], tmp2[32]; - int level, ori; - static const int scale[2][2][4][4] = { - { - { // 9/7 8x8 dec=3 - { 268, 239, 239, 213 }, - { 0, 224, 224, 152 }, - { 0, 135, 135, 110 }, - }, - { // 9/7 16x16 or 32x32 dec=4 - { 344, 310, 310, 280 }, - { 0, 320, 320, 228 }, - { 0, 175, 175, 136 }, - { 0, 129, 129, 102 }, - } - }, - { - { // 5/3 8x8 dec=3 - { 275, 245, 245, 218 }, - { 0, 230, 230, 156 }, - { 0, 138, 138, 113 }, - }, - { // 5/3 16x16 or 32x32 dec=4 - { 352, 317, 317, 286 }, - { 0, 328, 328, 233 }, - { 0, 180, 180, 140 }, - { 0, 132, 132, 105 }, - } - } - }; - - for (i = 0; i < h; i++) { - for (j = 0; j < w; j += 4) { - tmp[32 * i + j + 0] = (pix1[j + 0] - pix2[j + 0]) << 4; - tmp[32 * i + j + 1] = (pix1[j + 1] - pix2[j + 1]) << 4; - tmp[32 * i + j + 2] = (pix1[j + 2] - pix2[j + 2]) << 4; - tmp[32 * i + j + 3] = (pix1[j + 3] - pix2[j + 3]) << 4; - } - pix1 += line_size; - pix2 += line_size; - } - - ff_spatial_dwt(tmp, tmp2, w, h, 32, type, dec_count); - - s = 0; - av_assert1(w == h); - for (level = 0; level < dec_count; level++) - for (ori = level ? 1 : 0; ori < 4; ori++) { - int size = w >> (dec_count - level); - int sx = (ori & 1) ? size : 0; - int stride = 32 << (dec_count - level); - int sy = (ori & 2) ? stride >> 1 : 0; - - for (i = 0; i < size; i++) - for (j = 0; j < size; j++) { - int v = tmp[sx + sy + i * stride + j] * - scale[type][dec_count - 3][level][ori]; - s += FFABS(v); - } - } - av_assert1(s >= 0); - return s >> 9; -} - -static int w53_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) -{ - return w_c(v, pix1, pix2, line_size, 8, h, 1); -} - -static int w97_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) -{ - return w_c(v, pix1, pix2, line_size, 8, h, 0); -} - -static int w53_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) -{ - return w_c(v, pix1, pix2, line_size, 16, h, 1); -} - -static int w97_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) -{ - return w_c(v, pix1, pix2, line_size, 16, h, 0); -} - -int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) -{ - return w_c(v, pix1, pix2, line_size, 32, h, 1); -} - -int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) -{ - return w_c(v, pix1, pix2, line_size, 32, h, 0); -} - -void ff_dsputil_init_dwt(DSPContext *c) -{ - c->w53[0] = w53_16_c; - c->w53[1] = w53_8_c; - c->w97[0] = w97_16_c; - c->w97[1] = w97_8_c; -} - -void ff_dwt_init(DWTContext *c) -{ - c->vertical_compose97i = ff_snow_vertical_compose97i; - c->horizontal_compose97i = ff_snow_horizontal_compose97i; - c->inner_add_yblock = ff_snow_inner_add_yblock; - - if (HAVE_MMX) - ff_dwt_init_x86(c); -} - - -static av_always_inline -void interleave(IDWTELEM *dst, IDWTELEM *src0, IDWTELEM *src1, int w2, int add, int shift) -{ - int i; - for (i = 0; i < w2; i++) { - dst[2*i ] = (src0[i] + add) >> shift; - dst[2*i+1] = (src1[i] + add) >> shift; - } -} - -static void horizontal_compose_dirac53i(IDWTELEM *b, IDWTELEM *temp, int w) -{ - const int w2 = w >> 1; - int x; - - temp[0] = COMPOSE_53iL0(b[w2], b[0], b[w2]); - for (x = 1; x < w2; x++) { - temp[x ] = COMPOSE_53iL0 (b[x+w2-1], b[x ], b[x+w2]); - temp[x+w2-1] = COMPOSE_DIRAC53iH0(temp[x-1], b[x+w2-1], temp[x]); - } - temp[w-1] = COMPOSE_DIRAC53iH0(temp[w2-1], b[w-1], temp[w2-1]); - - interleave(b, temp, temp+w2, w2, 1, 1); -} - -static void horizontal_compose_dd97i(IDWTELEM *b, IDWTELEM *tmp, int w) -{ - const int w2 = w >> 1; - int x; - - tmp[0] = COMPOSE_53iL0(b[w2], b[0], b[w2]); - for (x = 1; x < w2; x++) - tmp[x] = COMPOSE_53iL0(b[x+w2-1], b[x], b[x+w2]); - - // extend the edges - tmp[-1] = tmp[0]; - tmp[w2+1] = tmp[w2] = tmp[w2-1]; - - for (x = 0; x < w2; x++) { - b[2*x ] = (tmp[x] + 1)>>1; - b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; - } -} - -static void horizontal_compose_dd137i(IDWTELEM *b, IDWTELEM *tmp, int w) -{ - const int w2 = w >> 1; - int x; - - tmp[0] = COMPOSE_DD137iL0(b[w2], b[w2], b[0], b[w2 ], b[w2+1]); - tmp[1] = COMPOSE_DD137iL0(b[w2], b[w2], b[1], b[w2+1], b[w2+2]); - for (x = 2; x < w2-1; x++) - tmp[x] = COMPOSE_DD137iL0(b[x+w2-2], b[x+w2-1], b[x], b[x+w2], b[x+w2+1]); - tmp[w2-1] = COMPOSE_DD137iL0(b[w-3], b[w-2], b[w2-1], b[w-1], b[w-1]); - - // extend the edges - tmp[-1] = tmp[0]; - tmp[w2+1] = tmp[w2] = tmp[w2-1]; - - for (x = 0; x < w2; x++) { - b[2*x ] = (tmp[x] + 1)>>1; - b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; - } -} - -static av_always_inline -void horizontal_compose_haari(IDWTELEM *b, IDWTELEM *temp, int w, int shift) -{ - const int w2 = w >> 1; - int x; - - for (x = 0; x < w2; x++) { - temp[x ] = COMPOSE_HAARiL0(b[x ], b[x+w2]); - temp[x+w2] = COMPOSE_HAARiH0(b[x+w2], temp[x]); - } - - interleave(b, temp, temp+w2, w2, shift, shift); -} - -static void horizontal_compose_haar0i(IDWTELEM *b, IDWTELEM *temp, int w) -{ - horizontal_compose_haari(b, temp, w, 0); -} - -static void horizontal_compose_haar1i(IDWTELEM *b, IDWTELEM *temp, int w) -{ - horizontal_compose_haari(b, temp, w, 1); -} - -static void horizontal_compose_fidelityi(IDWTELEM *b, IDWTELEM *tmp, int w) -{ - const int w2 = w >> 1; - int i, x; - IDWTELEM v[8]; - - for (x = 0; x < w2; x++) { - for (i = 0; i < 8; i++) - v[i] = b[av_clip(x-3+i, 0, w2-1)]; - tmp[x] = COMPOSE_FIDELITYiH0(v[0], v[1], v[2], v[3], b[x+w2], v[4], v[5], v[6], v[7]); - } - - for (x = 0; x < w2; x++) { - for (i = 0; i < 8; i++) - v[i] = tmp[av_clip(x-4+i, 0, w2-1)]; - tmp[x+w2] = COMPOSE_FIDELITYiL0(v[0], v[1], v[2], v[3], b[x], v[4], v[5], v[6], v[7]); - } - - interleave(b, tmp+w2, tmp, w2, 0, 0); -} - -static void horizontal_compose_daub97i(IDWTELEM *b, IDWTELEM *temp, int w) -{ - const int w2 = w >> 1; - int x, b0, b1, b2; - - temp[0] = COMPOSE_DAUB97iL1(b[w2], b[0], b[w2]); - for (x = 1; x < w2; x++) { - temp[x ] = COMPOSE_DAUB97iL1(b[x+w2-1], b[x ], b[x+w2]); - temp[x+w2-1] = COMPOSE_DAUB97iH1(temp[x-1], b[x+w2-1], temp[x]); - } - temp[w-1] = COMPOSE_DAUB97iH1(temp[w2-1], b[w-1], temp[w2-1]); - - // second stage combined with interleave and shift - b0 = b2 = COMPOSE_DAUB97iL0(temp[w2], temp[0], temp[w2]); - b[0] = (b0 + 1) >> 1; - for (x = 1; x < w2; x++) { - b2 = COMPOSE_DAUB97iL0(temp[x+w2-1], temp[x ], temp[x+w2]); - b1 = COMPOSE_DAUB97iH0( b0, temp[x+w2-1], b2 ); - b[2*x-1] = (b1 + 1) >> 1; - b[2*x ] = (b2 + 1) >> 1; - b0 = b2; - } - b[w-1] = (COMPOSE_DAUB97iH0(b2, temp[w-1], b2) + 1) >> 1; -} - -static void vertical_compose_dirac53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width) -{ - int i; - - for(i=0; ivertical_compose_l0; - vertical_compose_5tap vertical_compose_h0 = (void*)d->vertical_compose_h0; - DWTCompose *cs = d->cs + level; - - int i, y = cs->y; - IDWTELEM *b[8]; - for (i = 0; i < 6; i++) - b[i] = cs->b[i]; - b[6] = d->buffer + av_clip(y+5, 0, height-2)*stride; - b[7] = d->buffer + av_clip(y+6, 1, height-1)*stride; - - if(y+5<(unsigned)height) vertical_compose_l0( b[5], b[6], b[7], width); - if(y+1<(unsigned)height) vertical_compose_h0(b[0], b[2], b[3], b[4], b[6], width); - - if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); - if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); - - for (i = 0; i < 6; i++) - cs->b[i] = b[i+2]; - cs->y += 2; -} - -static void spatial_compose_dirac53i_dy(DWTContext *d, int level, int width, int height, int stride) -{ - vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0; - vertical_compose_3tap vertical_compose_h0 = (void*)d->vertical_compose_h0; - DWTCompose *cs = d->cs + level; - - int y= cs->y; - IDWTELEM *b[4] = { cs->b[0], cs->b[1] }; - b[2] = d->buffer + mirror(y+1, height-1)*stride; - b[3] = d->buffer + mirror(y+2, height-1)*stride; - - if(y+1<(unsigned)height) vertical_compose_l0(b[1], b[2], b[3], width); - if(y+0<(unsigned)height) vertical_compose_h0(b[0], b[1], b[2], width); - - if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); - if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); - - cs->b[0] = b[2]; - cs->b[1] = b[3]; - cs->y += 2; -} - - -static void spatial_compose_dd137i_dy(DWTContext *d, int level, int width, int height, int stride) -{ - vertical_compose_5tap vertical_compose_l0 = (void*)d->vertical_compose_l0; - vertical_compose_5tap vertical_compose_h0 = (void*)d->vertical_compose_h0; - DWTCompose *cs = d->cs + level; - - int i, y = cs->y; - IDWTELEM *b[10]; - for (i = 0; i < 8; i++) - b[i] = cs->b[i]; - b[8] = d->buffer + av_clip(y+7, 0, height-2)*stride; - b[9] = d->buffer + av_clip(y+8, 1, height-1)*stride; - - if(y+5<(unsigned)height) vertical_compose_l0(b[3], b[5], b[6], b[7], b[9], width); - if(y+1<(unsigned)height) vertical_compose_h0(b[0], b[2], b[3], b[4], b[6], width); - - if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); - if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); - - for (i = 0; i < 8; i++) - cs->b[i] = b[i+2]; - cs->y += 2; -} - -// haar makes the assumption that height is even (always true for dirac) -static void spatial_compose_haari_dy(DWTContext *d, int level, int width, int height, int stride) -{ - vertical_compose_2tap vertical_compose = (void*)d->vertical_compose; - int y = d->cs[level].y; - IDWTELEM *b0 = d->buffer + (y-1)*stride; - IDWTELEM *b1 = d->buffer + (y )*stride; - - vertical_compose(b0, b1, width); - d->horizontal_compose(b0, d->temp, width); - d->horizontal_compose(b1, d->temp, width); - - d->cs[level].y += 2; -} - -// Don't do sliced idwt for fidelity; the 9 tap filter makes it a bit annoying -// Fortunately, this filter isn't used in practice. -static void spatial_compose_fidelity(DWTContext *d, int level, int width, int height, int stride) -{ - vertical_compose_9tap vertical_compose_l0 = (void*)d->vertical_compose_l0; - vertical_compose_9tap vertical_compose_h0 = (void*)d->vertical_compose_h0; - int i, y; - IDWTELEM *b[8]; - - for (y = 1; y < height; y += 2) { - for (i = 0; i < 8; i++) - b[i] = d->buffer + av_clip((y-7 + 2*i), 0, height-2)*stride; - vertical_compose_h0(d->buffer + y*stride, b, width); - } - - for (y = 0; y < height; y += 2) { - for (i = 0; i < 8; i++) - b[i] = d->buffer + av_clip((y-7 + 2*i), 1, height-1)*stride; - vertical_compose_l0(d->buffer + y*stride, b, width); - } - - for (y = 0; y < height; y++) - d->horizontal_compose(d->buffer + y*stride, d->temp, width); - - d->cs[level].y = height+1; -} - -static void spatial_compose_daub97i_dy(DWTContext *d, int level, int width, int height, int stride) -{ - vertical_compose_3tap vertical_compose_l0 = (void*)d->vertical_compose_l0; - vertical_compose_3tap vertical_compose_h0 = (void*)d->vertical_compose_h0; - vertical_compose_3tap vertical_compose_l1 = (void*)d->vertical_compose_l1; - vertical_compose_3tap vertical_compose_h1 = (void*)d->vertical_compose_h1; - DWTCompose *cs = d->cs + level; - - int i, y = cs->y; - IDWTELEM *b[6]; - for (i = 0; i < 4; i++) - b[i] = cs->b[i]; - b[4] = d->buffer + mirror(y+3, height-1)*stride; - b[5] = d->buffer + mirror(y+4, height-1)*stride; - - if(y+3<(unsigned)height) vertical_compose_l1(b[3], b[4], b[5], width); - if(y+2<(unsigned)height) vertical_compose_h1(b[2], b[3], b[4], width); - if(y+1<(unsigned)height) vertical_compose_l0(b[1], b[2], b[3], width); - if(y+0<(unsigned)height) vertical_compose_h0(b[0], b[1], b[2], width); - - if(y-1<(unsigned)height) d->horizontal_compose(b[0], d->temp, width); - if(y+0<(unsigned)height) d->horizontal_compose(b[1], d->temp, width); - - for (i = 0; i < 4; i++) - cs->b[i] = b[i+2]; - cs->y += 2; -} - - -static void spatial_compose97i_init2(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) -{ - cs->b[0] = buffer + mirror(-3-1, height-1)*stride; - cs->b[1] = buffer + mirror(-3 , height-1)*stride; - cs->b[2] = buffer + mirror(-3+1, height-1)*stride; - cs->b[3] = buffer + mirror(-3+2, height-1)*stride; - cs->y = -3; -} - -static void spatial_compose53i_init2(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) -{ - cs->b[0] = buffer + mirror(-1-1, height-1)*stride; - cs->b[1] = buffer + mirror(-1 , height-1)*stride; - cs->y = -1; -} - -static void spatial_compose_dd97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) -{ - cs->b[0] = buffer + av_clip(-5-1, 0, height-2)*stride; - cs->b[1] = buffer + av_clip(-5 , 1, height-1)*stride; - cs->b[2] = buffer + av_clip(-5+1, 0, height-2)*stride; - cs->b[3] = buffer + av_clip(-5+2, 1, height-1)*stride; - cs->b[4] = buffer + av_clip(-5+3, 0, height-2)*stride; - cs->b[5] = buffer + av_clip(-5+4, 1, height-1)*stride; - cs->y = -5; -} - -static void spatial_compose_dd137i_init(DWTCompose *cs, IDWTELEM *buffer, int height, int stride) -{ - cs->b[0] = buffer + av_clip(-5-1, 0, height-2)*stride; - cs->b[1] = buffer + av_clip(-5 , 1, height-1)*stride; - cs->b[2] = buffer + av_clip(-5+1, 0, height-2)*stride; - cs->b[3] = buffer + av_clip(-5+2, 1, height-1)*stride; - cs->b[4] = buffer + av_clip(-5+3, 0, height-2)*stride; - cs->b[5] = buffer + av_clip(-5+4, 1, height-1)*stride; - cs->b[6] = buffer + av_clip(-5+5, 0, height-2)*stride; - cs->b[7] = buffer + av_clip(-5+6, 1, height-1)*stride; - cs->y = -5; -} - -int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height, - int stride, enum dwt_type type, int decomposition_count, - IDWTELEM *temp) -{ - int level; - - d->buffer = buffer; - d->width = width; - d->height = height; - d->stride = stride; - d->decomposition_count = decomposition_count; - d->temp = temp + 8; - - for(level=decomposition_count-1; level>=0; level--){ - int hl = height >> level; - int stride_l = stride << level; - - switch(type){ - case DWT_DIRAC_DD9_7: - spatial_compose_dd97i_init(d->cs+level, buffer, hl, stride_l); - break; - case DWT_DIRAC_LEGALL5_3: - spatial_compose53i_init2(d->cs+level, buffer, hl, stride_l); - break; - case DWT_DIRAC_DD13_7: - spatial_compose_dd137i_init(d->cs+level, buffer, hl, stride_l); - break; - case DWT_DIRAC_HAAR0: - case DWT_DIRAC_HAAR1: - d->cs[level].y = 1; - break; - case DWT_DIRAC_DAUB9_7: - spatial_compose97i_init2(d->cs+level, buffer, hl, stride_l); - break; - default: - d->cs[level].y = 0; - break; - } - } - - switch (type) { - case DWT_DIRAC_DD9_7: - d->spatial_compose = spatial_compose_dd97i_dy; - d->vertical_compose_l0 = (void*)vertical_compose53iL0; - d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0; - d->horizontal_compose = horizontal_compose_dd97i; - d->support = 7; - break; - case DWT_DIRAC_LEGALL5_3: - d->spatial_compose = spatial_compose_dirac53i_dy; - d->vertical_compose_l0 = (void*)vertical_compose53iL0; - d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0; - d->horizontal_compose = horizontal_compose_dirac53i; - d->support = 3; - break; - case DWT_DIRAC_DD13_7: - d->spatial_compose = spatial_compose_dd137i_dy; - d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0; - d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0; - d->horizontal_compose = horizontal_compose_dd137i; - d->support = 7; - break; - case DWT_DIRAC_HAAR0: - case DWT_DIRAC_HAAR1: - d->spatial_compose = spatial_compose_haari_dy; - d->vertical_compose = (void*)vertical_compose_haar; - if (type == DWT_DIRAC_HAAR0) - d->horizontal_compose = horizontal_compose_haar0i; - else - d->horizontal_compose = horizontal_compose_haar1i; - d->support = 1; - break; - case DWT_DIRAC_FIDELITY: - d->spatial_compose = spatial_compose_fidelity; - d->vertical_compose_l0 = (void*)vertical_compose_fidelityiL0; - d->vertical_compose_h0 = (void*)vertical_compose_fidelityiH0; - d->horizontal_compose = horizontal_compose_fidelityi; - break; - case DWT_DIRAC_DAUB9_7: - d->spatial_compose = spatial_compose_daub97i_dy; - d->vertical_compose_l0 = (void*)vertical_compose_daub97iL0; - d->vertical_compose_h0 = (void*)vertical_compose_daub97iH0; - d->vertical_compose_l1 = (void*)vertical_compose_daub97iL1; - d->vertical_compose_h1 = (void*)vertical_compose_daub97iH1; - d->horizontal_compose = horizontal_compose_daub97i; - d->support = 5; - break; - default: - av_log(NULL, AV_LOG_ERROR, "Unknown wavelet type %d\n", type); - return -1; - } - - if (HAVE_MMX) ff_spatial_idwt_init_mmx(d, type); - - return 0; -} - -void ff_spatial_idwt_slice2(DWTContext *d, int y) -{ - int level, support = d->support; - - for (level = d->decomposition_count-1; level >= 0; level--) { - int wl = d->width >> level; - int hl = d->height >> level; - int stride_l = d->stride << level; - - while (d->cs[level].y <= FFMIN((y>>level)+support, hl)) - d->spatial_compose(d, level, wl, hl, stride_l); - } -} - -int ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, int stride, - enum dwt_type type, int decomposition_count, IDWTELEM *temp) -{ - DWTContext d; - int y; - - if (ff_spatial_idwt_init2(&d, buffer, width, height, stride, type, decomposition_count, temp)) - return -1; - - for (y = 0; y < d.height; y += 4) - ff_spatial_idwt_slice2(&d, y); - - return 0; -} diff --git a/libavcodec/dwt.h b/libavcodec/dwt.h deleted file mode 100644 index d82e510006..0000000000 --- a/libavcodec/dwt.h +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright (C) 2004-2010 Michael Niedermayer - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_DWT_H -#define AVCODEC_DWT_H - -#include - -typedef int DWTELEM; -typedef short IDWTELEM; - -#define MAX_DWT_SUPPORT 8 -#define MAX_DECOMPOSITIONS 8 - -typedef struct DWTCompose { - IDWTELEM *b[MAX_DWT_SUPPORT]; - - IDWTELEM *b0; - IDWTELEM *b1; - IDWTELEM *b2; - IDWTELEM *b3; - int y; -} DWTCompose; - -/** Used to minimize the amount of memory used in order to - * optimize cache performance. **/ -typedef struct slice_buffer_s { - IDWTELEM **line; ///< For use by idwt and predict_slices. - IDWTELEM **data_stack; ///< Used for internal purposes. - int data_stack_top; - int line_count; - int line_width; - int data_count; - IDWTELEM *base_buffer; ///< Buffer that this structure is caching. -} slice_buffer; - -struct DWTContext; - -// Possible prototypes for vertical_compose functions -typedef void (*vertical_compose_2tap)(IDWTELEM *b0, IDWTELEM *b1, int width); -typedef void (*vertical_compose_3tap)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); -typedef void (*vertical_compose_5tap)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width); -typedef void (*vertical_compose_9tap)(IDWTELEM *dst, IDWTELEM *b[8], int width); - -typedef struct DWTContext { - IDWTELEM *buffer; - IDWTELEM *temp; - int width; - int height; - int stride; - int decomposition_count; - int support; - - void (*spatial_compose)(struct DWTContext *cs, int level, int width, int height, int stride); - void (*vertical_compose_l0)(void); - void (*vertical_compose_h0)(void); - void (*vertical_compose_l1)(void); - void (*vertical_compose_h1)(void); - void (*vertical_compose)(void); ///< one set of lowpass and highpass combined - void (*horizontal_compose)(IDWTELEM *b, IDWTELEM *tmp, int width); - - void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width); - void (*horizontal_compose97i)(IDWTELEM *b, IDWTELEM *temp, int width); - void (*inner_add_yblock)(const uint8_t *obmc, const int obmc_stride, - uint8_t **block, int b_w, int b_h, int src_x, - int src_y, int src_stride, slice_buffer *sb, - int add, uint8_t *dst8); - - DWTCompose cs[MAX_DECOMPOSITIONS]; -} DWTContext; - -enum dwt_type { - DWT_SNOW_DAUB9_7, - DWT_SNOW_LEGALL5_3, - DWT_DIRAC_DD9_7, - DWT_DIRAC_LEGALL5_3, - DWT_DIRAC_DD13_7, - DWT_DIRAC_HAAR0, - DWT_DIRAC_HAAR1, - DWT_DIRAC_FIDELITY, - DWT_DIRAC_DAUB9_7, - DWT_NUM_TYPES -}; - -// -1 if an error occurred, e.g. the dwt_type isn't recognized -int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height, - int stride, enum dwt_type type, int decomposition_count, - IDWTELEM *temp); - -int ff_spatial_idwt2(IDWTELEM *buffer, int width, int height, int stride, - enum dwt_type type, int decomposition_count, IDWTELEM *temp); - -void ff_spatial_idwt_slice2(DWTContext *d, int y); - -// shared stuff for simd optimiztions -#define COMPOSE_53iL0(b0, b1, b2)\ - (b1 - ((b0 + b2 + 2) >> 2)) - -#define COMPOSE_DIRAC53iH0(b0, b1, b2)\ - (b1 + ((b0 + b2 + 1) >> 1)) - -#define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\ - (b2 + ((-b0 + 9*b1 + 9*b3 - b4 + 8) >> 4)) - -#define COMPOSE_DD137iL0(b0, b1, b2, b3, b4)\ - (b2 - ((-b0 + 9*b1 + 9*b3 - b4 + 16) >> 5)) - -#define COMPOSE_HAARiL0(b0, b1)\ - (b0 - ((b1 + 1) >> 1)) - -#define COMPOSE_HAARiH0(b0, b1)\ - (b0 + b1) - -#define COMPOSE_FIDELITYiL0(b0, b1, b2, b3, b4, b5, b6, b7, b8)\ - (b4 - ((-8*(b0+b8) + 21*(b1+b7) - 46*(b2+b6) + 161*(b3+b5) + 128) >> 8)) - -#define COMPOSE_FIDELITYiH0(b0, b1, b2, b3, b4, b5, b6, b7, b8)\ - (b4 + ((-2*(b0+b8) + 10*(b1+b7) - 25*(b2+b6) + 81*(b3+b5) + 128) >> 8)) - -#define COMPOSE_DAUB97iL1(b0, b1, b2)\ - (b1 - ((1817*(b0 + b2) + 2048) >> 12)) - -#define COMPOSE_DAUB97iH1(b0, b1, b2)\ - (b1 - (( 113*(b0 + b2) + 64) >> 7)) - -#define COMPOSE_DAUB97iL0(b0, b1, b2)\ - (b1 + (( 217*(b0 + b2) + 2048) >> 12)) - -#define COMPOSE_DAUB97iH0(b0, b1, b2)\ - (b1 + ((6497*(b0 + b2) + 2048) >> 12)) - - - -#define DWT_97 0 -#define DWT_53 1 - -#define liftS lift -#define W_AM 3 -#define W_AO 0 -#define W_AS 1 - -#undef liftS -#define W_BM 1 -#define W_BO 8 -#define W_BS 4 - -#define W_CM 1 -#define W_CO 0 -#define W_CS 0 - -#define W_DM 3 -#define W_DO 4 -#define W_DS 3 - -#define slice_buffer_get_line(slice_buf, line_num) \ - ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] \ - : ff_slice_buffer_load_line((slice_buf), \ - (line_num))) - -int ff_slice_buffer_init(slice_buffer *buf, int line_count, - int max_allocated_lines, int line_width, - IDWTELEM *base_buffer); -void ff_slice_buffer_release(slice_buffer *buf, int line); -void ff_slice_buffer_flush(slice_buffer *buf); -void ff_slice_buffer_destroy(slice_buffer *buf); -IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); - -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width); -void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width); -void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, - uint8_t **block, int b_w, int b_h, int src_x, - int src_y, int src_stride, slice_buffer *sb, - int add, uint8_t *dst8); - -int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); -int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); - -void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride, - int type, int decomposition_count); - -void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, - int height, int stride_line, int type, - int decomposition_count); -void ff_spatial_idwt_buffered_slice(DWTContext *dsp, DWTCompose *cs, - slice_buffer *slice_buf, IDWTELEM *temp, - int width, int height, int stride_line, - int type, int decomposition_count, int y); -void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, - int stride, int type, int decomposition_count); - -void ff_dwt_init(DWTContext *c); -void ff_dwt_init_x86(DWTContext *c); - -#endif /* AVCODEC_DWT_H */ diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c index 52cd402cb1..4411c090c4 100644 --- a/libavcodec/ivi_dsp.c +++ b/libavcodec/ivi_dsp.c @@ -28,7 +28,6 @@ #include "avcodec.h" #include "dsputil.h" -#include "dwt.h" #include "ivi_common.h" #include "ivi_dsp.h" @@ -40,7 +39,7 @@ void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst, int32_t b0_1, b0_2, b1_1, b1_2, b1_3, b2_1, b2_2, b2_3, b2_4, b2_5, b2_6; int32_t b3_1, b3_2, b3_3, b3_4, b3_5, b3_6, b3_7, b3_8, b3_9; int32_t pitch, back_pitch; - const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr; + const short *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr; const int num_bands = 4; /* all bands should have the same pitch */ @@ -193,7 +192,7 @@ void ff_ivi_recompose_haar(const IVIPlaneDesc *plane, uint8_t *dst, const int dst_pitch) { int x, y, indx, b0, b1, b2, b3, p0, p1, p2, p3; - const IDWTELEM *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr; + const short *b0_ptr, *b1_ptr, *b2_ptr, *b3_ptr; int32_t pitch; /* all bands should have the same pitch */ diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 3adf723f70..1efe560f2d 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -23,7 +23,7 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "dsputil.h" -#include "dwt.h" +#include "snow_dwt.h" #include "internal.h" #include "snow.h" #include "snowdata.h" diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 2565988a57..83c64c0e1b 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -23,7 +23,7 @@ #define AVCODEC_SNOW_H #include "dsputil.h" -#include "dwt.h" +#include "snow_dwt.h" #include "rangecoder.h" #include "mathops.h" @@ -109,7 +109,7 @@ typedef struct SnowContext{ RangeCoder c; DSPContext dsp; VideoDSPContext vdsp; - DWTContext dwt; + SnowDWTContext dwt; AVFrame new_picture; AVFrame input_picture; ///< new_picture with the internal linesizes AVFrame current_picture; diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c new file mode 100644 index 0000000000..28edf6aafb --- /dev/null +++ b/libavcodec/snow_dwt.c @@ -0,0 +1,865 @@ +/* + * Copyright (C) 2004-2010 Michael Niedermayer + * Copyright (C) 2008 David Conrad + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/attributes.h" +#include "libavutil/avassert.h" +#include "libavutil/common.h" +#include "dsputil.h" +#include "snow_dwt.h" + +int ff_slice_buffer_init(slice_buffer *buf, int line_count, + int max_allocated_lines, int line_width, + IDWTELEM *base_buffer) +{ + int i; + + buf->base_buffer = base_buffer; + buf->line_count = line_count; + buf->line_width = line_width; + buf->data_count = max_allocated_lines; + buf->line = av_mallocz(sizeof(IDWTELEM *) * line_count); + if (!buf->line) + return AVERROR(ENOMEM); + buf->data_stack = av_malloc(sizeof(IDWTELEM *) * max_allocated_lines); + if (!buf->data_stack) { + av_freep(&buf->line); + return AVERROR(ENOMEM); + } + + for (i = 0; i < max_allocated_lines; i++) { + buf->data_stack[i] = av_malloc(sizeof(IDWTELEM) * line_width); + if (!buf->data_stack[i]) { + for (i--; i >=0; i--) + av_freep(&buf->data_stack[i]); + av_freep(&buf->data_stack); + av_freep(&buf->line); + return AVERROR(ENOMEM); + } + } + + buf->data_stack_top = max_allocated_lines - 1; + return 0; +} + +IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line) +{ + IDWTELEM *buffer; + + av_assert0(buf->data_stack_top >= 0); +// av_assert1(!buf->line[line]); + if (buf->line[line]) + return buf->line[line]; + + buffer = buf->data_stack[buf->data_stack_top]; + buf->data_stack_top--; + buf->line[line] = buffer; + + return buffer; +} + +void ff_slice_buffer_release(slice_buffer *buf, int line) +{ + IDWTELEM *buffer; + + av_assert1(line >= 0 && line < buf->line_count); + av_assert1(buf->line[line]); + + buffer = buf->line[line]; + buf->data_stack_top++; + buf->data_stack[buf->data_stack_top] = buffer; + buf->line[line] = NULL; +} + +void ff_slice_buffer_flush(slice_buffer *buf) +{ + int i; + for (i = 0; i < buf->line_count; i++) + if (buf->line[i]) + ff_slice_buffer_release(buf, i); +} + +void ff_slice_buffer_destroy(slice_buffer *buf) +{ + int i; + ff_slice_buffer_flush(buf); + + for (i = buf->data_count - 1; i >= 0; i--) + av_freep(&buf->data_stack[i]); + av_freep(&buf->data_stack); + av_freep(&buf->line); +} + +static inline int mirror(int v, int m) +{ + while ((unsigned)v > (unsigned)m) { + v = -v; + if (v < 0) + v += 2 * m; + } + return v; +} + +static av_always_inline void lift(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, + int dst_step, int src_step, int ref_step, + int width, int mul, int add, int shift, + int highpass, int inverse) +{ + const int mirror_left = !highpass; + const int mirror_right = (width & 1) ^ highpass; + const int w = (width >> 1) - 1 + (highpass & width); + int i; + +#define LIFT(src, ref, inv) ((src) + ((inv) ? -(ref) : +(ref))) + if (mirror_left) { + dst[0] = LIFT(src[0], ((mul * 2 * ref[0] + add) >> shift), inverse); + dst += dst_step; + src += src_step; + } + + for (i = 0; i < w; i++) + dst[i * dst_step] = LIFT(src[i * src_step], + ((mul * (ref[i * ref_step] + + ref[(i + 1) * ref_step]) + + add) >> shift), + inverse); + + if (mirror_right) + dst[w * dst_step] = LIFT(src[w * src_step], + ((mul * 2 * ref[w * ref_step] + add) >> shift), + inverse); +} + +static av_always_inline void liftS(DWTELEM *dst, DWTELEM *src, DWTELEM *ref, + int dst_step, int src_step, int ref_step, + int width, int mul, int add, int shift, + int highpass, int inverse) +{ + const int mirror_left = !highpass; + const int mirror_right = (width & 1) ^ highpass; + const int w = (width >> 1) - 1 + (highpass & width); + int i; + + av_assert1(shift == 4); +#define LIFTS(src, ref, inv) \ + ((inv) ? (src) + (((ref) + 4 * (src)) >> shift) \ + : -((-16 * (src) + (ref) + add / \ + 4 + 1 + (5 << 25)) / (5 * 4) - (1 << 23))) + if (mirror_left) { + dst[0] = LIFTS(src[0], mul * 2 * ref[0] + add, inverse); + dst += dst_step; + src += src_step; + } + + for (i = 0; i < w; i++) + dst[i * dst_step] = LIFTS(src[i * src_step], + mul * (ref[i * ref_step] + + ref[(i + 1) * ref_step]) + add, + inverse); + + if (mirror_right) + dst[w * dst_step] = LIFTS(src[w * src_step], + mul * 2 * ref[w * ref_step] + add, + inverse); +} + +static void horizontal_decompose53i(DWTELEM *b, DWTELEM *temp, int width) +{ + const int width2 = width >> 1; + int x; + const int w2 = (width + 1) >> 1; + + for (x = 0; x < width2; x++) { + temp[x] = b[2 * x]; + temp[x + w2] = b[2 * x + 1]; + } + if (width & 1) + temp[x] = b[2 * x]; + lift(b + w2, temp + w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0); + lift(b, temp, b + w2, 1, 1, 1, width, 1, 2, 2, 0, 0); +} + +static void vertical_decompose53iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] -= (b0[i] + b2[i]) >> 1; +} + +static void vertical_decompose53iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] += (b0[i] + b2[i] + 2) >> 2; +} + +static void spatial_decompose53i(DWTELEM *buffer, DWTELEM *temp, + int width, int height, int stride) +{ + int y; + DWTELEM *b0 = buffer + mirror(-2 - 1, height - 1) * stride; + DWTELEM *b1 = buffer + mirror(-2, height - 1) * stride; + + for (y = -2; y < height; y += 2) { + DWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; + DWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride; + + if (y + 1 < (unsigned)height) + horizontal_decompose53i(b2, temp, width); + if (y + 2 < (unsigned)height) + horizontal_decompose53i(b3, temp, width); + + if (y + 1 < (unsigned)height) + vertical_decompose53iH0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_decompose53iL0(b0, b1, b2, width); + + b0 = b2; + b1 = b3; + } +} + +static void horizontal_decompose97i(DWTELEM *b, DWTELEM *temp, int width) +{ + const int w2 = (width + 1) >> 1; + + lift(temp + w2, b + 1, b, 1, 2, 2, width, W_AM, W_AO, W_AS, 1, 1); + liftS(temp, b, temp + w2, 1, 2, 1, width, W_BM, W_BO, W_BS, 0, 0); + lift(b + w2, temp + w2, temp, 1, 1, 1, width, W_CM, W_CO, W_CS, 1, 0); + lift(b, temp, b + w2, 1, 1, 1, width, W_DM, W_DO, W_DS, 0, 0); +} + +static void vertical_decompose97iH0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] -= (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; +} + +static void vertical_decompose97iH1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] += (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; +} + +static void vertical_decompose97iL0(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] = (16 * 4 * b1[i] - 4 * (b0[i] + b2[i]) + W_BO * 5 + (5 << 27)) / + (5 * 16) - (1 << 23); +} + +static void vertical_decompose97iL1(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] += (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; +} + +static void spatial_decompose97i(DWTELEM *buffer, DWTELEM *temp, + int width, int height, int stride) +{ + int y; + DWTELEM *b0 = buffer + mirror(-4 - 1, height - 1) * stride; + DWTELEM *b1 = buffer + mirror(-4, height - 1) * stride; + DWTELEM *b2 = buffer + mirror(-4 + 1, height - 1) * stride; + DWTELEM *b3 = buffer + mirror(-4 + 2, height - 1) * stride; + + for (y = -4; y < height; y += 2) { + DWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; + DWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride; + + if (y + 3 < (unsigned)height) + horizontal_decompose97i(b4, temp, width); + if (y + 4 < (unsigned)height) + horizontal_decompose97i(b5, temp, width); + + if (y + 3 < (unsigned)height) + vertical_decompose97iH0(b3, b4, b5, width); + if (y + 2 < (unsigned)height) + vertical_decompose97iL0(b2, b3, b4, width); + if (y + 1 < (unsigned)height) + vertical_decompose97iH1(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_decompose97iL1(b0, b1, b2, width); + + b0 = b2; + b1 = b3; + b2 = b4; + b3 = b5; + } +} + +void ff_spatial_dwt(DWTELEM *buffer, DWTELEM *temp, int width, int height, + int stride, int type, int decomposition_count) +{ + int level; + + for (level = 0; level < decomposition_count; level++) { + switch (type) { + case DWT_97: + spatial_decompose97i(buffer, temp, + width >> level, height >> level, + stride << level); + break; + case DWT_53: + spatial_decompose53i(buffer, temp, + width >> level, height >> level, + stride << level); + break; + } + } +} + +static void horizontal_compose53i(IDWTELEM *b, IDWTELEM *temp, int width) +{ + const int width2 = width >> 1; + const int w2 = (width + 1) >> 1; + int x; + + for (x = 0; x < width2; x++) { + temp[2 * x] = b[x]; + temp[2 * x + 1] = b[x + w2]; + } + if (width & 1) + temp[2 * x] = b[x]; + + b[0] = temp[0] - ((temp[1] + 1) >> 1); + for (x = 2; x < width - 1; x += 2) { + b[x] = temp[x] - ((temp[x - 1] + temp[x + 1] + 2) >> 2); + b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1); + } + if (width & 1) { + b[x] = temp[x] - ((temp[x - 1] + 1) >> 1); + b[x - 1] = temp[x - 1] + ((b[x - 2] + b[x] + 1) >> 1); + } else + b[x - 1] = temp[x - 1] + b[x - 2]; +} + +static void vertical_compose53iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] += (b0[i] + b2[i]) >> 1; +} + +static void vertical_compose53iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] -= (b0[i] + b2[i] + 2) >> 2; +} + +static void spatial_compose53i_buffered_init(DWTCompose *cs, slice_buffer *sb, + int height, int stride_line) +{ + cs->b0 = slice_buffer_get_line(sb, + mirror(-1 - 1, height - 1) * stride_line); + cs->b1 = slice_buffer_get_line(sb, mirror(-1, height - 1) * stride_line); + cs->y = -1; +} + +static void spatial_compose53i_init(DWTCompose *cs, IDWTELEM *buffer, + int height, int stride) +{ + cs->b0 = buffer + mirror(-1 - 1, height - 1) * stride; + cs->b1 = buffer + mirror(-1, height - 1) * stride; + cs->y = -1; +} + +static void spatial_compose53i_dy_buffered(DWTCompose *cs, slice_buffer *sb, + IDWTELEM *temp, + int width, int height, + int stride_line) +{ + int y = cs->y; + + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = slice_buffer_get_line(sb, + mirror(y + 1, height - 1) * + stride_line); + IDWTELEM *b3 = slice_buffer_get_line(sb, + mirror(y + 2, height - 1) * + stride_line); + + if (y + 1 < (unsigned)height && y < (unsigned)height) { + int x; + + for (x = 0; x < width; x++) { + b2[x] -= (b1[x] + b3[x] + 2) >> 2; + b1[x] += (b0[x] + b2[x]) >> 1; + } + } else { + if (y + 1 < (unsigned)height) + vertical_compose53iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose53iH0(b0, b1, b2, width); + } + + if (y - 1 < (unsigned)height) + horizontal_compose53i(b0, temp, width); + if (y + 0 < (unsigned)height) + horizontal_compose53i(b1, temp, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->y += 2; +} + +static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, + IDWTELEM *temp, int width, int height, + int stride) +{ + int y = cs->y; + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = buffer + mirror(y + 1, height - 1) * stride; + IDWTELEM *b3 = buffer + mirror(y + 2, height - 1) * stride; + + if (y + 1 < (unsigned)height) + vertical_compose53iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose53iH0(b0, b1, b2, width); + + if (y - 1 < (unsigned)height) + horizontal_compose53i(b0, temp, width); + if (y + 0 < (unsigned)height) + horizontal_compose53i(b1, temp, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->y += 2; +} + +void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width) +{ + const int w2 = (width + 1) >> 1; + int x; + + temp[0] = b[0] - ((3 * b[w2] + 2) >> 2); + for (x = 1; x < (width >> 1); x++) { + temp[2 * x] = b[x] - ((3 * (b[x + w2 - 1] + b[x + w2]) + 4) >> 3); + temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x]; + } + if (width & 1) { + temp[2 * x] = b[x] - ((3 * b[x + w2 - 1] + 2) >> 2); + temp[2 * x - 1] = b[x + w2 - 1] - temp[2 * x - 2] - temp[2 * x]; + } else + temp[2 * x - 1] = b[x + w2 - 1] - 2 * temp[2 * x - 2]; + + b[0] = temp[0] + ((2 * temp[0] + temp[1] + 4) >> 3); + for (x = 2; x < width - 1; x += 2) { + b[x] = temp[x] + ((4 * temp[x] + temp[x - 1] + temp[x + 1] + 8) >> 4); + b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1); + } + if (width & 1) { + b[x] = temp[x] + ((2 * temp[x] + temp[x - 1] + 4) >> 3); + b[x - 1] = temp[x - 1] + ((3 * (b[x - 2] + b[x])) >> 1); + } else + b[x - 1] = temp[x - 1] + 3 * b[x - 2]; +} + +static void vertical_compose97iH0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; +} + +static void vertical_compose97iH1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] -= (W_CM * (b0[i] + b2[i]) + W_CO) >> W_CS; +} + +static void vertical_compose97iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] += (W_BM * (b0[i] + b2[i]) + 4 * b1[i] + W_BO) >> W_BS; +} + +static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + int width) +{ + int i; + + for (i = 0; i < width; i++) + b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; +} + +void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width) +{ + int i; + + for (i = 0; i < width; i++) { + b4[i] -= (W_DM * (b3[i] + b5[i]) + W_DO) >> W_DS; + b3[i] -= (W_CM * (b2[i] + b4[i]) + W_CO) >> W_CS; + b2[i] += (W_BM * (b1[i] + b3[i]) + 4 * b2[i] + W_BO) >> W_BS; + b1[i] += (W_AM * (b0[i] + b2[i]) + W_AO) >> W_AS; + } +} + +static void spatial_compose97i_buffered_init(DWTCompose *cs, slice_buffer *sb, + int height, int stride_line) +{ + cs->b0 = slice_buffer_get_line(sb, mirror(-3 - 1, height - 1) * stride_line); + cs->b1 = slice_buffer_get_line(sb, mirror(-3, height - 1) * stride_line); + cs->b2 = slice_buffer_get_line(sb, mirror(-3 + 1, height - 1) * stride_line); + cs->b3 = slice_buffer_get_line(sb, mirror(-3 + 2, height - 1) * stride_line); + cs->y = -3; +} + +static void spatial_compose97i_init(DWTCompose *cs, IDWTELEM *buffer, int height, + int stride) +{ + cs->b0 = buffer + mirror(-3 - 1, height - 1) * stride; + cs->b1 = buffer + mirror(-3, height - 1) * stride; + cs->b2 = buffer + mirror(-3 + 1, height - 1) * stride; + cs->b3 = buffer + mirror(-3 + 2, height - 1) * stride; + cs->y = -3; +} + +static void spatial_compose97i_dy_buffered(SnowDWTContext *dsp, DWTCompose *cs, + slice_buffer * sb, IDWTELEM *temp, + int width, int height, + int stride_line) +{ + int y = cs->y; + + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = cs->b2; + IDWTELEM *b3 = cs->b3; + IDWTELEM *b4 = slice_buffer_get_line(sb, + mirror(y + 3, height - 1) * + stride_line); + IDWTELEM *b5 = slice_buffer_get_line(sb, + mirror(y + 4, height - 1) * + stride_line); + + if (y > 0 && y + 4 < height) { + dsp->vertical_compose97i(b0, b1, b2, b3, b4, b5, width); + } else { + if (y + 3 < (unsigned)height) + vertical_compose97iL1(b3, b4, b5, width); + if (y + 2 < (unsigned)height) + vertical_compose97iH1(b2, b3, b4, width); + if (y + 1 < (unsigned)height) + vertical_compose97iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose97iH0(b0, b1, b2, width); + } + + if (y - 1 < (unsigned)height) + dsp->horizontal_compose97i(b0, temp, width); + if (y + 0 < (unsigned)height) + dsp->horizontal_compose97i(b1, temp, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->b2 = b4; + cs->b3 = b5; + cs->y += 2; +} + +static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, + IDWTELEM *temp, int width, int height, + int stride) +{ + int y = cs->y; + IDWTELEM *b0 = cs->b0; + IDWTELEM *b1 = cs->b1; + IDWTELEM *b2 = cs->b2; + IDWTELEM *b3 = cs->b3; + IDWTELEM *b4 = buffer + mirror(y + 3, height - 1) * stride; + IDWTELEM *b5 = buffer + mirror(y + 4, height - 1) * stride; + + if (y + 3 < (unsigned)height) + vertical_compose97iL1(b3, b4, b5, width); + if (y + 2 < (unsigned)height) + vertical_compose97iH1(b2, b3, b4, width); + if (y + 1 < (unsigned)height) + vertical_compose97iL0(b1, b2, b3, width); + if (y + 0 < (unsigned)height) + vertical_compose97iH0(b0, b1, b2, width); + + if (y - 1 < (unsigned)height) + ff_snow_horizontal_compose97i(b0, temp, width); + if (y + 0 < (unsigned)height) + ff_snow_horizontal_compose97i(b1, temp, width); + + cs->b0 = b2; + cs->b1 = b3; + cs->b2 = b4; + cs->b3 = b5; + cs->y += 2; +} + +void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, + int height, int stride_line, int type, + int decomposition_count) +{ + int level; + for (level = decomposition_count - 1; level >= 0; level--) { + switch (type) { + case DWT_97: + spatial_compose97i_buffered_init(cs + level, sb, height >> level, + stride_line << level); + break; + case DWT_53: + spatial_compose53i_buffered_init(cs + level, sb, height >> level, + stride_line << level); + break; + } + } +} + +void ff_spatial_idwt_buffered_slice(SnowDWTContext *dsp, DWTCompose *cs, + slice_buffer *slice_buf, IDWTELEM *temp, + int width, int height, int stride_line, + int type, int decomposition_count, int y) +{ + const int support = type == 1 ? 3 : 5; + int level; + if (type == 2) + return; + + for (level = decomposition_count - 1; level >= 0; level--) + while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { + switch (type) { + case DWT_97: + spatial_compose97i_dy_buffered(dsp, cs + level, slice_buf, temp, + width >> level, + height >> level, + stride_line << level); + break; + case DWT_53: + spatial_compose53i_dy_buffered(cs + level, slice_buf, temp, + width >> level, + height >> level, + stride_line << level); + break; + } + } +} + +static void ff_spatial_idwt_init(DWTCompose *cs, IDWTELEM *buffer, int width, + int height, int stride, int type, + int decomposition_count) +{ + int level; + for (level = decomposition_count - 1; level >= 0; level--) { + switch (type) { + case DWT_97: + spatial_compose97i_init(cs + level, buffer, height >> level, + stride << level); + break; + case DWT_53: + spatial_compose53i_init(cs + level, buffer, height >> level, + stride << level); + break; + } + } +} + +static void ff_spatial_idwt_slice(DWTCompose *cs, IDWTELEM *buffer, + IDWTELEM *temp, int width, int height, + int stride, int type, + int decomposition_count, int y) +{ + const int support = type == 1 ? 3 : 5; + int level; + if (type == 2) + return; + + for (level = decomposition_count - 1; level >= 0; level--) + while (cs[level].y <= FFMIN((y >> level) + support, height >> level)) { + switch (type) { + case DWT_97: + spatial_compose97i_dy(cs + level, buffer, temp, width >> level, + height >> level, stride << level); + break; + case DWT_53: + spatial_compose53i_dy(cs + level, buffer, temp, width >> level, + height >> level, stride << level); + break; + } + } +} + +void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, + int stride, int type, int decomposition_count) +{ + DWTCompose cs[MAX_DECOMPOSITIONS]; + int y; + ff_spatial_idwt_init(cs, buffer, width, height, stride, type, + decomposition_count); + for (y = 0; y < height; y += 4) + ff_spatial_idwt_slice(cs, buffer, temp, width, height, stride, type, + decomposition_count, y); +} + +static inline int w_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, + int w, int h, int type) +{ + int s, i, j; + const int dec_count = w == 8 ? 3 : 4; + int tmp[32 * 32], tmp2[32]; + int level, ori; + static const int scale[2][2][4][4] = { + { + { // 9/7 8x8 dec=3 + { 268, 239, 239, 213 }, + { 0, 224, 224, 152 }, + { 0, 135, 135, 110 }, + }, + { // 9/7 16x16 or 32x32 dec=4 + { 344, 310, 310, 280 }, + { 0, 320, 320, 228 }, + { 0, 175, 175, 136 }, + { 0, 129, 129, 102 }, + } + }, + { + { // 5/3 8x8 dec=3 + { 275, 245, 245, 218 }, + { 0, 230, 230, 156 }, + { 0, 138, 138, 113 }, + }, + { // 5/3 16x16 or 32x32 dec=4 + { 352, 317, 317, 286 }, + { 0, 328, 328, 233 }, + { 0, 180, 180, 140 }, + { 0, 132, 132, 105 }, + } + } + }; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j += 4) { + tmp[32 * i + j + 0] = (pix1[j + 0] - pix2[j + 0]) << 4; + tmp[32 * i + j + 1] = (pix1[j + 1] - pix2[j + 1]) << 4; + tmp[32 * i + j + 2] = (pix1[j + 2] - pix2[j + 2]) << 4; + tmp[32 * i + j + 3] = (pix1[j + 3] - pix2[j + 3]) << 4; + } + pix1 += line_size; + pix2 += line_size; + } + + ff_spatial_dwt(tmp, tmp2, w, h, 32, type, dec_count); + + s = 0; + av_assert1(w == h); + for (level = 0; level < dec_count; level++) + for (ori = level ? 1 : 0; ori < 4; ori++) { + int size = w >> (dec_count - level); + int sx = (ori & 1) ? size : 0; + int stride = 32 << (dec_count - level); + int sy = (ori & 2) ? stride >> 1 : 0; + + for (i = 0; i < size; i++) + for (j = 0; j < size; j++) { + int v = tmp[sx + sy + i * stride + j] * + scale[type][dec_count - 3][level][ori]; + s += FFABS(v); + } + } + av_assert1(s >= 0); + return s >> 9; +} + +static int w53_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 8, h, 1); +} + +static int w97_8_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 8, h, 0); +} + +static int w53_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 16, h, 1); +} + +static int w97_16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 16, h, 0); +} + +int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 32, h, 1); +} + +int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) +{ + return w_c(v, pix1, pix2, line_size, 32, h, 0); +} + +void ff_dsputil_init_dwt(DSPContext *c) +{ + c->w53[0] = w53_16_c; + c->w53[1] = w53_8_c; + c->w97[0] = w97_16_c; + c->w97[1] = w97_8_c; +} + +void ff_dwt_init(SnowDWTContext *c) +{ + c->vertical_compose97i = ff_snow_vertical_compose97i; + c->horizontal_compose97i = ff_snow_horizontal_compose97i; + c->inner_add_yblock = ff_snow_inner_add_yblock; + + if (HAVE_MMX) + ff_dwt_init_x86(c); +} + + diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h new file mode 100644 index 0000000000..0806b389e2 --- /dev/null +++ b/libavcodec/snow_dwt.h @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2004-2010 Michael Niedermayer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_SNOW_DWT_H +#define AVCODEC_SNOW_DWT_H + +#include + +typedef int DWTELEM; +typedef short IDWTELEM; + +#define MAX_DECOMPOSITIONS 8 + +typedef struct DWTCompose { + IDWTELEM *b0; + IDWTELEM *b1; + IDWTELEM *b2; + IDWTELEM *b3; + int y; +} DWTCompose; + +/** Used to minimize the amount of memory used in order to + * optimize cache performance. **/ +typedef struct slice_buffer_s { + IDWTELEM **line; ///< For use by idwt and predict_slices. + IDWTELEM **data_stack; ///< Used for internal purposes. + int data_stack_top; + int line_count; + int line_width; + int data_count; + IDWTELEM *base_buffer; ///< Buffer that this structure is caching. +} slice_buffer; + +struct SnowDWTContext; + +typedef struct SnowDWTContext { + void (*vertical_compose97i)(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width); + void (*horizontal_compose97i)(IDWTELEM *b, IDWTELEM *temp, int width); + void (*inner_add_yblock)(const uint8_t *obmc, const int obmc_stride, + uint8_t **block, int b_w, int b_h, int src_x, + int src_y, int src_stride, slice_buffer *sb, + int add, uint8_t *dst8); +} SnowDWTContext; + + +#define DWT_97 0 +#define DWT_53 1 + +#define liftS lift +#define W_AM 3 +#define W_AO 0 +#define W_AS 1 + +#undef liftS +#define W_BM 1 +#define W_BO 8 +#define W_BS 4 + +#define W_CM 1 +#define W_CO 0 +#define W_CS 0 + +#define W_DM 3 +#define W_DO 4 +#define W_DS 3 + +#define slice_buffer_get_line(slice_buf, line_num) \ + ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] \ + : ff_slice_buffer_load_line((slice_buf), \ + (line_num))) + +int ff_slice_buffer_init(slice_buffer *buf, int line_count, + int max_allocated_lines, int line_width, + IDWTELEM *base_buffer); +void ff_slice_buffer_release(slice_buffer *buf, int line); +void ff_slice_buffer_flush(slice_buffer *buf); +void ff_slice_buffer_destroy(slice_buffer *buf); +IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); + +void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width); +void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width); +void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, + uint8_t **block, int b_w, int b_h, int src_x, + int src_y, int src_stride, slice_buffer *sb, + int add, uint8_t *dst8); + +int ff_w53_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); +int ff_w97_32_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h); + +void ff_spatial_dwt(int *buffer, int *temp, int width, int height, int stride, + int type, int decomposition_count); + +void ff_spatial_idwt_buffered_init(DWTCompose *cs, slice_buffer *sb, int width, + int height, int stride_line, int type, + int decomposition_count); +void ff_spatial_idwt_buffered_slice(SnowDWTContext *dsp, DWTCompose *cs, + slice_buffer *slice_buf, IDWTELEM *temp, + int width, int height, int stride_line, + int type, int decomposition_count, int y); +void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height, + int stride, int type, int decomposition_count); + +void ff_dwt_init(SnowDWTContext *c); +void ff_dwt_init_x86(SnowDWTContext *c); + +#endif /* AVCODEC_DWT_H */ diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index c4baf0a7d1..e2115068c8 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -23,7 +23,7 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "dsputil.h" -#include "dwt.h" +#include "snow_dwt.h" #include "internal.h" #include "snow.h" diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index de2c859302..a062ac508d 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -25,7 +25,7 @@ #include "internal.h" #include "dsputil.h" #include "internal.h" -#include "dwt.h" +#include "snow_dwt.h" #include "snow.h" #include "rangecoder.h" diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 34254e4fde..6f10d060f9 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -35,17 +35,17 @@ MMX-OBJS += x86/dsputil_mmx.o \ x86/idct_sse2_xvid.o \ x86/simple_idct.o \ -MMX-OBJS-$(CONFIG_DWT) += x86/snowdsp.o \ - x86/dwt.o MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ x86/motion_est.o +MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o +MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o -YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o -YASM-OBJS-$(CONFIG_DWT) += x86/dwt_yasm.o +YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ + x86/dwt_yasm.o x86/dirac_dwt.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ diff --git a/libavcodec/x86/dirac_dwt.c b/libavcodec/x86/dirac_dwt.c new file mode 100644 index 0000000000..fbb25a417c --- /dev/null +++ b/libavcodec/x86/dirac_dwt.c @@ -0,0 +1,202 @@ +/* + * MMX optimized discrete wavelet transform + * Copyright (c) 2002-2004 Michael Niedermayer + * Copyright (c) 2010 David Conrad + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/x86/asm.h" +#include "dsputil_mmx.h" +#include "dirac_dwt.h" + +#define COMPOSE_VERTICAL(ext, align) \ +void ff_vertical_compose53iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); \ +void ff_vertical_compose_dirac53iH0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); \ +void ff_vertical_compose_dd137iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width); \ +void ff_vertical_compose_dd97iH0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width); \ +void ff_vertical_compose_haar##ext(IDWTELEM *b0, IDWTELEM *b1, int width); \ +void ff_horizontal_compose_haar0i##ext(IDWTELEM *b, IDWTELEM *tmp, int w);\ +void ff_horizontal_compose_haar1i##ext(IDWTELEM *b, IDWTELEM *tmp, int w);\ +\ +static void vertical_compose53iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width) \ +{ \ + int i, width_align = width&~(align-1); \ +\ + for(i=width_align; i>1;\ + int x= w2 - (w2&(align-1));\ + ff_horizontal_compose_haar0i##ext(b, tmp, w);\ +\ + for (; x < w2; x++) {\ + b[2*x ] = tmp[x];\ + b[2*x+1] = COMPOSE_HAARiH0(b[x+w2], tmp[x]);\ + }\ +}\ +static void horizontal_compose_haar1i##ext(IDWTELEM *b, IDWTELEM *tmp, int w)\ +{\ + int w2= w>>1;\ + int x= w2 - (w2&(align-1));\ + ff_horizontal_compose_haar1i##ext(b, tmp, w);\ +\ + for (; x < w2; x++) {\ + b[2*x ] = (tmp[x] + 1)>>1;\ + b[2*x+1] = (COMPOSE_HAARiH0(b[x+w2], tmp[x]) + 1)>>1;\ + }\ +}\ +\ + +#if HAVE_YASM +#if !ARCH_X86_64 +COMPOSE_VERTICAL(_mmx, 4) +#endif +COMPOSE_VERTICAL(_sse2, 8) + + +void ff_horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w); + +static void horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w) +{ + int w2= w>>1; + int x= w2 - (w2&7); + ff_horizontal_compose_dd97i_ssse3(b, tmp, w); + + for (; x < w2; x++) { + b[2*x ] = (tmp[x] + 1)>>1; + b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; + } +} +#endif + +void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) +{ +#if HAVE_YASM + int mm_flags = av_get_cpu_flags(); + +#if !ARCH_X86_64 + if (!(mm_flags & AV_CPU_FLAG_MMX)) + return; + + switch (type) { + case DWT_DIRAC_DD9_7: + d->vertical_compose_l0 = (void*)vertical_compose53iL0_mmx; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_mmx; + break; + case DWT_DIRAC_LEGALL5_3: + d->vertical_compose_l0 = (void*)vertical_compose53iL0_mmx; + d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0_mmx; + break; + case DWT_DIRAC_DD13_7: + d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0_mmx; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_mmx; + break; + case DWT_DIRAC_HAAR0: + d->vertical_compose = (void*)vertical_compose_haar_mmx; + d->horizontal_compose = horizontal_compose_haar0i_mmx; + break; + case DWT_DIRAC_HAAR1: + d->vertical_compose = (void*)vertical_compose_haar_mmx; + d->horizontal_compose = horizontal_compose_haar1i_mmx; + break; + } +#endif + + if (!(mm_flags & AV_CPU_FLAG_SSE2)) + return; + + switch (type) { + case DWT_DIRAC_DD9_7: + d->vertical_compose_l0 = (void*)vertical_compose53iL0_sse2; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_sse2; + break; + case DWT_DIRAC_LEGALL5_3: + d->vertical_compose_l0 = (void*)vertical_compose53iL0_sse2; + d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0_sse2; + break; + case DWT_DIRAC_DD13_7: + d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0_sse2; + d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_sse2; + break; + case DWT_DIRAC_HAAR0: + d->vertical_compose = (void*)vertical_compose_haar_sse2; + d->horizontal_compose = horizontal_compose_haar0i_sse2; + break; + case DWT_DIRAC_HAAR1: + d->vertical_compose = (void*)vertical_compose_haar_sse2; + d->horizontal_compose = horizontal_compose_haar1i_sse2; + break; + } + + if (!(mm_flags & AV_CPU_FLAG_SSSE3)) + return; + + switch (type) { + case DWT_DIRAC_DD9_7: + d->horizontal_compose = horizontal_compose_dd97i_ssse3; + break; + } +#endif // HAVE_YASM +} diff --git a/libavcodec/x86/dirac_dwt.h b/libavcodec/x86/dirac_dwt.h new file mode 100644 index 0000000000..126b29029f --- /dev/null +++ b/libavcodec/x86/dirac_dwt.h @@ -0,0 +1,30 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_X86_DIRAC_DWT_H +#define AVCODEC_X86_DIRAC_DWT_H + +#include "libavcodec/dirac_dwt.h" + +void ff_horizontal_compose_dd97i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); +void ff_horizontal_compose_haar1i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); +void ff_horizontal_compose_haar0i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); + +void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type); + +#endif diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dwt.c deleted file mode 100644 index e718c80fef..0000000000 --- a/libavcodec/x86/dwt.c +++ /dev/null @@ -1,202 +0,0 @@ -/* - * MMX optimized discrete wavelet transform - * Copyright (c) 2002-2004 Michael Niedermayer - * Copyright (c) 2010 David Conrad - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavutil/x86/asm.h" -#include "dsputil_mmx.h" -#include "dwt.h" - -#define COMPOSE_VERTICAL(ext, align) \ -void ff_vertical_compose53iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); \ -void ff_vertical_compose_dirac53iH0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width); \ -void ff_vertical_compose_dd137iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width); \ -void ff_vertical_compose_dd97iH0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, IDWTELEM *b3, IDWTELEM *b4, int width); \ -void ff_vertical_compose_haar##ext(IDWTELEM *b0, IDWTELEM *b1, int width); \ -void ff_horizontal_compose_haar0i##ext(IDWTELEM *b, IDWTELEM *tmp, int w);\ -void ff_horizontal_compose_haar1i##ext(IDWTELEM *b, IDWTELEM *tmp, int w);\ -\ -static void vertical_compose53iL0##ext(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, int width) \ -{ \ - int i, width_align = width&~(align-1); \ -\ - for(i=width_align; i>1;\ - int x= w2 - (w2&(align-1));\ - ff_horizontal_compose_haar0i##ext(b, tmp, w);\ -\ - for (; x < w2; x++) {\ - b[2*x ] = tmp[x];\ - b[2*x+1] = COMPOSE_HAARiH0(b[x+w2], tmp[x]);\ - }\ -}\ -static void horizontal_compose_haar1i##ext(IDWTELEM *b, IDWTELEM *tmp, int w)\ -{\ - int w2= w>>1;\ - int x= w2 - (w2&(align-1));\ - ff_horizontal_compose_haar1i##ext(b, tmp, w);\ -\ - for (; x < w2; x++) {\ - b[2*x ] = (tmp[x] + 1)>>1;\ - b[2*x+1] = (COMPOSE_HAARiH0(b[x+w2], tmp[x]) + 1)>>1;\ - }\ -}\ -\ - -#if HAVE_YASM -#if !ARCH_X86_64 -COMPOSE_VERTICAL(_mmx, 4) -#endif -COMPOSE_VERTICAL(_sse2, 8) - - -void ff_horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w); - -static void horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w) -{ - int w2= w>>1; - int x= w2 - (w2&7); - ff_horizontal_compose_dd97i_ssse3(b, tmp, w); - - for (; x < w2; x++) { - b[2*x ] = (tmp[x] + 1)>>1; - b[2*x+1] = (COMPOSE_DD97iH0(tmp[x-1], tmp[x], b[x+w2], tmp[x+1], tmp[x+2]) + 1)>>1; - } -} -#endif - -void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) -{ -#if HAVE_YASM - int mm_flags = av_get_cpu_flags(); - -#if !ARCH_X86_64 - if (!(mm_flags & AV_CPU_FLAG_MMX)) - return; - - switch (type) { - case DWT_DIRAC_DD9_7: - d->vertical_compose_l0 = (void*)vertical_compose53iL0_mmx; - d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_mmx; - break; - case DWT_DIRAC_LEGALL5_3: - d->vertical_compose_l0 = (void*)vertical_compose53iL0_mmx; - d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0_mmx; - break; - case DWT_DIRAC_DD13_7: - d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0_mmx; - d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_mmx; - break; - case DWT_DIRAC_HAAR0: - d->vertical_compose = (void*)vertical_compose_haar_mmx; - d->horizontal_compose = horizontal_compose_haar0i_mmx; - break; - case DWT_DIRAC_HAAR1: - d->vertical_compose = (void*)vertical_compose_haar_mmx; - d->horizontal_compose = horizontal_compose_haar1i_mmx; - break; - } -#endif - - if (!(mm_flags & AV_CPU_FLAG_SSE2)) - return; - - switch (type) { - case DWT_DIRAC_DD9_7: - d->vertical_compose_l0 = (void*)vertical_compose53iL0_sse2; - d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_sse2; - break; - case DWT_DIRAC_LEGALL5_3: - d->vertical_compose_l0 = (void*)vertical_compose53iL0_sse2; - d->vertical_compose_h0 = (void*)vertical_compose_dirac53iH0_sse2; - break; - case DWT_DIRAC_DD13_7: - d->vertical_compose_l0 = (void*)vertical_compose_dd137iL0_sse2; - d->vertical_compose_h0 = (void*)vertical_compose_dd97iH0_sse2; - break; - case DWT_DIRAC_HAAR0: - d->vertical_compose = (void*)vertical_compose_haar_sse2; - d->horizontal_compose = horizontal_compose_haar0i_sse2; - break; - case DWT_DIRAC_HAAR1: - d->vertical_compose = (void*)vertical_compose_haar_sse2; - d->horizontal_compose = horizontal_compose_haar1i_sse2; - break; - } - - if (!(mm_flags & AV_CPU_FLAG_SSSE3)) - return; - - switch (type) { - case DWT_DIRAC_DD9_7: - d->horizontal_compose = horizontal_compose_dd97i_ssse3; - break; - } -#endif // HAVE_YASM -} diff --git a/libavcodec/x86/dwt.h b/libavcodec/x86/dwt.h deleted file mode 100644 index 199f61175b..0000000000 --- a/libavcodec/x86/dwt.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_X86_DWT_H -#define AVCODEC_X86_DWT_H - -#include "libavcodec/dwt.h" - -void ff_horizontal_compose_dd97i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); -void ff_horizontal_compose_haar1i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); -void ff_horizontal_compose_haar0i_end_c(IDWTELEM *b, IDWTELEM *tmp, int w2, int x); - -void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type); - -#endif diff --git a/libavcodec/x86/snowdsp.c b/libavcodec/x86/snowdsp.c index 631291aafe..5505ee8bfd 100644 --- a/libavcodec/x86/snowdsp.c +++ b/libavcodec/x86/snowdsp.c @@ -23,7 +23,7 @@ #include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" #include "libavcodec/snow.h" -#include "libavcodec/dwt.h" +#include "libavcodec/snow_dwt.h" #include "dsputil_mmx.h" #if HAVE_INLINE_ASM @@ -875,7 +875,7 @@ static void ff_snow_inner_add_yblock_mmx(const uint8_t *obmc, const int obmc_str #endif /* HAVE_INLINE_ASM */ -void ff_dwt_init_x86(DWTContext *c) +void ff_dwt_init_x86(SnowDWTContext *c) { #if HAVE_INLINE_ASM int mm_flags = av_get_cpu_flags(); -- cgit v1.2.3