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

[soc]: r1957 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 11:11:52 2008 New Revision: 1957 Log: Invert logic for SSR/non-SSR filterbank selection. This is part of adding #ifdefs around all the SSR related code. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 11:11:52 2008 @@ -2054,10 +2054,10 @@ static void spec_to_sample(AACContext * transform_sce_tool(ac, ltp_trans); transform_sce_tool(ac, tns_trans); coupling_tool(ac, 0, 1); - if (ac->audioObjectType != AOT_AAC_SSR) - transform_sce_tool(ac, window_trans); - else + if (ac->audioObjectType == AOT_AAC_SSR) transform_sce_tool(ac, ssr_trans); + else + transform_sce_tool(ac, window_trans); coupling_tool(ac, 1, 1); if (ac->audioObjectType == AOT_AAC_LTP) transform_sce_tool(ac, ltp_update_trans);

1 0

[soc]: r1956 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 11:10:06 2008 New Revision: 1956 Log: Move the vector-functions that are only used by SSR code closer to the other SSR functions. This is part of adding #ifdefs around all the SSR related code. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 11:10:06 2008 @@ -333,12 +333,6 @@ typedef struct { //aux // TODO: Maybe add to dsputil?! -static void vector_add_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src0[i] + src1[i]; -} - static void vector_fmul_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { memcpy(dst, src0, len * sizeof(float)); ac->dsp.vector_fmul(dst, src1, len); @@ -351,12 +345,6 @@ static void vector_fmul_add_add_add(AACC dst[i] += src3[i]; } -static void vector_reverse(AACContext * ac, float * dst, const float * src, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src[len - i]; -} - static inline int16_t LTP_ROUND(float x) { if (x >= 0) { @@ -1892,6 +1880,12 @@ static void window_ssr_tool(AACContext * } } +static void vector_add_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { + int i; + for (i = 0; i < len; i++) + dst[i] = src0[i] + src1[i]; +} + static void ssr_gain_tool(AACContext * ac, sce_struct * sce, int band, float * in, float * preret, float * saved) { // TODO: 'in' buffer gain normalization if (sce->ics.window_sequence != EIGHT_SHORT_SEQUENCE) { @@ -1948,6 +1942,12 @@ static void ssr_ipqf_tool(AACContext * a } } +static void vector_reverse(AACContext * ac, float * dst, const float * src, int len) { + int i; + for (i = 0; i < len; i++) + dst[i] = src[len - i]; +} + static void ssr_trans(AACContext * ac, sce_struct * sce) { float * in = sce->coeffs; DECLARE_ALIGNED_16(float, tmp_buf[512]);

1 0

[soc]: r1955 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 11:05:34 2008 New Revision: 1955 Log: Move SSR related structs close to each other. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 11:05:34 2008 @@ -205,6 +205,18 @@ typedef struct { int amp[4]; } pulse_struct; +/** + * Parameters for the SSR Inverse Polyphase Quadrature Filter + */ +typedef struct { + float q[4][4]; + float t0[4][12]; + float t1[4][12]; +} ssr_context; + +/** + * Per-element gain control for SSR + */ typedef struct { int max_band; int adjust_num[4][8]; @@ -254,12 +266,6 @@ typedef struct { } cc_struct; typedef struct { - float q[4][4]; - float t0[4][12]; - float t1[4][12]; -} ssr_context; - -typedef struct { // objects AVCodecContext * avccontext; VLC mainvlc;

1 0

[soc]: r1954 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 10:57:58 2008 New Revision: 1954 Log: Do not bother to allocate ssr_context struct. It only saves ~400 bytes (compared to AACContext which is around 30k). Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 10:57:58 2008 @@ -313,7 +313,7 @@ typedef struct { MDCTContext *mdct_ltp; DSPContext dsp; int * vq[11]; - ssr_context * ssrctx; + ssr_context ssrctx; AVRandomState random_state; //bias values @@ -964,9 +964,7 @@ 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); - if((ac->ssrctx = av_malloc(sizeof(ssr_context))) == NULL) - return -1; - ssr_context_init(ac->ssrctx); + ssr_context_init(&ac->ssrctx); } else { ff_mdct_init(&ac->mdct, 11, 1); ff_mdct_init(&ac->mdct_small, 8, 1); @@ -1912,7 +1910,7 @@ static void ssr_gain_tool(AACContext * a } static void ssr_ipqf_tool(AACContext * ac, sce_struct * sce, float * preret) { - ssr_context * ctx = ac->ssrctx; + ssr_context * ctx = &ac->ssrctx; ssr_struct * ssr = sce->ssr; int i, b, j; float x; @@ -2193,7 +2191,6 @@ static int aac_decode_close(AVCodecConte free_vlc(&ac->books[i]); av_free(ac->vq[i]); } - av_free(ac->ssrctx); free_vlc(&ac->mainvlc); ff_mdct_end(&ac->mdct); ff_mdct_end(&ac->mdct_small);

1 0

[soc]: r1953 - libavfilter/README
by vitor 03 Mar '08

03 Mar '08

Author: vitor Date: Mon Mar 3 22:07:18 2008 New Revision: 1953 Log: New build instructions Modified: libavfilter/README Modified: libavfilter/README ============================================================================== --- libavfilter/README (original) +++ libavfilter/README Mon Mar 3 22:07:18 2008 @@ -3,8 +3,9 @@ This is the libavfilter SoC project! Here is what to do to try it out: 1) download current ffmpeg SVN -2) put the directory containing this README file under the newly checked out - ffmpeg source tree as libavfilter +2) put the directory containing this README in an unrelated directory and copy + all the files to the libavfilter/ directory of current SVN, overwriting + allcodecs.c and Makefile. 3) apply the patches under libavfilter/diffs to the main ffmpeg source tree in sequential order 4) run configure with --enable-avfilter

