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

rfc: swscale-example weird output
by Keiji Costantini 03 Jul '08

03 Jul '08

I pulled out getcoeff() from initFilter(), as a step for simplify the code. The patch attached is the relevant part. This patch changes output of swscale-example for example: - yuv420p 96x96 -> rgb565 64x 64 flags=32 SSD= 79, 983, 746 + yuv420p 96x96 -> rgb565 64x 64 flags=32 SSD= 77, 980, 738 only a (relative) small number of lines are affected, but it's nonetheless strange that moving code makes different output. Does anyone have any idea about how this can happens? -- Keiji Costantini diff --git a/swscale.c b/swscale.c index dce28f2..32bcba1 100644 --- a/swscale.c +++ b/swscale.c @@ -891,6 +891,77 @@ static inline void x86_meminit(int flags){ } #endif /* defined(ARCH_X86) */ +static inline double getcoeff(int flags, double *param, double d, const int xInc1){ + double coeff; + if (flags & SWS_BICUBIC) + { + double B= param[0] != SWS_PARAM_DEFAULT ? param[0] : 0.0; + double C= param[1] != SWS_PARAM_DEFAULT ? param[1] : 0.6; + + if (d<1.0) + coeff = (12-9*B-6*C)*d*d*d + (-18+12*B+6*C)*d*d + 6-2*B; + else if (d<2.0) + coeff = (-B-6*C)*d*d*d + (6*B+30*C)*d*d + (-12*B-48*C)*d +8*B+24*C; + else + coeff=0.0; + } +/* else if (flags & SWS_X) + { + double p= param ? param*0.01 : 0.3; + coeff = d ? sin(d*PI)/(d*PI) : 1.0; + coeff*= pow(2.0, - p*d*d); + }*/ + else if (flags & SWS_X) + { + double A= param[0] != SWS_PARAM_DEFAULT ? param[0] : 1.0; + + if (d<1.0) + coeff = cos(d*PI); + else + coeff=-1.0; + if (coeff<0.0) coeff= -pow(-coeff, A); + else coeff= pow( coeff, A); + coeff= coeff*0.5 + 0.5; + } + else if (flags & SWS_AREA) + { + double srcPixelSize= 1.0/xInc1; + if (d + srcPixelSize/2 < 0.5) coeff= 1.0; + else if (d - srcPixelSize/2 < 0.5) coeff= (0.5-d)/srcPixelSize + 0.5; + else coeff=0.0; + } + else if (flags & SWS_GAUSS) + { + double p= param[0] != SWS_PARAM_DEFAULT ? param[0] : 3.0; + coeff = pow(2.0, - p*d*d); + } + else if (flags & SWS_SINC) + { + coeff = d ? sin(d*PI)/(d*PI) : 1.0; + } + else if (flags & SWS_LANCZOS) + { + double p= param[0] != SWS_PARAM_DEFAULT ? param[0] : 3.0; + coeff = d ? sin(d*PI)*sin(d*PI/p)/(d*d*PI*PI/p) : 1.0; + if (d>p) coeff=0; + } + else if (flags & SWS_BILINEAR) + { + coeff= 1.0 - d; + if (coeff<0) coeff=0; + } + else if (flags & SWS_SPLINE) + { + double p=-2.196152422706632; + coeff = getSplineCoeff(1.0, 0.0, p, -p-1.0, d); + } + else { + coeff= 0.0; //GCC warning killer + ASSERT(0) + } + return coeff; +} + static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSize, int xInc, int srcW, int dstW, int filterAlign, int one, int flags, SwsVector *srcFilter, SwsVector *dstFilter, double param[2]) @@ -1003,6 +1074,7 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF for (j=0; j<filterSize; j++) { double d= FFABS(xx - xDstInSrc)/filterSizeInSrc*sizeFactor; +#if 0 double coeff; if (flags & SWS_BICUBIC) { @@ -1072,6 +1144,8 @@ static inline int initFilter(int16_t **outFilter, int16_t **filterPos, int *outF } filter[i*filterSize + j]= coeff; +#endif + filter[i*filterSize + j]= getcoeff( flags, param, d, xInc1); xx++; } xDstInSrc+= xInc1;

4 7

Request for a svn soc account
by zhentan feng 02 Jul '08

02 Jul '08

Hi, I am maintaining MXF mux code on git and show the changes at http://gitorious.org/projects/ffmpeg/repos/FFmpeg-clone-MXF-muxer. Now I want switch it to soc svn, could I have a account? username: zhentan Feng -- Best wishes~

4 8

[soc]: r2552 - mlp/mlpdec.c
by ramiro 02 Jul '08

02 Jul '08

Author: ramiro Date: Sun Jun 22 20:02:56 2008 New Revision: 2552 Log: Copy IIR precision to FIR if only IIR is used, since the filtering code always uses the FIR precision. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Sun Jun 22 20:02:56 2008 @@ -685,6 +685,11 @@ static int read_decoding_params(MLPDecod "FIR and IIR filters must use same precision\n"); return -1; } + /* Both filters must have the same precision, so the filtering + * code always use the FIR precision. If only IIR is used, we copy + * its precision to FIR. */ + if (!m->filter_order[ch][FIR] && m->filter_order[ch][IIR]) + m->filter_coeff_q[ch][FIR] = m->filter_coeff_q[ch][IIR]; if (m->param_presence_flags[substr] & PARAM_HUFFOFFSET) if (get_bits1(gbp))

3 5

[soc]: r2593 - aacenc/checkout.sh
by superdump 01 Jul '08

01 Jul '08

