July 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4658 - seek_api/seektest/dothack2.ref
by spyfeng 11 Jul '09

11 Jul '09

Author: spyfeng Date: Sat Jul 11 08:47:39 2009 New Revision: 4658 Log: fix expected outputs stream id. Modified: seek_api/seektest/dothack2.ref Modified: seek_api/seektest/dothack2.ref ============================================================================== --- seek_api/seektest/dothack2.ref Sat Jul 11 07:28:30 2009 (r4657) +++ seek_api/seektest/dothack2.ref Sat Jul 11 08:47:39 2009 (r4658) @@ -22,7 +22,7 @@ ret: 0 st: 0 dts:58254 pts:69054 pos:372 ret:-1 st: 0 ts:-5250 flags:0 ret: 0 st: 0 dts:22254 pts:25854 pos:14 size:37536 flags:1 ret:-1 st: 0 ts:255225 flags:1 -ret: 0 st: 1 dts:231054 pts:241854 pos:2246670 size:36288 flags:1 +ret: 0 st: 0 dts:231054 pts:241854 pos:2246670 size:36288 flags:1 ret: 0 st: 1 ts:155700 flags:0 ret: 0 st: 1 dts:158334 pts:158334 pos:1658894 size:1536 flags:1 ret: 0 st: 1 ts:56175 flags:1 @@ -32,13 +32,13 @@ ret: 0 st: 2 dts:25854 pts:25854 pos:241 ret: 0 st: 2 ts:217125 flags:1 ret: 0 st: 2 dts:215934 pts:215934 pos:2267150 size:1536 flags:1 ret:-1 st:-1 ts:117600 flags:0 -ret: 0 st: 1 dts:144654 pts:155454 pos:1308686 size:33020 flags:1 +ret: 0 st: 0 dts:144654 pts:155454 pos:1308686 size:33020 flags:1 ret:-1 st:-1 ts:18076 flags:1 ret: 0 st: 0 dts:22254 pts:25854 pos:14 size:37536 flags:1 ret:-1 st: 0 ts:-81449 flags:0 ret: 0 st: 0 dts:22254 pts:25854 pos:14 size:37536 flags:1 ret:-1 st: 0 ts:179026 flags:1 -ret: 0 st: 1 dts:144654 pts:155454 pos:1308686 size:33020 flags:1 +ret: 0 st: 0 dts:144654 pts:155454 pos:1308686 size:33020 flags:1 ret: 0 st: 1 ts:79501 flags:0 ret: 0 st: 1 dts:80574 pts:80574 pos:821262 size:1536 flags:1 ret:-1 st: 1 ts:-20024 flags:1

1 0

[soc]: r4657 - seek_api/seektest/dothack2.ref
by spyfeng 11 Jul '09

11 Jul '09

Author: spyfeng Date: Sat Jul 11 07:28:30 2009 New Revision: 4657 Log: modify expected outputs. Modified: seek_api/seektest/dothack2.ref Modified: seek_api/seektest/dothack2.ref ============================================================================== --- seek_api/seektest/dothack2.ref Sat Jul 11 00:17:57 2009 (r4656) +++ seek_api/seektest/dothack2.ref Sat Jul 11 07:28:30 2009 (r4657) @@ -16,7 +16,7 @@ ret: 0 st: 2 dts:34494 pts:34494 pos:321 ret:-1 st: 2 ts:-66675 flags:1 ret: 0 st: 2 dts:25854 pts:25854 pos:241678 size:1536 flags:1 ret:-1 st:-1 ts:193800 flags:0 -ret: 0 st: 0 dts:231054 pts:241854 pos:2246670 size:36288 flags:0 +ret: 0 st: 0 dts:187854 pts:198654 pos:1779726 size:34644 flags:1 ret:-1 st:-1 ts:94275 flags:1 ret: 0 st: 0 dts:58254 pts:69054 pos:372750 size:34952 flags:1 ret:-1 st: 0 ts:-5250 flags:0 @@ -46,7 +46,7 @@ ret: 0 st: 1 dts:25854 pts:25854 pos:239 ret: 0 st: 2 ts:240451 flags:0 ret: 0 st: 2 dts:241854 pts:241854 pos:2574350 size:1536 flags:1 ret: 0 st: 2 ts:140926 flags:1 -ret: 0 st: 2 dts:138174 pts:138174 pos:1409038 size:34390 flags:1 +ret: 0 st: 2 dts:138174 pts:138174 pos:1409038 size:1536 flags:1 ret:-1 st:-1 ts:41401 flags:0 ret: 0 st: 0 dts:58254 pts:69054 pos:372750 size:34952 flags:1 ret:-1 st:-1 ts:-58124 flags:1