1 0

[soc]: r1952 - in libavfilter: Makefile allfilters.c
by vitor 03 Mar '08

03 Mar '08

Author: vitor Date: Mon Mar 3 22:03:12 2008 New Revision: 1952 Log: Update to main tree build system changes Modified: libavfilter/Makefile libavfilter/allfilters.c Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Mon Mar 3 22:03:12 2008 @@ -10,25 +10,24 @@ OBJS = allfilters.o \ formats.o \ avfiltergraphfile.o \ -# TODO: real conditional compilation +OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o +OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o +OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o +OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o +OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o +OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o +OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o +OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o +OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o +OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o +OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o +OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o +OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o +OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o +OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o -OBJS-$(CONFIG_VF_CROP) += vf_crop.o -OBJS-$(CONFIG_VF_DRAWBOX) += vf_drawbox.o -OBJS-$(CONFIG_VF_FPS) += vf_fps.o -OBJS-$(CONFIG_VF_HFLIP) += vf_hflip.o -OBJS-$(CONFIG_VF_NEGATE) += vf_negate.o -OBJS-$(CONFIG_VF_FIFO) += vf_fifo.o -OBJS-$(CONFIG_VF_FORMAT) += vf_format.o -OBJS-$(CONFIG_VF_OVERLAY) += vf_overlay.o -OBJS-$(CONFIG_VF_ROTATE) += vf_rotate.o -OBJS-$(CONFIG_VF_SCALE) += vf_scale.o -OBJS-$(CONFIG_VF_SETPTS) += vf_setpts.o -OBJS-$(CONFIG_VF_SLICIFY) += vf_slicify.o -OBJS-$(CONFIG_VF_SPLIT) += vf_split.o -OBJS-$(CONFIG_VF_TRANSPOSE) += vf_transpose.o -OBJS-$(CONFIG_VF_VFLIP) += vf_vflip.o -OBJS-$(CONFIG_VSRC_MOVIE) += vsrc_movie.o +OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o HEADERS = avfilter.h Modified: libavfilter/allfilters.c ============================================================================== --- libavfilter/allfilters.c (original) +++ libavfilter/allfilters.c Mon Mar 3 22:03:12 2008 @@ -21,14 +21,10 @@ #include "avfilter.h" -#define REGISTER_VF(X,x) { \ - extern AVFilter avfilter_vf_##x ; \ - if(ENABLE_VF_##X ) avfilter_register(&avfilter_vf_##x ); } - -#define REGISTER_VSRC(X,x) { \ - extern AVFilter avfilter_vsrc_##x ; \ - if(ENABLE_VSRC_##X ) avfilter_register(&avfilter_vsrc_##x ); } +#define REGISTER_FILTER(X,x,y) { \ + extern AVFilter avfilter_##y##_##x ; \ + if(ENABLE_##X##_FILTER ) avfilter_register(&avfilter_##y##_##x ); } void avfilter_register_all(void) { @@ -38,25 +34,25 @@ void avfilter_register_all(void) return; initialized = 1; - REGISTER_VF(CROP,crop); - REGISTER_VF(DRAWBOX,drawbox); - REGISTER_VF(FIFO,fifo); - REGISTER_VF(FORMAT,format); - REGISTER_VF(FPS,fps); - REGISTER_VF(GRAPH,graph); - REGISTER_VF(GRAPHDESC,graphdesc); - REGISTER_VF(GRAPHFILE,graphfile); - REGISTER_VF(HFLIP,hflip); - REGISTER_VF(NEGATE,negate); - REGISTER_VF(NOFORMAT,noformat); - REGISTER_VF(OVERLAY,overlay); - REGISTER_VF(ROTATE,rotate); - REGISTER_VF(SCALE,scale); - REGISTER_VF(SETPTS,setpts); - REGISTER_VF(SLICIFY,slicify); - REGISTER_VF(SPLIT,split); - REGISTER_VF(TRANSPOSE,transpose); - REGISTER_VF(VFLIP,vflip); + REGISTER_FILTER(CROP,crop,vf); + REGISTER_FILTER(DRAWBOX,drawbox,vf); + REGISTER_FILTER(FIFO,fifo,vf); + REGISTER_FILTER(FORMAT,format,vf); + REGISTER_FILTER(FPS,fps,vf); + REGISTER_FILTER(GRAPH,graph,vf); + REGISTER_FILTER(GRAPHDESC,graphdesc,vf); + REGISTER_FILTER(GRAPHFILE,graphfile,vf); + REGISTER_FILTER(HFLIP,hflip,vf); + REGISTER_FILTER(NEGATE,negate,vf); + REGISTER_FILTER(NOFORMAT,noformat,vf); + REGISTER_FILTER(OVERLAY,overlay,vf); + REGISTER_FILTER(ROTATE,rotate,vf); + REGISTER_FILTER(SCALE,scale,vf); + REGISTER_FILTER(SETPTS,setpts,vf); + REGISTER_FILTER(SLICIFY,slicify,vf); + REGISTER_FILTER(SPLIT,split,vf); + REGISTER_FILTER(TRANSPOSE,transpose,vf); + REGISTER_FILTER(VFLIP,vflip,vf); - REGISTER_VSRC(MOVIE,movie); + REGISTER_FILTER(MOVIE,movie,vsrc); }

1 0

[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