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

[soc]: r1932 - libavfilter/vf_scale.c
by koorogi 02 Mar '08

02 Mar '08

Author: koorogi Date: Thu Feb 28 00:18:58 2008 New Revision: 1932 Log: Slice support for vf_scale. Modified: libavfilter/vf_scale.c Modified: libavfilter/vf_scale.c ============================================================================== --- libavfilter/vf_scale.c (original) +++ libavfilter/vf_scale.c Thu Feb 28 00:18:58 2008 @@ -34,6 +34,8 @@ typedef struct * -1 = keep original aspect */ int w, h; + + int sliceY; ///< top of current output slice } ScaleContext; static int init(AVFilterContext *ctx, const char *args, void *opaque) @@ -110,6 +112,7 @@ static int config_props(AVFilterLink *li static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) { + ScaleContext *scale = link->dst->priv; AVFilterLink *out = link->dst->outputs[0]; out->outpic = avfilter_get_video_buffer(out, AV_PERM_WRITE); @@ -122,22 +125,20 @@ static void start_frame(AVFilterLink *li FFMAX(out->outpic->pixel_aspect.num, out->outpic->pixel_aspect.den)); avfilter_start_frame(out, avfilter_ref_pic(out->outpic, ~0)); -} + scale->sliceY = 0; +} -/* TODO: figure out the swscale API well enough to scale slice at a time */ -static void end_frame(AVFilterLink *link) +static void draw_slice(AVFilterLink *link, int y, int h) { ScaleContext *scale = link->dst->priv; + int outH; - sws_scale(scale->sws, link->cur_pic->data, link->cur_pic->linesize, 0, - link->cur_pic->h, link->dst->outputs[0]->outpic->data, + outH = sws_scale(scale->sws, link->cur_pic->data, link->cur_pic->linesize, + y, h, link->dst->outputs[0]->outpic->data, link->dst->outputs[0]->outpic->linesize); - avfilter_draw_slice(link->dst->outputs[0], 0, link->dst->outputs[0]->h); - avfilter_end_frame(link->dst->outputs[0]); - - avfilter_unref_pic(link->cur_pic); - avfilter_unref_pic(link->dst->outputs[0]->outpic); + avfilter_draw_slice(link->dst->outputs[0], scale->sliceY, outH); + scale->sliceY += outH; } AVFilter avfilter_vf_scale = @@ -154,7 +155,7 @@ AVFilter avfilter_vf_scale = .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO, .start_frame = start_frame, - .end_frame = end_frame, + .draw_slice = draw_slice, .min_perms = AV_PERM_READ, }, { .name = NULL}}, .outputs = (AVFilterPad[]) {{ .name = "default",

4 6

[soc]: r1950 - libavfilter/diffs/03_ffplay_filters.diff
by vitor 29 Feb '08

29 Feb '08

Author: vitor Date: Fri Feb 29 21:43:19 2008 New Revision: 1950 Log: Update ffplay patch to the latest lavfi changes. Patch by vmrsss. Modified: libavfilter/diffs/03_ffplay_filters.diff Modified: libavfilter/diffs/03_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/03_ffplay_filters.diff (original) +++ libavfilter/diffs/03_ffplay_filters.diff Fri Feb 29 21:43:19 2008 @@ -1,5 +1,5 @@ ---- ffplay.c.old 2007-12-20 13:17:23.241265187 -0500 -+++ ffplay.c 2007-12-20 14:15:32.174812061 -0500 +--- ffplay.c.old 2008-02-29 21:39:16.000000000 +0100 ++++ ffplay.c 2008-02-29 21:40:36.000000000 +0100 @@ -27,6 +27,11 @@ #include "swscale.h" #include "avstring.h" @@ -183,7 +183,7 @@ /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1382,6 +1452,140 @@ +@@ -1382,6 +1452,138 @@ return 0; } @@ -257,7 +257,6 @@ +static AVFilter input_filter = +{ + .name = "ffplay_input", -+ .author = "Bobby Bingham", + + .priv_size = sizeof(FilterPriv), + @@ -268,7 +267,7 @@ + + .inputs = (AVFilterPad[]) {{ .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = "default", -+ .type = AV_PAD_VIDEO, ++ .type = CODEC_TYPE_VIDEO, + .request_frame = input_request_frame, + .config_props = input_config_props, }, + { .name = NULL }}, @@ -308,12 +307,11 @@ +static AVFilter output_filter = +{ + .name = "ffplay_output", -+ .author = "Bobby Bingham", + + .query_formats = output_query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", -+ .type = AV_PAD_VIDEO, ++ .type = CODEC_TYPE_VIDEO, + .end_frame = output_end_frame, + .min_perms = AV_PERM_READ, }, + { .name = NULL }}, @@ -324,7 +322,7 @@ static int video_thread(void *arg) { VideoState *is = arg; -@@ -1390,10 +1594,52 @@ +@@ -1390,10 +1592,52 @@ double pts; int ret; @@ -333,7 +331,7 @@ + AVFilterContext *filt_src = NULL, *filt_out = NULL, *filt_graph = NULL; + AVFilterContext *graph = NULL; + -+ avfilter_init(); ++ avfilter_register_all(); + + if(!(filt_src = avfilter_open(&input_filter, "src"))) goto the_end; + if(!(filt_out = avfilter_open(&output_filter, "out"))) goto the_end; @@ -377,7 +375,7 @@ if (ret < 0) goto the_end; -@@ -1410,6 +1656,9 @@ +@@ -1410,6 +1654,9 @@ stream_pause(cur_stream); } the_end: @@ -387,7 +385,7 @@ av_free(frame); return 0; } -@@ -2144,6 +2393,12 @@ +@@ -2149,6 +2396,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -400,8 +398,8 @@ if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2500,6 +2755,9 @@ - #endif +@@ -2494,6 +2747,9 @@ + { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, +#if ENABLE_AVFILTER

