September 2007 - ffmpeg-cvslog

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r10562 - trunk/doc/TODO
by subversion＠mplayerhq.hu 01 Oct '07

01 Oct '07

Author: michael Date: Mon Sep 24 13:47:11 2007 New Revision: 10562 Log: remove done items Modified: trunk/doc/TODO Modified: trunk/doc/TODO ============================================================================== --- trunk/doc/TODO (original) +++ trunk/doc/TODO Mon Sep 24 13:47:11 2007 @@ -77,17 +77,13 @@ unassigned TODO: (unordered) - JPEG2000 decoder & encoder - MPEG4 GMC encoding support - macroblock based pixel format (better cache locality, somewhat complex, one paper claimed it faster for high res) -- NUT muxer -- seeking regression test - regression tests for codecs which do not have an encoder (I+P-frame bitstream in svn) - add support for using mplayers video filters to ffmpeg -- reverse engeneer RV30/RV40 - finish implementation of WMV2 j-picture - H264 encoder - per MB ratecontrol (so VCD and such do work better) - replace/rewrite libavcodec/fdctref.c - write a script which iteratively changes all functions between always_inline and noinline and benchmarks the result to find the best set of inlined functions -- set up roundup bugtracker somewhere with (newBug, reproduced, analyzed, fixed, worksForMe, duplicate, wontFix, invalid, needMoreInfo, newPatch, ok, applied, rejected, needChanges, newRequest, implemented, wontImplement, invalidReq) states and a checked integer - convert all the non SIMD asm into small asm vs. C testcases and submit them to the gcc devels so they can improve gcc - generic audio mixing API - extract PES packetizer from PS muxer and use it for new TS muxer

5 11

r10629 - trunk/ffserver.c
by subversion＠mplayerhq.hu 30 Sep '07

30 Sep '07

