November 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r3838 - libavfilter/diffs/README
by stefano 30 Nov '08

30 Nov '08

Author: stefano Date: Sun Nov 30 09:45:12 2008 New Revision: 3838 Log: Remove the diffs/README file, outdated and not anymore useful. Removed: libavfilter/diffs/README

1 0

[soc]: r3837 - in rv40: ffmpeg-rv.patch rv40dsp.c
by kostya 22 Nov '08

22 Nov '08

Author: kostya Date: Sat Nov 22 13:22:09 2008 New Revision: 3837 Log: Add RV40-specific MC functions Added: rv40/rv40dsp.c Modified: rv40/ffmpeg-rv.patch Modified: rv40/ffmpeg-rv.patch ============================================================================== --- rv40/ffmpeg-rv.patch (original) +++ rv40/ffmpeg-rv.patch Sat Nov 22 13:22:09 2008 @@ -19,7 +19,7 @@ Index: libavcodec/Makefile OBJS-$(CONFIG_RV20_DECODER) += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_RV20_ENCODER) += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv30dsp.o rv34.o h264pred.o -+OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o h264pred.o ++OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv40dsp.o rv34.o h264pred.o OBJS-$(CONFIG_SGI_DECODER) += sgidec.o OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o @@ -27,22 +27,27 @@ Index: libavcodec/dsputil.c =================================================================== --- libavcodec/dsputil.c (revision 15802) +++ libavcodec/dsputil.c (working copy) -@@ -2743,6 +2743,8 @@ +@@ -2743,6 +2743,10 @@ /* H264 specific */ void ff_h264dspenc_init(DSPContext* c, AVCodecContext *avctx); +void ff_rv30dsp_init(DSPContext* c, AVCodecContext *avctx); + ++void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx); ++ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; int i; -@@ -4411,6 +4413,9 @@ +@@ -4411,6 +4413,12 @@ #if defined(CONFIG_H264_ENCODER) ff_h264dspenc_init(c,avctx); #endif +#if defined(CONFIG_RV30_DECODER) + ff_rv30dsp_init(c,avctx); +#endif ++#if defined(CONFIG_RV40_DECODER) ++ ff_rv40dsp_init(c,avctx); ++#endif c->put_mspel_pixels_tab[0]= put_mspel8_mc00_c; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c; @@ -50,7 +55,7 @@ Index: libavcodec/dsputil.h =================================================================== --- libavcodec/dsputil.h (revision 15802) +++ libavcodec/dsputil.h (working copy) -@@ -467,6 +467,10 @@ +@@ -467,6 +467,14 @@ void (*x8_setup_spatial_compensation)(uint8_t *src, uint8_t *dst, int linesize, int * range, int * sum, int edges); @@ -58,6 +63,10 @@ Index: libavcodec/dsputil.h + qpel_mc_func put_rv30_tpel_pixels_tab[4][16]; + qpel_mc_func avg_rv30_tpel_pixels_tab[4][16]; + ++ /* rv40 functions */ ++ qpel_mc_func put_rv40_qpel_pixels_tab[4][16]; ++ qpel_mc_func avg_rv40_qpel_pixels_tab[4][16]; ++ /* ape functions */ /** * Add contents of the second vector to the first one. Added: rv40/rv40dsp.c ============================================================================== --- (empty file) +++ rv40/rv40dsp.c Sat Nov 22 13:22:09 2008 @@ -0,0 +1,292 @@ +/* + * RV40 decoder motion compensation functions + * Copyright (c) 2008 Konstantin Shishkov + * + * 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 + */ + +/** + * @file rv40dsp.c + * RV40 decoder motion compensation functions + */ + +#include "avcodec.h" +#include "dsputil.h" + +#define RV40_LOWPASS(OPNAME, OP) \ +static av_unused void OPNAME ## rv40_qpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ + const int h, const int C1, const int C2, const int C3){\ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + int i;\ + for(i=0; i<h; i++)\ + {\ + OP(dst[0], (src[-2] + src[ 3] - 5*(src[-1]+src[2]) + src[0]*C1 + src[1]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[1], (src[-1] + src[ 4] - 5*(src[ 0]+src[3]) + src[1]*C1 + src[2]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[2], (src[ 0] + src[ 5] - 5*(src[ 1]+src[4]) + src[2]*C1 + src[3]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[3], (src[ 1] + src[ 6] - 5*(src[ 2]+src[5]) + src[3]*C1 + src[4]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[4], (src[ 2] + src[ 7] - 5*(src[ 3]+src[6]) + src[4]*C1 + src[5]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[5], (src[ 3] + src[ 8] - 5*(src[ 4]+src[7]) + src[5]*C1 + src[6]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[6], (src[ 4] + src[ 9] - 5*(src[ 5]+src[8]) + src[6]*C1 + src[7]*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[7], (src[ 5] + src[10] - 5*(src[ 6]+src[9]) + src[7]*C1 + src[8]*C2 + (1<<(C3-1))) >> C3);\ + dst+=dstStride;\ + src+=srcStride;\ + }\ +}\ +\ +static void OPNAME ## rv40_qpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ + const int w, const int C1, const int C2, const int C3){\ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + int i;\ + for(i=0; i<w; i++)\ + {\ + const int srcB = src[-2*srcStride];\ + const int srcA = src[-1*srcStride];\ + const int src0 = src[0 *srcStride];\ + const int src1 = src[1 *srcStride];\ + const int src2 = src[2 *srcStride];\ + const int src3 = src[3 *srcStride];\ + const int src4 = src[4 *srcStride];\ + const int src5 = src[5 *srcStride];\ + const int src6 = src[6 *srcStride];\ + const int src7 = src[7 *srcStride];\ + const int src8 = src[8 *srcStride];\ + const int src9 = src[9 *srcStride];\ + const int src10= src[10*srcStride];\ + OP(dst[0*dstStride], (srcB + src3 - 5*(srcA+src2) + src0*C1 + src1*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[1*dstStride], (srcA + src4 - 5*(src0+src3) + src1*C1 + src2*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[2*dstStride], (src0 + src5 - 5*(src1+src4) + src2*C1 + src3*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[3*dstStride], (src1 + src6 - 5*(src2+src5) + src3*C1 + src4*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[4*dstStride], (src2 + src7 - 5*(src3+src6) + src4*C1 + src5*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[5*dstStride], (src3 + src8 - 5*(src4+src7) + src5*C1 + src6*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[6*dstStride], (src4 + src9 - 5*(src5+src8) + src6*C1 + src7*C2 + (1<<(C3-1))) >> C3);\ + OP(dst[7*dstStride], (src5 + src10 - 5*(src6+src9) + src7*C1 + src8*C2 + (1<<(C3-1))) >> C3);\ + dst++;\ + src++;\ + }\ +}\ +\ +static void OPNAME ## rv40_qpel8_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ + const int h=8;\ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ + int i;\ + for(i=0; i<h; i++)\ + {\ + OP(dst[0], (src[0] + src[1] + src[0 + srcStride] + src[1 + srcStride] + 2) >> 2);\ + OP(dst[1], (src[1] + src[2] + src[1 + srcStride] + src[2 + srcStride] + 2) >> 2);\ + OP(dst[2], (src[2] + src[3] + src[2 + srcStride] + src[3 + srcStride] + 2) >> 2);\ + OP(dst[3], (src[3] + src[4] + src[3 + srcStride] + src[4 + srcStride] + 2) >> 2);\ + OP(dst[4], (src[4] + src[5] + src[4 + srcStride] + src[5 + srcStride] + 2) >> 2);\ + OP(dst[5], (src[5] + src[6] + src[5 + srcStride] + src[6 + srcStride] + 2) >> 2);\ + OP(dst[6], (src[6] + src[7] + src[6 + srcStride] + src[7 + srcStride] + 2) >> 2);\ + OP(dst[7], (src[7] + src[8] + src[7 + srcStride] + src[8 + srcStride] + 2) >> 2);\ + dst+=dstStride;\ + src+=srcStride;\ + }\ +}\ +\ +static void OPNAME ## rv40_qpel16_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ + const int w, const int C1, const int C2, const int C3){\ + OPNAME ## rv40_qpel8_v_lowpass(dst , src , dstStride, srcStride, 8, C1, C2, C3);\ + OPNAME ## rv40_qpel8_v_lowpass(dst+8, src+8, dstStride, srcStride, 8, C1, C2, C3);\ + src += 8*srcStride;\ + dst += 8*dstStride;\ + OPNAME ## rv40_qpel8_v_lowpass(dst , src , dstStride, srcStride, w-8, C1, C2, C3);\ + OPNAME ## rv40_qpel8_v_lowpass(dst+8, src+8, dstStride, srcStride, w-8, C1, C2, C3);\ +}\ +\ +static void OPNAME ## rv40_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride,\ + const int h, const int C1, const int C2, const int C3){\ + OPNAME ## rv40_qpel8_h_lowpass(dst , src , dstStride, srcStride, 8, C1, C2, C3);\ + OPNAME ## rv40_qpel8_h_lowpass(dst+8, src+8, dstStride, srcStride, 8, C1, C2, C3);\ + src += 8*srcStride;\ + dst += 8*dstStride;\ + OPNAME ## rv40_qpel8_h_lowpass(dst , src , dstStride, srcStride, h-8, C1, C2, C3);\ + OPNAME ## rv40_qpel8_h_lowpass(dst+8, src+8, dstStride, srcStride, h-8, C1, C2, C3);\ +}\ +\ +static void OPNAME ## rv40_qpel16_hv_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride){\ + OPNAME ## rv40_qpel8_hv_lowpass(dst , src , dstStride, srcStride);\ + OPNAME ## rv40_qpel8_hv_lowpass(dst+8, src+8, dstStride, srcStride);\ + src += 8*srcStride;\ + dst += 8*dstStride;\ + OPNAME ## rv40_qpel8_hv_lowpass(dst , src , dstStride, srcStride);\ + OPNAME ## rv40_qpel8_hv_lowpass(dst+8, src+8, dstStride, srcStride);\ +}\ +\ + +#define RV40_MC(OPNAME, SIZE) \ +static void OPNAME ## rv40_qpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride, SIZE, 52, 20, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc20_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride, SIZE, 20, 20, 5);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc30_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride, SIZE, 20, 52, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc01_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, src, stride, stride, SIZE, 52, 20, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc11_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 52, 20, 6);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 52, 20, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc21_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 20, 5);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 52, 20, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc31_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 52, 6);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 52, 20, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc02_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, src, stride, stride, SIZE, 20, 20, 5);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc12_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 52, 20, 6);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 20, 5);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc22_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 20, 5);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 20, 5);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc32_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 52, 6);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 20, 5);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc03_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, src, stride, stride, SIZE, 20, 52, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc13_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 52, 20, 6);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 52, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc23_c(uint8_t *dst, uint8_t *src, int stride){\ + uint8_t full[SIZE*(SIZE+5)];\ + uint8_t * const full_mid= full + SIZE*2;\ + put_rv40_qpel ## SIZE ## _h_lowpass(full, src - 2*stride, SIZE, stride, SIZE+5, 20, 20, 5);\ + OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 52, 6);\ +}\ +\ +static void OPNAME ## rv40_qpel ## SIZE ## _mc33_c(uint8_t *dst, uint8_t *src, int stride){\ + OPNAME ## rv40_qpel ## SIZE ## _hv_lowpass(dst, src, stride, stride);\ +}\ +\ + +#define op_avg(a, b) a = (((a)+cm[b]+1)>>1) +#define op_put(a, b) a = cm[b] + +RV40_LOWPASS(put_ , op_put) +RV40_LOWPASS(avg_ , op_avg) +RV40_MC(put_, 8) +RV40_MC(put_, 16) +RV40_MC(avg_, 8) +RV40_MC(avg_, 16) + +void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx) { + c->put_rv40_qpel_pixels_tab[0][ 0] = c->put_h264_qpel_pixels_tab[0][0]; + c->put_rv40_qpel_pixels_tab[0][ 1] = put_rv40_qpel16_mc10_c; + c->put_rv40_qpel_pixels_tab[0][ 2] = put_rv40_qpel16_mc20_c; + c->put_rv40_qpel_pixels_tab[0][ 3] = put_rv40_qpel16_mc30_c; + c->put_rv40_qpel_pixels_tab[0][ 4] = put_rv40_qpel16_mc01_c; + c->put_rv40_qpel_pixels_tab[0][ 5] = put_rv40_qpel16_mc11_c; + c->put_rv40_qpel_pixels_tab[0][ 6] = put_rv40_qpel16_mc21_c; + c->put_rv40_qpel_pixels_tab[0][ 7] = put_rv40_qpel16_mc31_c; + c->put_rv40_qpel_pixels_tab[0][ 8] = put_rv40_qpel16_mc02_c; + c->put_rv40_qpel_pixels_tab[0][ 9] = put_rv40_qpel16_mc12_c; + c->put_rv40_qpel_pixels_tab[0][10] = put_rv40_qpel16_mc22_c; + c->put_rv40_qpel_pixels_tab[0][11] = put_rv40_qpel16_mc32_c; + c->put_rv40_qpel_pixels_tab[0][12] = put_rv40_qpel16_mc03_c; + c->put_rv40_qpel_pixels_tab[0][13] = put_rv40_qpel16_mc13_c; + c->put_rv40_qpel_pixels_tab[0][14] = put_rv40_qpel16_mc23_c; + c->put_rv40_qpel_pixels_tab[0][15] = put_rv40_qpel16_mc33_c; + c->avg_rv40_qpel_pixels_tab[0][ 0] = c->avg_h264_qpel_pixels_tab[0][0]; + c->avg_rv40_qpel_pixels_tab[0][ 1] = avg_rv40_qpel16_mc10_c; + c->avg_rv40_qpel_pixels_tab[0][ 2] = avg_rv40_qpel16_mc20_c; + c->avg_rv40_qpel_pixels_tab[0][ 3] = avg_rv40_qpel16_mc30_c; + c->avg_rv40_qpel_pixels_tab[0][ 4] = avg_rv40_qpel16_mc01_c; + c->avg_rv40_qpel_pixels_tab[0][ 5] = avg_rv40_qpel16_mc11_c; + c->avg_rv40_qpel_pixels_tab[0][ 6] = avg_rv40_qpel16_mc21_c; + c->avg_rv40_qpel_pixels_tab[0][ 7] = avg_rv40_qpel16_mc31_c; + c->avg_rv40_qpel_pixels_tab[0][ 8] = avg_rv40_qpel16_mc02_c; + c->avg_rv40_qpel_pixels_tab[0][ 9] = avg_rv40_qpel16_mc12_c; + c->avg_rv40_qpel_pixels_tab[0][10] = avg_rv40_qpel16_mc22_c; + c->avg_rv40_qpel_pixels_tab[0][11] = avg_rv40_qpel16_mc32_c; + c->avg_rv40_qpel_pixels_tab[0][12] = avg_rv40_qpel16_mc03_c; + c->avg_rv40_qpel_pixels_tab[0][13] = avg_rv40_qpel16_mc13_c; + c->avg_rv40_qpel_pixels_tab[0][14] = avg_rv40_qpel16_mc23_c; + c->avg_rv40_qpel_pixels_tab[0][15] = avg_rv40_qpel16_mc33_c; + c->put_rv40_qpel_pixels_tab[1][ 0] = c->put_h264_qpel_pixels_tab[1][0]; + c->put_rv40_qpel_pixels_tab[1][ 1] = put_rv40_qpel8_mc10_c; + c->put_rv40_qpel_pixels_tab[1][ 2] = put_rv40_qpel8_mc20_c; + c->put_rv40_qpel_pixels_tab[1][ 3] = put_rv40_qpel8_mc30_c; + c->put_rv40_qpel_pixels_tab[1][ 4] = put_rv40_qpel8_mc01_c; + c->put_rv40_qpel_pixels_tab[1][ 5] = put_rv40_qpel8_mc11_c; + c->put_rv40_qpel_pixels_tab[1][ 6] = put_rv40_qpel8_mc21_c; + c->put_rv40_qpel_pixels_tab[1][ 7] = put_rv40_qpel8_mc31_c; + c->put_rv40_qpel_pixels_tab[1][ 8] = put_rv40_qpel8_mc02_c; + c->put_rv40_qpel_pixels_tab[1][ 9] = put_rv40_qpel8_mc12_c; + c->put_rv40_qpel_pixels_tab[1][10] = put_rv40_qpel8_mc22_c; + c->put_rv40_qpel_pixels_tab[1][11] = put_rv40_qpel8_mc32_c; + c->put_rv40_qpel_pixels_tab[1][12] = put_rv40_qpel8_mc03_c; + c->put_rv40_qpel_pixels_tab[1][13] = put_rv40_qpel8_mc13_c; + c->put_rv40_qpel_pixels_tab[1][14] = put_rv40_qpel8_mc23_c; + c->put_rv40_qpel_pixels_tab[1][15] = put_rv40_qpel8_mc33_c; + c->avg_rv40_qpel_pixels_tab[1][ 0] = c->avg_h264_qpel_pixels_tab[1][0]; + c->avg_rv40_qpel_pixels_tab[1][ 1] = avg_rv40_qpel8_mc10_c; + c->avg_rv40_qpel_pixels_tab[1][ 2] = avg_rv40_qpel8_mc20_c; + c->avg_rv40_qpel_pixels_tab[1][ 3] = avg_rv40_qpel8_mc30_c; + c->avg_rv40_qpel_pixels_tab[1][ 4] = avg_rv40_qpel8_mc01_c; + c->avg_rv40_qpel_pixels_tab[1][ 5] = avg_rv40_qpel8_mc11_c; + c->avg_rv40_qpel_pixels_tab[1][ 6] = avg_rv40_qpel8_mc21_c; + c->avg_rv40_qpel_pixels_tab[1][ 7] = avg_rv40_qpel8_mc31_c; + c->avg_rv40_qpel_pixels_tab[1][ 8] = avg_rv40_qpel8_mc02_c; + c->avg_rv40_qpel_pixels_tab[1][ 9] = avg_rv40_qpel8_mc12_c; + c->avg_rv40_qpel_pixels_tab[1][10] = avg_rv40_qpel8_mc22_c; + c->avg_rv40_qpel_pixels_tab[1][11] = avg_rv40_qpel8_mc32_c; + c->avg_rv40_qpel_pixels_tab[1][12] = avg_rv40_qpel8_mc03_c; + c->avg_rv40_qpel_pixels_tab[1][13] = avg_rv40_qpel8_mc13_c; + c->avg_rv40_qpel_pixels_tab[1][14] = avg_rv40_qpel8_mc23_c; + c->avg_rv40_qpel_pixels_tab[1][15] = avg_rv40_qpel8_mc33_c; +}

