May 2008 - ffmpeg-cvslog - lists.ffmpeg.org

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

r12487 - trunk/configure
by subversion＠mplayerhq.hu 09 Mar '09

09 Mar '09

Author: diego Date: Tue Mar 18 13:32:55 2008 New Revision: 12487 Log: Check for and set HAVE_MMX2, it is used in several places. patch by Alexander Strange, astrange ithinksw com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Tue Mar 18 13:32:55 2008 @@ -699,6 +699,7 @@ ARCH_EXT_LIST=' iwmmxt mmi mmx + mmx2 ssse3 vis ' @@ -780,6 +781,7 @@ armv6_deps="armv4l" iwmmxt_deps="armv4l" mmi_deps="mips" mmx_deps="x86" +mmx2_deps="x86" ssse3_deps="x86" vis_deps="sparc" @@ -1517,8 +1519,9 @@ EOF # check wether EBX is available on x86 check_asm ebx_available '"":::"%ebx"' - # check whether binutils is new enough to compile SSSE3 + # check whether binutils is new enough to compile SSSE3/MMX2 enabled ssse3 && check_asm ssse3 '"pabsw %xmm0, %xmm0"' + enabled mmx2 && check_asm mmx2 '"movss %xmm0, %xmm0"' check_asm bswap '"bswap %%eax" ::: "%eax"' fi

4 4

r12894 - in trunk/libavcodec: aac_ac3_parser.c aac_ac3_parser.h aac_parser.c ac3_parser.c
by subversion＠mplayerhq.hu 22 Sep '08

22 Sep '08