1 0

[soc]: r4656 - als/ffmpeg-patches/hack4als.patch
by thilo.borgmann 10 Jul '09

10 Jul '09

Author: thilo.borgmann Date: Sat Jul 11 00:17:57 2009 New Revision: 4656 Log: Removed obsolete hack4als.patch Deleted: als/ffmpeg-patches/hack4als.patch

1 0

AAC Encoding - Where we stand, what's left
by Alex Converse 09 Jul '09

09 Jul '09

I'd like to take a minute to discuss the status of the AAC encoder and where it is going. In SoC svn: --Applies cleanly to SVN HEAD --The most egregious of the artifacting is gone (sections being replaced by silence or having the wrong volume, etc.) --Lacks TNS --Lacks multichannel support --Lacks rate control --Lacks SBR --Produces illegal bitstreams by violating the maximum frame size --Below faac quality --Well below the quality of competitive encoders In my tree: --Ruggles' PARCOR --Rudimentary TNS support based on ISO 13818-7 Annex C --TNS coefficient compressor --Various performance opts --Different value for CLIPPED_ESCAPE (165113.5f * IQ) --Substantial rate control related re-factoring --Pseudo ABR rate control --Maximum frame size enforcement --VBR rate control that forces comically high bitrate output. TNS is not helpful at the moment. Sharp attacks are losing most of their power before we get to the TNS stage. I believe this is may be psy model related. To be frank, at this point it seems like it might be prudent for me to stop working on this and move to either replacing the non-redistributable parts of faac (to get something legal and faac quality) or improving the 3GPP code (to get something awesome but not distributable). At this point both code bases offer better quality and more features (including SBR support from 3GPP). Dsputil is awesome but developing this encoder inside ffmpeg is constricting to say the least. So I'm wondering what other people have in mind (or completed but tucked out of sight) for this code base? Regards, Alex Converse

11 45

[soc]: r4655 - aacenc/aacenc.c
by alexc 08 Jul '09

08 Jul '09