1 0

[soc] [propchange]: r3836 - svn:log
by reynaldo 16 Nov '08

16 Nov '08

Author: reynaldo Revision: 3836 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -To give credit where credit is due. \ No newline at end of file +Credit Kenan Gillet for his contributions towards merging the SoC QCELP decoder.

1 0

QCELP more basic patches
by Kenan Gillet 16 Nov '08

16 Nov '08

Hi, the parser is unneeded for the current samples, so it can be dropped. see bottom of: http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-October/054554.html A corrections in the unpacking tables on typo, and the QCELP_RATE_8THR_BITMAP is in the reverse order. typo in qcelp_g12ga Kenan

1 0

[soc]: r3836 - in qcelp: qcelpdata.h qcelpdec.c
by reynaldo 16 Nov '08

16 Nov '08

Author: reynaldo Date: Sun Nov 16 02:01:54 2008 New Revision: 3836 Log: To give credit where credit is due. Modified: qcelp/qcelpdata.h qcelp/qcelpdec.c Modified: qcelp/qcelpdata.h ============================================================================== --- qcelp/qcelpdata.h (original) +++ qcelp/qcelpdata.h Sun Nov 16 02:01:54 2008 @@ -26,6 +26,7 @@ * @file qcelpdata.h * Data tables for the QCELP decoder * @author Reynaldo H. Verdejo Pinochet + * @remark FFmpeg merging spearheaded by Kenan Gillet */ typedef enum Modified: qcelp/qcelpdec.c ============================================================================== --- qcelp/qcelpdec.c (original) +++ qcelp/qcelpdec.c Sun Nov 16 02:01:54 2008 @@ -23,6 +23,7 @@ * @file qcelpdec.c * QCELP decoder * @author Reynaldo H. Verdejo Pinochet + * @remark FFmpeg merging spearheaded by Kenan Gillet */ #include <math.h>