Author: michael Date: Sat Apr 19 03:50:40 2008 New Revision: 12894 Log: Change aac and ac3 parsers to use ff_combine_frame(). Modified: trunk/libavcodec/aac_ac3_parser.c trunk/libavcodec/aac_ac3_parser.h trunk/libavcodec/aac_parser.c trunk/libavcodec/ac3_parser.c Modified: trunk/libavcodec/aac_ac3_parser.c ============================================================================== --- trunk/libavcodec/aac_ac3_parser.c (original) +++ trunk/libavcodec/aac_ac3_parser.c Sat Apr 19 03:50:40 2008 @@ -29,34 +29,40 @@ int ff_aac_ac3_parse(AVCodecParserContex const uint8_t *buf, int buf_size) { AACAC3ParseContext *s = s1->priv_data; - const uint8_t *buf_ptr; - int len; + ParseContext *pc = &s->pc; + int len, i; - *poutbuf = NULL; - *poutbuf_size = 0; + i=END_NOT_FOUND; + if(s->remaining_size <= buf_size){ + if(s->remaining_size){ + i= s->remaining_size; + s->remaining_size = 0; + }else{ //we need a header first + len=0; + for(i=s->remaining_size; i<buf_size; i++){ + s->state = (s->state<<8) + buf[i]; + if((len=s->sync(s->state, s))) + break; + } + if(len<=0){ + i=END_NOT_FOUND; + }else{ + i-= s->header_size -1; + s->remaining_size = len + i; + } + } + } - buf_ptr = buf; - while (buf_size > 0) { - int size_needed= s->frame_size ? s->frame_size : s->header_size; - len = s->inbuf_ptr - s->inbuf; + if(ff_combine_frame(pc, i, &buf, &buf_size)<0){ + s->remaining_size -= FFMIN(s->remaining_size, buf_size); + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } - if(len<size_needed){ - len = FFMIN(size_needed - len, buf_size); - memcpy(s->inbuf_ptr, buf_ptr, len); - buf_ptr += len; - s->inbuf_ptr += len; - buf_size -= len; - } + *poutbuf = buf; + *poutbuf_size = buf_size; - if (s->frame_size == 0) { - if ((s->inbuf_ptr - s->inbuf) == s->header_size) { - len = s->sync(s); - if (len == 0) { - /* no sync found : move by one byte (inefficient, but simple!) */ - memmove(s->inbuf, s->inbuf + 1, s->header_size - 1); - s->inbuf_ptr--; - } else { - s->frame_size = len; /* update codec info */ avctx->sample_rate = s->sample_rate; /* allow downmixing to stereo (or mono for AC3) */ @@ -71,17 +77,6 @@ int ff_aac_ac3_parse(AVCodecParserContex } avctx->bit_rate = s->bit_rate; avctx->frame_size = s->samples; - } - } - } else { - if(s->inbuf_ptr - s->inbuf == s->frame_size){ - *poutbuf = s->inbuf; - *poutbuf_size = s->frame_size; - s->inbuf_ptr = s->inbuf; - s->frame_size = 0; - break; - } - } - } - return buf_ptr - buf; + + return i; } Modified: trunk/libavcodec/aac_ac3_parser.h ============================================================================== --- trunk/libavcodec/aac_ac3_parser.h (original) +++ trunk/libavcodec/aac_ac3_parser.h Sat Apr 19 03:50:40 2008 @@ -27,16 +27,18 @@ #include "avcodec.h" typedef struct AACAC3ParseContext { - uint8_t *inbuf_ptr; int frame_size; int header_size; - int (*sync)(struct AACAC3ParseContext *hdr_info); - uint8_t inbuf[8192]; /* input buffer */ + int (*sync)(uint64_t state, struct AACAC3ParseContext *hdr_info); int channels; int sample_rate; int bit_rate; int samples; + + ParseContext pc; + int remaining_size; + uint64_t state; } AACAC3ParseContext; int ff_aac_ac3_parse(AVCodecParserContext *s1, Modified: trunk/libavcodec/aac_parser.c ============================================================================== --- trunk/libavcodec/aac_parser.c (original) +++ trunk/libavcodec/aac_parser.c Sat Apr 19 03:50:40 2008 @@ -27,12 +27,13 @@ #define AAC_HEADER_SIZE 7 -static int aac_sync(AACAC3ParseContext *hdr_info) +static int aac_sync(uint64_t state, AACAC3ParseContext *hdr_info) { GetBitContext bits; int size, rdb, ch, sr; + uint64_t tmp = be2me_64(state); - init_get_bits(&bits, hdr_info->inbuf, AAC_HEADER_SIZE * 8); + init_get_bits(&bits, ((uint8_t *)&tmp)+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8); if(get_bits(&bits, 12) != 0xfff) return 0; @@ -72,7 +73,6 @@ static int aac_sync(AACAC3ParseContext * static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AAC_HEADER_SIZE; s->sync = aac_sync; return 0; Modified: trunk/libavcodec/ac3_parser.c ============================================================================== --- trunk/libavcodec/ac3_parser.c (original) +++ trunk/libavcodec/ac3_parser.c Sat Apr 19 03:50:40 2008 @@ -123,12 +123,13 @@ int ff_ac3_parse_header(const uint8_t bu return 0; } -static int ac3_sync(AACAC3ParseContext *hdr_info) +static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info) { int err; + uint64_t tmp = be2me_64(state); AC3HeaderInfo hdr; - err = ff_ac3_parse_header(hdr_info->inbuf, &hdr); + err = ff_ac3_parse_header(((uint8_t *)&tmp)+8-AC3_HEADER_SIZE, &hdr); if(err < 0) return 0; @@ -144,7 +145,6 @@ static int ac3_sync(AACAC3ParseContext * static av_cold int ac3_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->inbuf_ptr = s->inbuf; s->header_size = AC3_HEADER_SIZE; s->sync = ac3_sync; return 0;

6 15

r12212 - trunk/libavcodec/faandct.c
by subversion＠mplayerhq.hu 06 Sep '08

06 Sep '08

Author: michael Date: Mon Feb 25 15:42:12 2008 New Revision: 12212 Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap). Modified: trunk/libavcodec/faandct.c Modified: trunk/libavcodec/faandct.c ============================================================================== --- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * 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 + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */ /**

5 8

r13496 - trunk/doc/faq.texi
by subversion＠mplayerhq.hu 29 Jul '08

29 Jul '08

Author: diego Date: Wed May 28 18:12:40 2008 New Revision: 13496 Log: Add a note about everybody's favorite recurring gcc bug: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' Modified: trunk/doc/faq.texi Modified: trunk/doc/faq.texi ============================================================================== --- trunk/doc/faq.texi (original) +++ trunk/doc/faq.texi Wed May 28 18:12:40 2008 @@ -101,6 +101,14 @@ if some MP3 codec like LAME is installed @end table + at chapter Compilation + + at section @code{error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'} + +This is a bug in gcc. Do not report it to us. Instead, please report it to +the gcc developers. Note that we will not add workarounds for gcc bugs. + + @chapter Usage @section ffmpeg does not work; What is wrong?

3 3

r13590 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 31 May '08

31 May '08

Author: jbr Date: Sun Jun 1 00:12:49 2008 New Revision: 13590 Log: cosmetics: add a comment, remove a comment Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sun Jun 1 00:12:49 2008 @@ -1154,7 +1154,6 @@ static int ac3_decode_frame(AVCodecConte } } - /* parse the syncinfo */ if(err && err != AC3_PARSE_ERROR_CRC) { switch(err) { case AC3_PARSE_ERROR_SYNC: @@ -1211,6 +1210,8 @@ static int ac3_decode_frame(AVCodecConte if (!err && ac3_parse_audio_block(s, blk)) { av_log(avctx, AV_LOG_ERROR, "error parsing the audio block\n"); } + + /* interleave output samples */ for (i = 0; i < 256; i++) for (ch = 0; ch < s->out_channels; ch++) *(out_samples++) = s->int_output[ch][i];

1 0

r13589 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 31 May '08

31 May '08

Author: jbr Date: Sun Jun 1 00:12:01 2008 New Revision: 13589 Log: simplify Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sun Jun 1 00:12:01 2008 @@ -903,10 +903,7 @@ static int ac3_parse_audio_block(AC3Deco s->exp_strategy[CPL_CH] = EXP_REUSE; s->exp_strategy[s->lfe_ch] = EXP_REUSE; for (ch = !s->cpl_in_use; ch <= s->channels; ch++) { - if(ch == s->lfe_ch) - s->exp_strategy[ch] = get_bits(gbc, 1); - else - s->exp_strategy[ch] = get_bits(gbc, 2); + s->exp_strategy[ch] = get_bits(gbc, 2 - (ch == s->lfe_ch)); if(s->exp_strategy[ch] != EXP_REUSE) bit_alloc_stages[ch] = 3; }

1 0

r13588 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 31 May '08

31 May '08

Author: jbr Date: Sat May 31 23:57:45 2008 New Revision: 13588 Log: set lfe params at frame init instead of in every block Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sat May 31 23:57:45 2008 @@ -325,6 +325,13 @@ static int ac3_parse_header(AC3DecodeCon s->center_mix_level = hdr.center_mix_level; s->surround_mix_level = hdr.surround_mix_level; + if(s->lfe_on) { + s->start_freq[s->lfe_ch] = 0; + s->end_freq[s->lfe_ch] = 7; + s->num_exp_groups[s->lfe_ch] = 2; + s->channel_in_cpl[s->lfe_ch] = 0; + } + /* read the rest of the bsi. read twice for dual mono mode. */ i = !(s->channel_mode); do { @@ -926,9 +933,6 @@ static int ac3_parse_audio_block(AC3Deco memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); } } - s->start_freq[s->lfe_ch] = 0; - s->end_freq[s->lfe_ch] = 7; - s->num_exp_groups[s->lfe_ch] = 2; if (s->cpl_in_use && s->exp_strategy[CPL_CH] != EXP_REUSE) { s->num_exp_groups[CPL_CH] = (s->end_freq[CPL_CH] - s->start_freq[CPL_CH]) / (3 << (s->exp_strategy[CPL_CH] - 1));

1 0

r13587 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 31 May '08

31 May '08

Author: jbr Date: Sat May 31 23:53:31 2008 New Revision: 13587 Log: only calculate number of exponent groups when exponents are not reused. Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sat May 31 23:53:31 2008 @@ -154,6 +154,7 @@ typedef struct { int end_freq[AC3_MAX_CHANNELS]; ///< end frequency bin AC3BitAllocParameters bit_alloc_params; ///< bit allocation parameters + int num_exp_groups[AC3_MAX_CHANNELS]; ///< Number of exponent groups int8_t dexps[AC3_MAX_CHANNELS][256]; ///< decoded exponents uint8_t bap[AC3_MAX_CHANNELS][256]; ///< bit allocation pointers int16_t psd[AC3_MAX_CHANNELS][256]; ///< scaled exponents @@ -907,6 +908,7 @@ static int ac3_parse_audio_block(AC3Deco for (ch = 1; ch <= fbw_channels; ch++) { s->start_freq[ch] = 0; if (s->exp_strategy[ch] != EXP_REUSE) { + int group_size; int prev = s->end_freq[ch]; if (s->channel_in_cpl[ch]) s->end_freq[ch] = s->start_freq[CPL_CH]; @@ -918,26 +920,26 @@ static int ac3_parse_audio_block(AC3Deco } s->end_freq[ch] = bandwidth_code * 3 + 73; } + group_size = 3 << (s->exp_strategy[ch] - 1); + s->num_exp_groups[ch] = (s->end_freq[ch]+group_size-4) / group_size; if(blk > 0 && s->end_freq[ch] != prev) memset(bit_alloc_stages, 3, AC3_MAX_CHANNELS); } } s->start_freq[s->lfe_ch] = 0; s->end_freq[s->lfe_ch] = 7; + s->num_exp_groups[s->lfe_ch] = 2; + if (s->cpl_in_use && s->exp_strategy[CPL_CH] != EXP_REUSE) { + s->num_exp_groups[CPL_CH] = (s->end_freq[CPL_CH] - s->start_freq[CPL_CH]) / + (3 << (s->exp_strategy[CPL_CH] - 1)); + } /* decode exponents for each channel */ for (ch = !s->cpl_in_use; ch <= s->channels; ch++) { if (s->exp_strategy[ch] != EXP_REUSE) { - int group_size, num_groups; - group_size = 3 << (s->exp_strategy[ch] - 1); - if(ch == CPL_CH) - num_groups = (s->end_freq[ch] - s->start_freq[ch]) / group_size; - else if(ch == s->lfe_ch) - num_groups = 2; - else - num_groups = (s->end_freq[ch] + group_size - 4) / group_size; s->dexps[ch][0] = get_bits(gbc, 4) << !ch; - decode_exponents(gbc, s->exp_strategy[ch], num_groups, s->dexps[ch][0], + decode_exponents(gbc, s->exp_strategy[ch], + s->num_exp_groups[ch], s->dexps[ch][0], &s->dexps[ch][s->start_freq[ch]+!!ch]); if(ch != CPL_CH && ch != s->lfe_ch) skip_bits(gbc, 2); /* skip gainrng */

1 0

r13586 - trunk/libavcodec/ac3dec.c
by subversion＠mplayerhq.hu 31 May '08

31 May '08

Author: jbr Date: Sat May 31 23:37:28 2008 New Revision: 13586 Log: cosmetics: remove unneeded braces Modified: trunk/libavcodec/ac3dec.c Modified: trunk/libavcodec/ac3dec.c ============================================================================== --- trunk/libavcodec/ac3dec.c (original) +++ trunk/libavcodec/ac3dec.c Sat May 31 23:37:28 2008 @@ -951,9 +951,8 @@ static int ac3_parse_audio_block(AC3Deco s->bit_alloc_params.slow_gain = ff_ac3_slow_gain_tab[get_bits(gbc, 2)]; s->bit_alloc_params.db_per_bit = ff_ac3_db_per_bit_tab[get_bits(gbc, 2)]; s->bit_alloc_params.floor = ff_ac3_floor_tab[get_bits(gbc, 3)]; - for(ch=!s->cpl_in_use; ch<=s->channels; ch++) { + for(ch=!s->cpl_in_use; ch<=s->channels; ch++) bit_alloc_stages[ch] = FFMAX(bit_alloc_stages[ch], 2); - } } else if (!blk) { av_log(s->avctx, AV_LOG_ERROR, "new bit allocation info must be present in block 0\n"); return -1;

1 0