Author: alexc Date: Wed Jul 8 21:49:40 2009 New Revision: 4655 Log: Inform the user about illegal LFEs. Modified: aacenc/aacenc.c Modified: aacenc/aacenc.c ============================================================================== --- aacenc/aacenc.c Wed Jul 8 10:36:32 2009 (r4654) +++ aacenc/aacenc.c Wed Jul 8 21:49:40 2009 (r4655) @@ -201,6 +201,10 @@ static av_cold int aac_encode_init(AVCod ff_aac_pow2sf_tab[i] = pow(2, (i - 200)/4.); #endif /* CONFIG_HARDCODED_TABLES */ + if (avctx->channels > 5) + av_log(avctx, AV_LOG_ERROR, "This encoder does not yet enforce the restrictions on LFEs. " + "The output will most likely be an illegal bitstream.\n"); + return 0; }

1 0

[PATCH] AACENC: fix SEGV in multi-channel encode WAS Re: AAC Encoding - Where we stand, what's left
by Alex Converse 08 Jul '09

08 Jul '09

On Wed, Jul 8, 2009 at 12:37 AM, Kostya<kostya.shishkov(a)gmail.com> wrote: > On Wed, Jul 08, 2009 at 12:05:50AM -0400, Alex Converse wrote: >> On Tue, Jul 7, 2009 at 4:45 AM, Kostya<kostya.shishkov(a)gmail.com> wrote: >> > On Mon, Jul 06, 2009 at 09:14:00PM -0400, Alex Converse wrote: >> >> I'd like to take a minute to discuss the status of the AAC encoder and >> >> where it is going. >> >> >> >> In SoC svn: >> >> --Applies cleanly to SVN HEAD >> >> --The most egregious of the artifacting is gone (sections being >> >> replaced by silence or having the wrong volume, etc.) >> >> --Lacks TNS >> > >> >> --Lacks multichannel support >> > >> > Ahem, I've added it long time ago. >> > >> >> $ ./ffmpeg -i ../../Canyon-5.1-48khz-448kbit.ac3 canyon5.1.m4a >> FFmpeg version git-04fe5e6, Copyright (c) 2000-2009 Fabrice Bellard, et al. >> configuration: --enable-gpl --disable-ffserver >> libavutil 50. 3. 0 / 50. 3. 0 >> libavcodec 52.32. 0 / 52.32. 0 >> libavformat 52.36. 0 / 52.36. 0 >> libavdevice 52. 2. 0 / 52. 2. 0 >> libswscale 0. 7. 1 / 0. 7. 1 >> built on Jul 7 2009 23:49:58, gcc: 4.3.3 >> Input #0, ac3, from '../../Canyon-5.1-48khz-448kbit.ac3': >> Duration: 00:00:37.98, bitrate: 448 kb/s >> Stream #0.0: Audio: ac3, 48000 Hz, 5.1, s16, 448 kb/s >> File 'canyon5.1.m4a' already exists. Overwrite ? [y/N] y >> Output #0, ipod, to 'canyon5.1.m4a': >> Stream #0.0: Audio: aac, 48000 Hz, 5.1, s16, 64 kb/s >> Stream mapping: >> Stream #0.0 -> #0.0 >> Press [q] to stop encoding >> Segmentation fault > > Something is broken in preprocessing. If you change line 482 in aacenc.c > like in this patch to disable IIR filtering, it will work: > > Index: aacenc.c > =================================================================== > --- aacenc.c (revision 4653) > +++ aacenc.c (working copy) > @@ -479,7 +479,7 @@ > if(s->last_frame) > return 0; > if(data){ > - if(!s->psypp){ > + if(1){ > memcpy(s->samples + 1024 * avctx->channels, data, 1024 * avctx->channels * sizeof(s->samples[0])); > }else{ > start_ch = 0; >

2 2

[soc]: r4654 - aacenc/aacenc.c
by alexc 08 Jul '09

08 Jul '09

Author: alexc Date: Wed Jul 8 10:36:32 2009 New Revision: 4654 Log: Fix a SEGV in ff_psy_preprocess for multichannel files. Modified: aacenc/aacenc.c Modified: aacenc/aacenc.c ============================================================================== --- aacenc/aacenc.c Tue Jul 7 21:52:05 2009 (r4653) +++ aacenc/aacenc.c Wed Jul 8 10:36:32 2009 (r4654) @@ -487,7 +487,7 @@ static int aac_encode_frame(AVCodecConte for(i = 0; i < chan_map[0]; i++){ tag = chan_map[i+1]; chans = tag == TYPE_CPE ? 2 : 1; - ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch + i, chans); + ff_psy_preprocess(s->psypp, (uint16_t*)data + start_ch, samples2 + start_ch, start_ch, chans); start_ch += chans; } }

1 0