1 0

[soc]: r3835 - qcelp/qcelpdata.h
by reynaldo 16 Nov '08

16 Nov '08

Author: reynaldo Date: Sun Nov 16 01:09:37 2008 New Revision: 3835 Log: Change to file description suggested by Michael Modified: qcelp/qcelpdata.h Modified: qcelp/qcelpdata.h ============================================================================== --- qcelp/qcelpdata.h (original) +++ qcelp/qcelpdata.h Sun Nov 16 01:09:37 2008 @@ -24,7 +24,7 @@ /** * @file qcelpdata.h - * QCELP decoder + * Data tables for the QCELP decoder * @author Reynaldo H. Verdejo Pinochet */

1 0

[soc]: r3833 - qcelp/qcelpdata.h
by reynaldo 15 Nov '08

15 Nov '08

Author: reynaldo Date: Sat Nov 15 16:32:02 2008 New Revision: 3833 Log: Patch by Kenan. Reorders rate enum Modified: qcelp/qcelpdata.h Modified: qcelp/qcelpdata.h ============================================================================== --- qcelp/qcelpdata.h (original) +++ qcelp/qcelpdata.h Sat Nov 15 16:32:02 2008 @@ -30,16 +30,16 @@ typedef enum { - RATE_FULL = 0, - RATE_HALF = 1, - RATE_QUARTER= 2, - RATE_OCTAVE = 3, - I_F_Q, /*!< insufficient frame quality */ + RATE_UNKNOWN = -2, + I_F_Q, /*!< insufficient frame quality */ BLANK, - RATE_UNKNOWN + RATE_OCTAVE, + RATE_QUARTER, + RATE_HALF, + RATE_FULL } qcelp_packet_rate; -static const uint16_t qcelp_bits_per_rate[]={266,124,54,20}; +static const uint16_t qcelp_bits_per_rate[]={0, 20, 54, 124, 266}; static const float qcelp_hammsinc_table[]={-0.006822, 0.041249,-0.143459, 0.588863, 0.588863,-0.143459, 0.041249,-0.006822};