Author: diego Date: Sun Sep 30 06:09:10 2007 New Revision: 10629 Log: Remove redundant banner output from ffserver. patch by Stefano Sabatini, stefano.sabatini-lala poste it Date: Sat, 29 Sep 2007 13:45:12 +0200 Subject: [FFmpeg-devel] [PATCH] Remove redundant banner output from ffserver Modified: trunk/ffserver.c Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c (original) +++ trunk/ffserver.c Sun Sep 30 06:09:10 2007 @@ -4318,7 +4318,6 @@ static int parse_ffconfig(const char *fi static void show_help(void) { - show_banner(program_name, program_birth_year); printf("usage: ffserver [-L] [-h] [-f configfile]\n" "Hyper fast multi format Audio/Video streaming server\n" "\n" @@ -4375,7 +4374,6 @@ int main(int argc, char **argv) break; switch(c) { case 'L': - show_banner(program_name, program_birth_year); show_license(); exit(0); case '?':

1 0

r10628 - trunk/libavcodec/flacenc.c
by subversion＠mplayerhq.hu 30 Sep '07

30 Sep '07

Author: lorenm Date: Sun Sep 30 05:36:13 2007 New Revision: 10628 Log: simplify lpc Modified: trunk/libavcodec/flacenc.c Modified: trunk/libavcodec/flacenc.c ============================================================================== --- trunk/libavcodec/flacenc.c (original) +++ trunk/libavcodec/flacenc.c Sun Sep 30 05:36:13 2007 @@ -876,10 +876,10 @@ static void encode_residual_fixed(int32_ } #define LPC1(x) {\ - int s = smp[i-(x)+1];\ - p1 += c*s;\ - c = coefs[(x)-2];\ + int c = coefs[(x)-1];\ p0 += c*s;\ + s = smp[i-(x)+1];\ + p1 += c*s;\ } static av_always_inline void encode_residual_lpc_unrolled( @@ -888,9 +888,8 @@ static av_always_inline void encode_resi { int i; for(i=order; i<n; i+=2) { - int c = coefs[order-1]; - int p0 = c * smp[i-order]; - int p1 = 0; + int s = smp[i-order]; + int p0 = 0, p1 = 0; if(big) { switch(order) { case 32: LPC1(32) @@ -924,6 +923,7 @@ static av_always_inline void encode_resi LPC1( 4) LPC1( 3) LPC1( 2) + LPC1( 1) } } else { switch(order) { @@ -934,9 +934,9 @@ static av_always_inline void encode_resi case 4: LPC1( 4) case 3: LPC1( 3) case 2: LPC1( 2) + case 1: LPC1( 1) } } - p1 += c * smp[i]; res[i ] = smp[i ] - (p0 >> shift); res[i+1] = smp[i+1] - (p1 >> shift); } @@ -952,16 +952,15 @@ static void encode_residual_lpc(int32_t #ifdef CONFIG_SMALL for(i=order; i<n; i+=2) { int j; - int32_t c = coefs[0]; - int32_t p0 = 0, p1 = c*smp[i]; - for(j=1; j<order; j++) { - int32_t s = smp[i-j]; - p0 += c*s; - c = coefs[j]; + int s = smp[i]; + int p0 = 0, p1 = 0; + for(j=0; j<order; j++) { + int c = coefs[j]; p1 += c*s; + s = smp[i-j-1]; + p0 += c*s; } - p0 += c*smp[i-order]; - res[i+0] = smp[i+0] - (p0 >> shift); + res[i ] = smp[i ] - (p0 >> shift); res[i+1] = smp[i+1] - (p1 >> shift); } #else

1 0

r10627 - trunk/libavcodec/flac.c
by subversion＠mplayerhq.hu 30 Sep '07

30 Sep '07

Author: lorenm Date: Sun Sep 30 05:01:56 2007 New Revision: 10627 Log: 20% faster lpc, 6% overall flac decoding Modified: trunk/libavcodec/flac.c Modified: trunk/libavcodec/flac.c ============================================================================== --- trunk/libavcodec/flac.c (original) +++ trunk/libavcodec/flac.c Sun Sep 30 05:01:56 2007 @@ -315,6 +315,7 @@ static int decode_subframe_lpc(FLACConte int i, j; int coeff_prec, qlevel; int coeffs[pred_order]; + int32_t *decoded = s->decoded[channel]; // av_log(s->avctx, AV_LOG_DEBUG, " SUBFRAME LPC\n"); @@ -323,8 +324,8 @@ static int decode_subframe_lpc(FLACConte for (i = 0; i < pred_order; i++) { - s->decoded[channel][i] = get_sbits(&s->gb, s->curr_bps); -// av_log(s->avctx, AV_LOG_DEBUG, " %d: %d\n", i, s->decoded[channel][i]); + decoded[i] = get_sbits(&s->gb, s->curr_bps); +// av_log(s->avctx, AV_LOG_DEBUG, " %d: %d\n", i, decoded[i]); } coeff_prec = get_bits(&s->gb, 4) + 1; @@ -356,32 +357,34 @@ static int decode_subframe_lpc(FLACConte { sum = 0; for (j = 0; j < pred_order; j++) - sum += (int64_t)coeffs[j] * s->decoded[channel][i-j-1]; - s->decoded[channel][i] += sum >> qlevel; + sum += (int64_t)coeffs[j] * decoded[i-j-1]; + decoded[i] += sum >> qlevel; } } else { for (i = pred_order; i < s->blocksize-1; i += 2) { - int c = coeffs[pred_order-1]; - int s0 = c * s->decoded[channel][i-pred_order]; - int s1 = 0; + int c; + int d = decoded[i-pred_order]; + int s0 = 0, s1 = 0; for (j = pred_order-1; j > 0; j--) { - int d = s->decoded[channel][i-j]; - s1 += c*d; - c = coeffs[j-1]; + c = coeffs[j]; s0 += c*d; + d = decoded[i-j]; + s1 += c*d; } - s0 = s->decoded[channel][i] += s0 >> qlevel; - s1 += c * s0; - s->decoded[channel][i+1] += s1 >> qlevel; + c = coeffs[0]; + s0 += c*d; + d = decoded[i] += s0 >> qlevel; + s1 += c*d; + decoded[i+1] += s1 >> qlevel; } if (i < s->blocksize) { int sum = 0; for (j = 0; j < pred_order; j++) - sum += coeffs[j] * s->decoded[channel][i-j-1]; - s->decoded[channel][i] += sum >> qlevel; + sum += coeffs[j] * decoded[i-j-1]; + decoded[i] += sum >> qlevel; } }

1 0

r10626 - trunk/libavcodec/flac.c
by subversion＠mplayerhq.hu 30 Sep '07

30 Sep '07

Author: lorenm Date: Sun Sep 30 04:12:03 2007 New Revision: 10626 Log: replace FIR with finite differences. 3x faster decode_subframe_fixed(). overall flac decoding: 10% faster if file was encoded with fixed predictors. Modified: trunk/libavcodec/flac.c Modified: trunk/libavcodec/flac.c ============================================================================== --- trunk/libavcodec/flac.c (original) +++ trunk/libavcodec/flac.c Sun Sep 30 04:12:03 2007 @@ -259,7 +259,9 @@ static int decode_residuals(FLACContext static int decode_subframe_fixed(FLACContext *s, int channel, int pred_order) { - int i; + const int blocksize = s->blocksize; + int32_t *decoded = s->decoded[channel]; + int a, b, c, d, i; // av_log(s->avctx, AV_LOG_DEBUG, " SUBFRAME FIXED\n"); @@ -268,38 +270,37 @@ static int decode_subframe_fixed(FLACCon for (i = 0; i < pred_order; i++) { - s->decoded[channel][i] = get_sbits(&s->gb, s->curr_bps); + decoded[i] = get_sbits(&s->gb, s->curr_bps); // av_log(s->avctx, AV_LOG_DEBUG, " %d: %d\n", i, s->decoded[channel][i]); } if (decode_residuals(s, channel, pred_order) < 0) return -1; + a = decoded[pred_order-1]; + b = a - decoded[pred_order-2]; + c = b - decoded[pred_order-2] + decoded[pred_order-3]; + d = c - decoded[pred_order-2] + 2*decoded[pred_order-3] - decoded[pred_order-4]; + switch(pred_order) { case 0: break; case 1: - for (i = pred_order; i < s->blocksize; i++) - s->decoded[channel][i] += s->decoded[channel][i-1]; + for (i = pred_order; i < blocksize; i++) + decoded[i] = a += decoded[i]; break; case 2: - for (i = pred_order; i < s->blocksize; i++) - s->decoded[channel][i] += 2*s->decoded[channel][i-1] - - s->decoded[channel][i-2]; + for (i = pred_order; i < blocksize; i++) + decoded[i] = a += b += decoded[i]; break; case 3: - for (i = pred_order; i < s->blocksize; i++) - s->decoded[channel][i] += 3*s->decoded[channel][i-1] - - 3*s->decoded[channel][i-2] - + s->decoded[channel][i-3]; + for (i = pred_order; i < blocksize; i++) + decoded[i] = a += b += c += decoded[i]; break; case 4: - for (i = pred_order; i < s->blocksize; i++) - s->decoded[channel][i] += 4*s->decoded[channel][i-1] - - 6*s->decoded[channel][i-2] - + 4*s->decoded[channel][i-3] - - s->decoded[channel][i-4]; + for (i = pred_order; i < blocksize; i++) + decoded[i] = a += b += c += d += decoded[i]; break; default: av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order);

1 0

r10625 - trunk/libavcodec/flacenc.c
by subversion＠mplayerhq.hu 29 Sep '07

29 Sep '07

Author: lorenm Date: Sun Sep 30 01:44:34 2007 New Revision: 10625 Log: unroll finite differences to avoid swapping registers. 1.5x faster encode_residual_fixed(). overall flac encoding: 3% faster at compression_levels 0-2. Modified: trunk/libavcodec/flacenc.c Modified: trunk/libavcodec/flacenc.c ============================================================================== --- trunk/libavcodec/flacenc.c (original) +++ trunk/libavcodec/flacenc.c Sun Sep 30 01:44:34 2007 @@ -841,33 +841,36 @@ static void encode_residual_fixed(int32_ res[i]= smp[i] - smp[i-1]; }else if(order==2){ int a = smp[order-1] - smp[order-2]; - for(i=order; i<n; i++) { + for(i=order; i<n; i+=2) { int b = smp[i] - smp[i-1]; res[i]= b - a; - a = b; + a = smp[i+1] - smp[i]; + res[i+1]= a - b; } }else if(order==3){ int a = smp[order-1] - smp[order-2]; int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; - for(i=order; i<n; i++) { + for(i=order; i<n; i+=2) { int b = smp[i] - smp[i-1]; int d = b - a; res[i]= d - c; - a = b; - c = d; + a = smp[i+1] - smp[i]; + c = a - b; + res[i+1]= c - d; } }else{ int a = smp[order-1] - smp[order-2]; int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; int e = smp[order-1] - 3*smp[order-2] + 3*smp[order-3] - smp[order-4]; - for(i=order; i<n; i++) { + for(i=order; i<n; i+=2) { int b = smp[i] - smp[i-1]; int d = b - a; int f = d - c; res[i]= f - e; - a = b; - c = d; - e = f; + a = smp[i+1] - smp[i]; + c = a - b; + e = c - d; + res[i+1]= e - f; } } }

1 0

r10624 - trunk/libavcodec/flacenc.c
by subversion＠mplayerhq.hu 29 Sep '07

29 Sep '07

Author: lorenm Date: Sun Sep 30 01:21:57 2007 New Revision: 10624 Log: encode_residual_fixed(): replace FIR with finite differences. 4x faster order 2, 3.5x order 3, 3x order 4. overall flac encoding: 35% faster at compression_levels 0-2, no effect at higher levels. Modified: trunk/libavcodec/flacenc.c Modified: trunk/libavcodec/flacenc.c ============================================================================== --- trunk/libavcodec/flacenc.c (original) +++ trunk/libavcodec/flacenc.c Sun Sep 30 01:21:57 2007 @@ -840,14 +840,35 @@ static void encode_residual_fixed(int32_ for(i=order; i<n; i++) res[i]= smp[i] - smp[i-1]; }else if(order==2){ - for(i=order; i<n; i++) - res[i]= smp[i] - 2*smp[i-1] + smp[i-2]; + int a = smp[order-1] - smp[order-2]; + for(i=order; i<n; i++) { + int b = smp[i] - smp[i-1]; + res[i]= b - a; + a = b; + } }else if(order==3){ - for(i=order; i<n; i++) - res[i]= smp[i] - 3*smp[i-1] + 3*smp[i-2] - smp[i-3]; + int a = smp[order-1] - smp[order-2]; + int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; + for(i=order; i<n; i++) { + int b = smp[i] - smp[i-1]; + int d = b - a; + res[i]= d - c; + a = b; + c = d; + } }else{ - for(i=order; i<n; i++) - res[i]= smp[i] - 4*smp[i-1] + 6*smp[i-2] - 4*smp[i-3] + smp[i-4]; + int a = smp[order-1] - smp[order-2]; + int c = smp[order-1] - 2*smp[order-2] + smp[order-3]; + int e = smp[order-1] - 3*smp[order-2] + 3*smp[order-3] - smp[order-4]; + for(i=order; i<n; i++) { + int b = smp[i] - smp[i-1]; + int d = b - a; + int f = d - c; + res[i]= f - e; + a = b; + c = d; + e = f; + } } }

1 0

r10623 - trunk/libavformat/avidec.c
by subversion＠mplayerhq.hu 29 Sep '07

29 Sep '07

Author: diego Date: Sun Sep 30 00:47:34 2007 New Revision: 10623 Log: Add support for AMV variants of AVI files. patch by Vladimir Voroshilov, voroshil gmail com Date: Sun, 30 Sep 2007 00:30:34 +0700 Subject: Re: [FFmpeg-devel] [PATCH] Demuxer for AMV files Modified: trunk/libavformat/avidec.c Modified: trunk/libavformat/avidec.c ============================================================================== --- trunk/libavformat/avidec.c (original) +++ trunk/libavformat/avidec.c Sun Sep 30 00:47:34 2007 @@ -62,6 +62,7 @@ static const char avi_headers[][8] = { { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 'X' }, { 'R', 'I', 'F', 'F', 'A', 'V', 'I', 0x19}, { 'O', 'N', '2', ' ', 'O', 'N', '2', 'f' }, + { 'R', 'I', 'F', 'F', 'A', 'M', 'V', ' ' }, { 0 } }; @@ -232,6 +233,8 @@ static int avi_read_header(AVFormatConte AVStream *st; AVIStream *ast = NULL; char str_track[4]; + int avih_width=0, avih_height=0; + int amv_file_format=0; avi->stream_index= -1; @@ -276,6 +279,8 @@ static int avi_read_header(AVFormatConte avi->is_odml = 1; url_fskip(pb, size + (size & 1)); break; + case MKTAG('a', 'm', 'v', 'h'): + amv_file_format=1; case MKTAG('a', 'v', 'i', 'h'): /* avi header */ /* using frame_period is bad idea */ @@ -286,8 +291,11 @@ static int avi_read_header(AVFormatConte url_fskip(pb, 2 * 4); get_le32(pb); + get_le32(pb); + avih_width=get_le32(pb); + avih_height=get_le32(pb); - url_fskip(pb, size - 7 * 4); + url_fskip(pb, size - 10 * 4); break; case MKTAG('s', 't', 'r', 'h'): /* stream header */ @@ -309,6 +317,8 @@ static int avi_read_header(AVFormatConte goto fail; st->priv_data = ast; } + if(amv_file_format) + tag1 = stream_index ? MKTAG('a','u','d','s') : MKTAG('v','i','d','s'); #ifdef DEBUG print_tag("strh", tag1, -1); @@ -416,6 +426,14 @@ static int avi_read_header(AVFormatConte st = s->streams[stream_index]; switch(codec_type) { case CODEC_TYPE_VIDEO: + if(amv_file_format){ + st->codec->width=avih_width; + st->codec->height=avih_height; + st->codec->codec_type = CODEC_TYPE_VIDEO; + st->codec->codec_id = CODEC_ID_AMV; + url_fskip(pb, size); + break; + } get_le32(pb); /* size */ st->codec->width = get_le32(pb); st->codec->height = get_le32(pb); @@ -486,6 +504,8 @@ static int avi_read_header(AVFormatConte st->codec->codec_id = CODEC_ID_XAN_DPCM; st->codec->codec_tag = 0; } + if (amv_file_format) + st->codec->codec_id = CODEC_ID_ADPCM_IMA_AMV; break; default: st->codec->codec_type = CODEC_TYPE_DATA;

1 0

r10622 - trunk/Changelog
by subversion＠mplayerhq.hu 29 Sep '07

29 Sep '07

Author: diego Date: Sun Sep 30 00:33:24 2007 New Revision: 10622 Log: Mention SPARC optimizations. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog (original) +++ trunk/Changelog Sun Sep 30 00:33:24 2007 @@ -95,6 +95,7 @@ version <next> - Matroska muxer - Slice-based parallel H.264 decoding - Monkey's Audio demuxer and decoder +- additional SPARC (VIS) optimizations - AMV audio and video decoder version 0.4.9-pre1:

1 0