[soc]: r4653 - concat/libavformat/m3u.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 21:52:05 2009 New Revision: 4653 Log: set pointer to 0 to fix av_fast_realloc Modified: concat/libavformat/m3u.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Tue Jul 7 18:22:41 2009 (r4652) +++ concat/libavformat/m3u.c Tue Jul 7 21:52:05 2009 (r4653) @@ -45,7 +45,7 @@ static int m3u_list_files(ByteIOContext char **flist; int i, j; int bufsize = 0; - i = 0; + i = flist = 0; while (1) { char *q; char linebuf[1024] = {0};

1 0

[soc]: r4652 - in concat/libavformat: pls.c xspf.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 18:22:41 2009 New Revision: 4652 Log: fixing code formatting Modified: concat/libavformat/pls.c concat/libavformat/xspf.c Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Tue Jul 7 04:32:55 2009 (r4651) +++ concat/libavformat/pls.c Tue Jul 7 18:22:41 2009 (r4652) @@ -61,14 +61,12 @@ static int pls_list_files(ByteIOContext s[4] = c; if (s[0] == t[0] && s[1] == t[1] && s[2] == t[2] && s[3] == t[3] && s[4] == t[4]) state = 1; - } - else if (state == 1){ + } else if (state == 1) { if (c == '=') state = 2; else if (c == '#') state = 0; - } - else { + } else { if (c == '\n' || c == '#') { termfn: buf[i++] = 0; @@ -79,8 +77,7 @@ static int pls_list_files(ByteIOContext state = 0; s[sizeof(s)-1] = c; continue; - } - else { + } else { buf[i++] = c; if (i >= sizeof(buf)-1) goto termfn; Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Tue Jul 7 04:32:55 2009 (r4651) +++ concat/libavformat/xspf.c Tue Jul 7 18:22:41 2009 (r4652) @@ -67,8 +67,7 @@ static int xspf_list_files(ByteIOContext if (s[0] == t[0] && s[1] == t[1] && s[2] == t[2] && s[3] == t[3] && s[4] == t[4] && s[5] == t[5] && s[6] == t[6] && s[7] == t[7] && s[8] == t[8] && s[9] == t[9]) state = 1; - } - else { + } else { if (c == '<') { termfn: buf[i++] = 0; @@ -79,8 +78,7 @@ static int xspf_list_files(ByteIOContext state = 0; s[sizeof(s)-1] = c; continue; - } - else { + } else { buf[i++] = c; if (i >= sizeof(buf)-1) goto termfn;

1 0

[soc]: r4648 - concat/libavformat/pls.c
by gkovacs 07 Jul '09

07 Jul '09

Author: gkovacs Date: Tue Jul 7 03:41:48 2009 New Revision: 4648 Log: reimplemented pls without datanode Modified: concat/libavformat/pls.c Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Tue Jul 7 03:05:04 2009 (r4647) +++ concat/libavformat/pls.c Tue Jul 7 03:41:48 2009 (r4648) @@ -20,7 +20,6 @@ */ #include "concatgen.h" -#include "datanode.h" /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_pls_tags[] = { @@ -41,18 +40,55 @@ static int pls_probe(AVProbeData *p) return 0; } -static int pls_list_files(ByteIOContext *s, PlaylistContext *ctx) +static int pls_list_files(ByteIOContext *b, PlaylistContext *ctx) { - int i; + int i, j, c; + unsigned int buflen; + char state; char **flist; - StringList *l; - DataNode *d; - l = ff_stringlist_alloc(); - d = ff_datanode_tree_from_ini(s); - ff_datanode_visualize(d); - ff_datanode_filter_values_by_name(d, l, "File"); - ff_stringlist_print(l); - ff_stringlist_export(l, &flist, &(ctx->pelist_size)); + char buf[1024]; + char s[5]; + char t[] = "\nFile"; + state = flist = buflen = i = j = 0; + while ((c = url_fgetc(b))) { + if (c == EOF) + break; + if (state == 0) { + s[0] = s[1]; + s[1] = s[2]; + s[2] = s[3]; + s[3] = s[4]; + s[4] = c; + if (s[0] == t[0] && s[1] == t[1] && s[2] == t[2] && s[3] == t[3] && s[4] == t[4]) + state = 1; + } + else if (state == 1){ + if (c == '=') + state = 2; + else if (c == '#') + state = 0; + } + else { + if (c == '\n' || c == '#') { + termfn: + buf[i++] = 0; + flist = av_fast_realloc(flist, &buflen, sizeof(*flist) * (j+2)); + flist[j] = av_malloc(i); + av_strlcpy(flist[j++], buf, i); + i = 0; + state = 0; + s[sizeof(s)-1] = c; + continue; + } + else { + buf[i++] = c; + if (i >= sizeof(buf)-1) + goto termfn; + } + } + } + flist[j] = 0; + ctx->pelist_size = j; ff_playlist_relative_paths(flist, ctx->workingdir); ctx->pelist = av_malloc(ctx->pelist_size * sizeof(*(ctx->pelist))); memset(ctx->pelist, 0, ctx->pelist_size * sizeof(*(ctx->pelist)));

2 1