3 2

[soc] [propchange]: r3833 - svn:log
by reynaldo 15 Nov '08

15 Nov '08

Author: reynaldo Revision: 3833 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Patch by Kenan. Reorders rate enum \ No newline at end of file +Reorders rate enum. Patch by Kenan Gillet.

1 0

[soc]: r3834 - qcelp/qcelpdec.c
by reynaldo 15 Nov '08

15 Nov '08

Author: reynaldo Date: Sat Nov 15 21:03:36 2008 New Revision: 3834 Log: Cosmetics Modified: qcelp/qcelpdec.c Modified: qcelp/qcelpdec.c ============================================================================== --- qcelp/qcelpdec.c (original) +++ qcelp/qcelpdec.c Sat Nov 15 21:03:36 2008 @@ -123,7 +123,7 @@ static void qcelp_decode_lspf(const QCEL * TIA/EIA/IS-733 2.4.6.2 */ static void qcelp_decode_params(AVCodecContext *avctx, uint16_t *cbseed, - float *gain, int *index, int *is_ifq) + float *gain, int *index, int *is_ifq) { int i, gs[16], g0[16], g1[16], predictor; const uint8_t *cbgain, *cbsign, *cindex, *data; @@ -254,7 +254,8 @@ static void qcelp_decode_params(AVCodecC * @param cnd_vector array for the generated scaled codebook vector */ static int qcelp_compute_svector(qcelp_packet_rate rate, const float *gain, - const int *index, uint16_t cbseed, float *cdn_vector) + const int *index, uint16_t cbseed, + float *cdn_vector) { int i,j; uint16_t new_cbseed; @@ -362,7 +363,7 @@ static float qcelp_compute_subframe_ener * @param scalefactors array to place the resulting four scalefactors */ static void qcelp_get_gain_scalefactors(const float *in, const float *out, - float *scalefactors) + float *scalefactors) { int i; @@ -517,7 +518,8 @@ static int qcelp_do_pitchfilter(QCELPCon * @param frame_num frame number in decoded stream */ void qcelp_do_interpolate_lspf(qcelp_packet_rate rate, float *prev_lspf, - float *curr_lspf, float *interpolated_lspf, int sample_num, int frame_num) + float *curr_lspf, float *interpolated_lspf, + int sample_num, int frame_num) { int i; float curr_weight, prev_weight; @@ -590,7 +592,7 @@ static void qcelp_convolve(float *v1, co memcpy(copy, v1, sizeof(copy)); dim=d1+d2-1; - for(i=0;i<dim;i++) + for(i=0; i<dim; i++) { v1[i]=0.0; for(j=0;j<=i;j++) @@ -668,7 +670,7 @@ static void qcelp_lsp2lpc(float *lspf, f * TIA/EIA/IS-733 2.4.3.1 (NOOOOT) */ static void qcelp_do_formant(float *in, float *out, float *lpc_coefs, - float *memory) + float *memory) { float tmp[50]; int i,j; @@ -710,7 +712,7 @@ static float qcelp_detilt(float z) } static int qcelp_decode_frame(AVCodecContext *avctx, void *data, - int *data_size, uint8_t *buf, int buf_size) + int *data_size, uint8_t *buf, int buf_size) { QCELPContext *q = avctx->priv_data; const QCELPBitmap *order = NULL;

1 0

[soc]: r3831 - qcelp/qcelp_glue.diff
by reynaldo 15 Nov '08

15 Nov '08

Author: reynaldo Date: Sat Nov 15 15:51:51 2008 New Revision: 3831 Log: Updating glue patch Modified: qcelp/qcelp_glue.diff Modified: qcelp/qcelp_glue.diff ============================================================================== --- qcelp/qcelp_glue.diff (original) +++ qcelp/qcelp_glue.diff Sat Nov 15 15:51:51 2008 @@ -1,52 +1,52 @@ Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 13648) +--- libavcodec/Makefile (revision 15802) +++ libavcodec/Makefile (working copy) -@@ -147,6 +147,7 @@ +@@ -155,6 +155,7 @@ OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o OBJS-$(CONFIG_PTX_DECODER) += ptx.o +OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o - OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mdct.o fft.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o + OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_QDRAW_DECODER) += qdrw.o OBJS-$(CONFIG_QPEG_DECODER) += qpeg.o -@@ -350,6 +351,7 @@ +@@ -362,6 +363,7 @@ OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o mpegaudiodecheader.o mpegaudiodata.o OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o +OBJS-$(CONFIG_QCELP_PARSER) += qcelp_parser.o OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o + OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o - OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o Index: libavcodec/allcodecs.c =================================================================== ---- libavcodec/allcodecs.c (revision 13648) +--- libavcodec/allcodecs.c (revision 15802) +++ libavcodec/allcodecs.c (working copy) -@@ -196,6 +196,7 @@ +@@ -203,6 +203,7 @@ REGISTER_DECODER (MPC7, mpc7); REGISTER_DECODER (MPC8, mpc8); - REGISTER_DECODER (NELLYMOSER, nellymoser); + REGISTER_ENCDEC (NELLYMOSER, nellymoser); + REGISTER_DECODER (QCELP, qcelp); REGISTER_DECODER (QDM2, qdm2); REGISTER_DECODER (RA_144, ra_144); REGISTER_DECODER (RA_288, ra_288); -@@ -309,6 +310,7 @@ +@@ -318,6 +319,7 @@ REGISTER_PARSER (MPEGAUDIO, mpegaudio); REGISTER_PARSER (MPEGVIDEO, mpegvideo); REGISTER_PARSER (PNM, pnm); + REGISTER_PARSER (QCELP, qcelp); REGISTER_PARSER (VC1, vc1); + REGISTER_PARSER (VP3, vp3); - /* bitstream filters */ Index: libavformat/mov.c =================================================================== ---- libavformat/mov.c (revision 13648) +--- libavformat/mov.c (revision 15802) +++ libavformat/mov.c (working copy) -@@ -945,6 +945,7 @@ - st->codec->channels= 1; /* really needed */ - break; +@@ -987,6 +987,7 @@ + #endif + /* no ifdef since parameters are always those */ case CODEC_ID_QCELP: + st->need_parsing = AVSTREAM_PARSE_FULL; case CODEC_ID_AMR_NB: + case CODEC_ID_AMR_WB: st->codec->frame_size= sc->samples_per_frame; - st->codec->sample_rate= 8000;

3 3