June 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

r13685 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 10 Jul '08

10 Jul '08

Author: michael Date: Sat Jun 7 11:12:42 2008 New Revision: 13685 Log: Presets support. How per codec defaults and ranges will be supported is still being discussed. Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c (original) +++ trunk/ffmpeg.c Sat Jun 7 11:12:42 2008 @@ -3636,6 +3636,41 @@ static int opt_bsf(const char *opt, cons return 0; } +static int opt_preset(const char *opt, const char *arg) +{ + FILE *f; + char tmp[100], tmp2[100]; + char *home= getenv("HOME"); + + snprintf(tmp, sizeof(tmp), "%s/.ffmpeg/%s.ffpreset", home, arg); + f= fopen(tmp, "r"); + if(!f){ + char *codec_name= *opt == 'v' ? video_codec_name : + *opt == 'a' ? audio_codec_name : + subtitle_codec_name; + snprintf(tmp, sizeof(tmp), "%s/.ffmpeg/%s-%s.ffpreset", home, codec_name, arg); + f= fopen(tmp, "r"); + } + + if(!f){ + fprintf(stderr, "Preset file not found\n"); + av_exit(1); + } + + while(!feof(f)){ + int e= fscanf(f, "%99[^=]=%99[^\n]\n", tmp, tmp2); + if(e!=2){ + fprintf(stderr, "Preset file invalid\n"); + av_exit(1); + } + opt_default(tmp, tmp2); + } + + fclose(f); + + return 0; +} + static const OptionDef options[] = { /* main options */ { "L", OPT_EXIT, {(void*)show_license}, "show license" }, @@ -3758,6 +3793,10 @@ static const OptionDef options[] = { { "vbsf", OPT_FUNC2 | HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream_filter" }, { "sbsf", OPT_FUNC2 | HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_bsf}, "", "bitstream_filter" }, + { "apre", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_preset}, "", "preset" }, + { "vpre", OPT_FUNC2 | HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_preset}, "", "preset" }, + { "spre", OPT_FUNC2 | HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_preset}, "", "preset" }, + { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, };

5 11

r13969 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 08 Jul '08

08 Jul '08

Author: michael Date: Wed Jun 25 20:15:04 2008 New Revision: 13969 Log: We cannot calculate the duration of vorbis packets even if we do know the "minimal" frame_size. Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Wed Jun 25 20:15:04 2008 @@ -538,12 +538,12 @@ static int get_audio_frame_size(AVCodecC { int frame_size; + if(enc->codec_id == CODEC_ID_VORBIS) + return -1; + if (enc->frame_size <= 1) { int bits_per_sample = av_get_bits_per_sample(enc->codec_id); - if(enc->codec_id == CODEC_ID_VORBIS) - return -1; - if (bits_per_sample) { if (enc->channels == 0) return -1;

4 5

[propchange]: r13682 - svn:log
by subversion＠mplayerhq.hu 07 Jul '08

07 Jul '08

Author: diego Revision: 13682 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -reset reading state after sucessfull seek \ No newline at end of file +reset reading state after sucessful seek

3 2

r13880 - in trunk: libavformat/ffmenc.c tests/libav.regression.ref
by subversion＠mplayerhq.hu 30 Jun '08

30 Jun '08

Author: bcoudurier Date: Sun Jun 22 10:50:57 2008 New Revision: 13880 Log: store dts in ffm headers Modified: trunk/libavformat/ffmenc.c trunk/tests/libav.regression.ref Modified: trunk/libavformat/ffmenc.c ============================================================================== --- trunk/libavformat/ffmenc.c (original) +++ trunk/libavformat/ffmenc.c Sun Jun 22 10:50:57 2008 @@ -188,11 +188,11 @@ static int ffm_write_header(AVFormatCont static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt) { - int64_t pts; + int64_t dts; uint8_t header[FRAME_HEADER_SIZE]; int header_size = FRAME_HEADER_SIZE; - pts = s->timestamp + pkt->pts; + dts = s->timestamp + pkt->dts; /* packet size & key_frame */ header[0] = pkt->stream_index; header[1] = 0; @@ -200,14 +200,14 @@ static int ffm_write_packet(AVFormatCont header[1] |= FLAG_KEY_FRAME; AV_WB24(header+2, pkt->size); AV_WB24(header+5, pkt->duration); - AV_WB64(header+8, pts); + AV_WB64(header+8, s->timestamp + pkt->pts); if (pkt->pts != pkt->dts) { header[1] |= FLAG_DTS; AV_WB32(header+16, pkt->pts - pkt->dts); header_size += 4; } - ffm_write_data(s, header, header_size, pts, 1); - ffm_write_data(s, pkt->data, pkt->size, pts, 0); + ffm_write_data(s, header, header_size, dts, 1); + ffm_write_data(s, pkt->data, pkt->size, dts, 0); return 0; } Modified: trunk/tests/libav.regression.ref ============================================================================== --- trunk/tests/libav.regression.ref (original) +++ trunk/tests/libav.regression.ref Sun Jun 22 10:50:57 2008 @@ -15,7 +15,7 @@ bdb7484c68db722f66ba1630cf79844c *./test d6fdeb9f7083cc827f9510c6c4517dc0 *./tests/data/b-libav.swf 335771 ./tests/data/b-libav.swf ./tests/data/b-libav.swf CRC=0xe14e8847 -11eec620bdcd3ef1a053fdb964d1b855 *./tests/data/b-libav.ffm +3dbacdc3fccb551f8ab54c32f648e7a8 *./tests/data/b-libav.ffm 380928 ./tests/data/b-libav.ffm ./tests/data/b-libav.ffm CRC=0x2b71a386 f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv

6 14

r13854 - trunk/libavcodec/opt.h
by subversion＠mplayerhq.hu 30 Jun '08

30 Jun '08

Author: stefano Date: Sat Jun 21 11:15:49 2008 New Revision: 13854 Log: Extend documentation for AVOption. Modified: trunk/libavcodec/opt.h Modified: trunk/libavcodec/opt.h ============================================================================== --- trunk/libavcodec/opt.h (original) +++ trunk/libavcodec/opt.h Sat Jun 21 11:15:49 2008 @@ -52,12 +52,20 @@ typedef struct AVOption { * @todo What about other languages? */ const char *help; - int offset; ///< offset to context structure where the parsed value should be stored + + /** + * The offset relative to the context structure where the option + * value is stored. It should be 0 for named constant. + */ + int offset; enum AVOptionType type; + /** + * the default value for non-constant and value for constant scalars + */ double default_val; - double min; - double max; + double min; ///< minimum valid value for the option + double max; ///< maximum valid value for the option int flags; #define AV_OPT_FLAG_ENCODING_PARAM 1 ///< a generic parameter which can be set by the user for muxing or encoding @@ -67,6 +75,12 @@ typedef struct AVOption { #define AV_OPT_FLAG_VIDEO_PARAM 16 #define AV_OPT_FLAG_SUBTITLE_PARAM 32 //FIXME think about enc-audio, ... style flags + + /** + * The logical unit to which the option belongs. Non-constant + * options and corresponding named constants share the same + * unit. May be NULL. + */ const char *unit; } AVOption;

3 6