Author: superdump Date: Mon Jun 30 11:06:40 2008 New Revision: 2593 Log: Add checkout script to make life easier for peoples Added: aacenc/checkout.sh (contents, props changed) Added: aacenc/checkout.sh ============================================================================== --- (empty file) +++ aacenc/checkout.sh Mon Jun 30 11:06:40 2008 @@ -0,0 +1,18 @@ +echo "Checking out FFmpeg SVN trunk code..." +svn co svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg && \ +cd ffmpeg + +echo "Patching build system" +patch -p1 < ../aac_enc.patch && \ +cd libavcodec + +echo "Copying and downloading source code to libavcodec dir" +cp ../../aacenc.c . +cp ../../aacpsy.c . +cp ../../aacpsy.h . + +cd ../.. +svn co svn://svn.mplayerhq.hu/soc/aac +cp aac/aactab.h ffmpeg/libavcodec/. + +echo "Done! Now enter the ffmpeg dir, configure and make FFmpeg and enjoy the AAC encoder! :)"

4 4

[soc]: r2606 - mlp/mlpdec.c
by ramiro 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 01:54:25 2008 New Revision: 2606 Log: Try decoding next substr if one fails instead of bailing out. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Tue Jul 1 01:54:25 2008 @@ -1065,7 +1065,7 @@ static int read_access_unit(AVCodecConte if (get_bits1(&gb)) { /* A restart header should be present */ if (read_restart_header(m, &gb, buf, substr) < 0) - goto error; + goto next_substr; m->restart_seen[substr] = 1; } @@ -1073,18 +1073,18 @@ static int read_access_unit(AVCodecConte av_log(m->avctx, AV_LOG_ERROR, "No restart header present in substream %d.\n", substr); - goto error; + goto next_substr; } if (read_decoding_params(m, &gb, substr) < 0) - goto error; + goto next_substr; } if (!m->restart_seen[substr]) { av_log(m->avctx, AV_LOG_ERROR, "No restart header present in substream %d.\n", substr); - goto error; + goto next_substr; } if (read_block_data(m, &gb, substr) < 0) @@ -1127,6 +1127,7 @@ static int read_access_unit(AVCodecConte return -1; } +next_substr: buf += substream_data_len[substr]; }

1 0

[soc]: r2605 - mlp/mlpdec.c
by ramiro 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 01:49:01 2008 New Revision: 2605 Log: Warn user about untested feature. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Tue Jul 1 01:49:01 2008 @@ -757,9 +757,11 @@ static int read_block_data(MLPDecodeCont { unsigned int i, mat, ch, expected_stream_pos = 0; - if (m->data_check_present[substr]) + if (m->data_check_present[substr]) { expected_stream_pos = get_bits_count(gbp) + get_bits(gbp, 16); - /* UNTESTED - find an example stream */ + av_log(m->avctx, AV_LOG_WARNING, "This file contains some features " + "we have not tested yet. %s\n", sample_message); + } if (m->blockpos[substr] + m->blocksize[substr] > m->access_unit_size) { av_log(m->avctx, AV_LOG_ERROR, "Too many audio samples in frame\n");

1 0

[soc]: r2604 - mlp/mlpdec.c
by ramiro 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 01:07:32 2008 New Revision: 2604 Log: There's no more need to clear min max matrix channel on error. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Tue Jul 1 01:07:32 2008 @@ -433,8 +433,6 @@ static int read_restart_header(MLPDecode if (m->min_channel[substr] > m->max_channel[substr]) { av_log(m->avctx, AV_LOG_ERROR, "Substream min channel cannot be greater than max channel.\n"); - m->min_channel[substr] = m->max_channel[substr] - = m->max_matrix_channel[substr] = 0; return -1; }

1 0

[soc]: r2603 - mlp/mlpdec.c
by ramiro 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 01:00:22 2008 New Revision: 2603 Log: Cosmetics: align vertically. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Tue Jul 1 01:00:22 2008 @@ -549,7 +549,7 @@ static int read_filter_params(MLPDecodeC m->filter_coeff_q[channel][filter] = get_bits(gbp, 4); - coeff_bits = get_bits(gbp, 5); + coeff_bits = get_bits(gbp, 5); coeff_shift = get_bits(gbp, 3); if (coeff_bits < 1 || coeff_bits > 16) { av_log(m->avctx, AV_LOG_ERROR,

1 0

[soc]: r2602 - mlp/mlpdec.c
by ramiro 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 00:59:49 2008 New Revision: 2602 Log: Remove unneeded brackets. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Tue Jul 1 00:59:49 2008 @@ -657,14 +657,13 @@ static int read_decoding_params(MLPDecod } if (m->param_presence_flags[substr] & PARAM_OUTSHIFT) - if (get_bits1(gbp)) { + if (get_bits1(gbp)) for (ch = 0; ch <= m->max_matrix_channel[substr]; ch++) { m->output_shift[substr][ch] = get_bits(gbp, 4); dprintf(m->avctx, "output shift[%d] = %d\n", ch, m->output_shift[substr][ch]); /* TODO: validate */ } - } if (m->param_presence_flags[substr] & PARAM_QUANTSTEP) if (get_bits1(gbp))

1 0

[soc]: r2601 - mlp/mlpdec.c
by ramiro 01 Jul '08

01 Jul '08

Author: ramiro Date: Tue Jul 1 00:57:50 2008 New Revision: 2601 Log: No need to clear matrix_ch in case of error. Modified: mlp/mlpdec.c Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c (original) +++ mlp/mlpdec.c Tue Jul 1 00:57:50 2008 @@ -629,7 +629,6 @@ static int read_decoding_params(MLPDecod av_log(m->avctx, AV_LOG_ERROR, "Invalid channel %d specified as output from matrix\n", m->matrix_ch[substr][mat]); - m->matrix_ch[substr][mat] = 0; return -1; } if (frac_bits > 14) {

1 0