1 0

Current libavfilter status
by Ramiro Polla 29 Feb '08

29 Feb '08

Hello, I'm almost back from vacations and want to dig into libavfilter when I get a chance. I see it has been somewhat integrated into FFmpeg SVN already. - What's missing to get it integrated? - How do I test it right now, with some files already in FFmpeg SVN and some others in SOC SVN? Thanks, and great job... libavfilter seems promising. Ramiro Polla

2 1

[soc]: r1949 - aac/aac.c
by andoma 29 Feb '08

29 Feb '08

Author: andoma Date: Fri Feb 29 09:33:54 2008 New Revision: 1949 Log: Check return code from various initialization functions and bail out gracefully if we encouter an error. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Feb 29 09:33:54 2008 @@ -889,13 +889,16 @@ static int aac_decode_init(AVCodecContex int j, values = tmp[i].s/a_code_size; int dim = (i >= 4 ? 2 : 4); int mod = mod_cb[i], off = off_cb[i], index = 0; - int ret; - ret = init_vlc(&ac->books[i], 6, values, + + if(init_vlc(&ac->books[i], 6, values, tmp[i].a_bits, a_bits_size, a_bits_size, tmp[i].a_code, a_code_size, a_code_size, - 0); - assert(!ret); - ac->vq[i] = av_malloc(dim * values * sizeof(int)); + 0) < 0) + return -1; + + if((ac->vq[i] = av_malloc(dim * values * sizeof(int))) == NULL) + return -1; + if (dim == 2) { for (j = 0; j < values * dim; j += dim) { index = j/dim; @@ -947,10 +950,11 @@ static int aac_decode_init(AVCodecContex ac->num_swb_128 = num_swb_128[ac->sampling_index]; ac->tns_max_bands_128 = tns_max_bands_128[ac->sampling_index]; - init_vlc(&ac->mainvlc, 7, sizeof(code)/sizeof(code[0]), + if(init_vlc(&ac->mainvlc, 7, sizeof(code)/sizeof(code[0]), bits, sizeof(bits[0]), sizeof(bits[0]), code, sizeof(code[0]), sizeof(code[0]), - 0); + 0) < 0) + return -1; if (ac->audioObjectType == AOT_AAC_SSR) { ff_mdct_init(&ac->mdct, 9, 1); @@ -960,7 +964,8 @@ static int aac_decode_init(AVCodecContex ff_kbd_window_init(ac->kbd_short_128, 6.0, 32); sine_window_init(ac->sine_long_1024, 512); sine_window_init(ac->sine_short_128, 64); - ac->ssrctx = av_malloc(sizeof(ssr_context)); + if((ac->ssrctx = av_malloc(sizeof(ssr_context))) == NULL) + return -1; ssr_context_init(ac->ssrctx); } else { ff_mdct_init(&ac->mdct, 11, 1);

1 0

[soc]: r1948 - aac/aac.c
by andoma 29 Feb '08

29 Feb '08

Author: andoma Date: Fri Feb 29 09:11:40 2008 New Revision: 1948 Log: remove even more superfluous writes of 0 to already cleared memory Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Feb 29 09:11:40 2008 @@ -970,14 +970,11 @@ static int aac_decode_init(AVCodecContex ff_kbd_window_init(ac->kbd_short_128, 6.0, 128); sine_window_init(ac->sine_long_1024, 2048); sine_window_init(ac->sine_short_128, 256); - ac->ssrctx = NULL; } for (i = 0; i < 128; i++) { ac->sine_short_128[i] *= 8.; ac->kbd_short_128[i] *= 8.; } - ac->mdct_ltp = NULL; - return 0; }

1 0

[soc]: r1947 - aac/aac.c
by andoma 29 Feb '08

29 Feb '08

Author: andoma Date: Fri Feb 29 09:05:09 2008 New Revision: 1947 Log: Work around buggy stream which carries the LFE-channel in a secondary SCE element rather than in the LFE element (as mandated by the standard) Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Feb 29 09:05:09 2008 @@ -2125,7 +2125,20 @@ static int aac_decode_frame(AVCodecConte tag = get_bits(&gb, 4); switch (id) { case ID_SCE: - err = ac->che_sce[tag] && !individual_channel_stream(ac, &gb, 0, 0, ac->che_sce[tag]) ? 0 : -1; + if(ac->che_sce[tag] == NULL) { + if(tag == 1 && ac->che_lfe[0] != NULL) { + /* Some streams incorrectly code 5.1 audio as SCE[0] CPE[0] CPE[1] SCE[1] + instead of SCE[0] CPE[0] CPE[0] LFE[0]. + If we seem to have encountered such a stream, + transfer the LFE[0] element to SCE[1] */ + ac->che_sce[tag] = ac->che_lfe[0]; + ac->che_lfe[0] = NULL; + } else { + err = 1; + break; + } + } + err = individual_channel_stream(ac, &gb, 0, 0, ac->che_sce[tag]); break; case ID_CPE: err = channel_pair_element(ac, &gb, tag);

1 0

[RFC] AAC invalid 5.1 streams
by Andreas Öman 29 Feb '08

29 Feb '08

Hi, I've discovered that some 5.1 streams incorrectly seem to encode the LFE element as a second SCE (Single Channel Element). With the previous channel management in AAC this was less of a problem as it just kept adding elements as it discovered them. So, in order to comply with these broken streams a kludge is needed (attached). I still believe that my version is better because: * It's written to comply with the standard, not to make things up as we go. * It's more compact, and much less code in the output-mixer stage. Just want to inform you guys on whats going on. If nobody objects I'll commit it.

1 1

[soc]: r1946 - aac/aac.c
by andoma 28 Feb '08

28 Feb '08

Author: andoma Date: Thu Feb 28 16:18:59 2008 New Revision: 1946 Log: check return code from program_config_element_default() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Feb 28 16:18:59 2008 @@ -743,7 +743,8 @@ static int GASpecificConfig(AACContext * if(program_config_element(ac, gb) < 0) return -1; } else { - program_config_element_default(ac, channels); + if(program_config_element_default(ac, channels) < 0) + return -1; } if (ext) {

1 0

[soc]: r1945 - aac/aac.c
by andoma 28 Feb '08

28 Feb '08

Author: andoma Date: Thu Feb 28 12:16:50 2008 New Revision: 1945 Log: fix cut'n'haste typo Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Feb 28 12:16:50 2008 @@ -521,7 +521,7 @@ static int output_configure(AACContext * } if(ac->che_lfe[i]) { ac->output_data[ch++] = ac->che_lfe[i]->ret; - ac->che_sce[i]->mixing_gain = 1.0f; + ac->che_lfe[i]->mixing_gain = 1.0f; } } assert(ch == channels);

1 0

[soc]: r1944 - aac/aac.c
by andoma 28 Feb '08

28 Feb '08

Author: andoma Date: Thu Feb 28 11:14:39 2008 New Revision: 1944 Log: Collapse single_channel_struct() and lfe_channel_struct() into one line in aac_decode_frame() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Thu Feb 28 11:14:39 2008 @@ -1413,16 +1413,6 @@ static void ms_tool(AACContext * ac, cpe } } -static int single_channel_struct(AACContext * ac, GetBitContext * gb, int id) { - sce_struct * sce; - if (ac->che_sce[id] == NULL) { - return -1; - } - sce = ac->che_sce[id]; - if (individual_channel_stream(ac, gb, 0, 0, sce)) - return -1; - return 0; -} static void intensity_tool(AACContext * ac, cpe_struct * cpe) { const ics_struct * ics = &cpe->ch[1].ics; @@ -1559,17 +1549,6 @@ static int coupling_channel_element(AACC return 0; } -static int lfe_channel_struct(AACContext * ac, GetBitContext * gb, int id) { - sce_struct * sce; - if (ac->che_lfe[id] == NULL) { - return -1; - } - sce = ac->che_lfe[id]; - if (individual_channel_stream(ac, gb, 0, 0, sce)) - return -1; - return 0; -} - static int sbr_extension_data(AACContext * ac, GetBitContext * gb, int crc, int cnt) { // TODO : sbr_extension implementation av_log(ac->avccontext, AV_LOG_DEBUG, "aac: SBR not yet supported.\n"); @@ -2145,7 +2124,7 @@ static int aac_decode_frame(AVCodecConte tag = get_bits(&gb, 4); switch (id) { case ID_SCE: - err = single_channel_struct(ac, &gb, tag); + err = ac->che_sce[tag] && !individual_channel_stream(ac, &gb, 0, 0, ac->che_sce[tag]) ? 0 : -1; break; case ID_CPE: err = channel_pair_element(ac, &gb, tag); @@ -2167,7 +2146,7 @@ static int aac_decode_frame(AVCodecConte err = coupling_channel_element(ac, &gb, tag); break; case ID_LFE: - err = lfe_channel_struct(ac, &gb, tag); + err = ac->che_lfe[tag] && !individual_channel_stream(ac, &gb, 0, 0, ac->che_lfe[tag]) ? 0 : -1; break; default: err = -1; /* should not happen, but keeps compiler happy */

1 0