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

AAC integration
by Andreas Öman 10 Mar '08

10 Mar '08

Michael, I'm quite satisfied with the shape of the AAC-LC decoder now. I assume there will be a couple of review + patch rounds before it can hit ffmpeg trunk. Would you like to do a direct review of aac.c here in the soc repo, or should i prep a patch for lavc?

6 12

[soc]: r2004 - aac/aac.c
by andoma 10 Mar '08

10 Mar '08

Author: andoma Date: Mon Mar 10 19:10:51 2008 New Revision: 2004 Log: Precalculate scaling differently to avoid a few divisions. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Mon Mar 10 19:10:51 2008 @@ -391,7 +391,7 @@ typedef struct { cpe_struct *mm_front; ///< Front CPE to use for matrix mixdown cpe_struct *mm_back; ///< Back CPE to use for matrix mixdown float add_bias; ///< Offset for dsp.float_to_int16 - float scale_bias; ///< Bias for dsp.float_to_int16 + float sf_scale; ///< Prescale for correct IMDCT and dsp.float_to_int16 /** @} */ } AACContext; @@ -975,7 +975,7 @@ static int aac_decode_init(AVCodecContex /* Initialize RNG dither */ av_init_random(0x1f2e3d4c, &ac->random_state); - // 1024 - compensate wrong IMDCT method + // -1024 - compensate wrong IMDCT method // 32768 - values in AAC build for ready float->int 16 bit audio, using // BIAS method instead needs values -1<x<1 for (i = 0; i < 256; i++) @@ -985,13 +985,13 @@ static int aac_decode_init(AVCodecContex if(ac->dsp.float_to_int16 == ff_float_to_int16_c) { ac->add_bias = 385.0f; - ac->scale_bias = -32768.0f; + ac->sf_scale = 1. / (-1024. * 32768.); } else { ac->add_bias = 0.0f; - ac->scale_bias = -1.0f; + ac->sf_scale = 1. / -1024.; } for (i = 0; i < 256; i++) - ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) /1024./ac->scale_bias; + ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) * ac->sf_scale; if(init_vlc(&ac->mainvlc, 7, sizeof(code)/sizeof(code[0]), bits, sizeof(bits[0]), sizeof(bits[0]), @@ -1054,7 +1054,7 @@ static void ltp_data(AACContext * ac, Ge assert(0); } else { ltp->lag = get_bits(gb, 11); - ltp->coef = ltp_coef[get_bits(gb, 3)] * (-2./ac->scale_bias/1024.); // wrong mdct method + ltp->coef = ltp_coef[get_bits(gb, 3)] * (-2 * ac->sf_scale); for (sfb = 0; sfb < FFMIN(max_sfb, MAX_LTP_LONG_SFB); sfb++) ltp->used[sfb] = get_bits1(gb); } @@ -1195,7 +1195,7 @@ static int scale_factor_data(AACContext } else { noise += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60; } - sf[g][i] = pow(2.0, 0.25 * noise)/1024./ac->scale_bias; + sf[g][i] = pow(2.0, 0.25 * noise) * ac->sf_scale; } else { global_gain += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60; if(global_gain > 255) {

1 0

[soc]: r2003 - aac/aac.c
by andoma 10 Mar '08

10 Mar '08

Author: andoma Date: Mon Mar 10 18:57:13 2008 New Revision: 2003 Log: Invert scale_bias to get correct sign in output. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Mon Mar 10 18:57:13 2008 @@ -985,10 +985,10 @@ static int aac_decode_init(AVCodecContex if(ac->dsp.float_to_int16 == ff_float_to_int16_c) { ac->add_bias = 385.0f; - ac->scale_bias = 32768.0f; + ac->scale_bias = -32768.0f; } else { ac->add_bias = 0.0f; - ac->scale_bias = 1.0f; + ac->scale_bias = -1.0f; } for (i = 0; i < 256; i++) ac->pow2sf_tab[i] = pow(2, (i - 100)/4.) /1024./ac->scale_bias;

2 1

Summer of Code
by Marcondes Ricarte 10 Mar '08

10 Mar '08

Hello, I would like to know if the CSCS will participate in the Summer of Code 2008? What are the types of systems are you think to develop? Marcondes Ricarte

4 7

[soc]: r2002 - in dvbmuxer: mpeg_pes.h mpeg_pes_enc.c mpegpes.h mpegpesenc.c mpegtsenc.c
by bcoudurier 10 Mar '08

10 Mar '08

Author: bcoudurier Date: Mon Mar 10 14:36:25 2008 New Revision: 2002 Log: rename: mpeg_pes -> mpegpes Added: dvbmuxer/mpegpes.h - copied, changed from r1845, /dvbmuxer/mpeg_pes.h dvbmuxer/mpegpesenc.c - copied, changed from r1845, /dvbmuxer/mpeg_pes_enc.c Removed: dvbmuxer/mpeg_pes.h dvbmuxer/mpeg_pes_enc.c Modified: dvbmuxer/mpegtsenc.c Copied: dvbmuxer/mpegpes.h (from r1845, /dvbmuxer/mpeg_pes.h) ============================================================================== --- /dvbmuxer/mpeg_pes.h (original) +++ dvbmuxer/mpegpes.h Mon Mar 10 14:36:25 2008 @@ -20,7 +20,7 @@ */ /** - * @file mpeg_pes.h + * @file mpegpes.h * MPEG PES packetizer API header */ Copied: dvbmuxer/mpegpesenc.c (from r1845, /dvbmuxer/mpeg_pes_enc.c) ============================================================================== --- /dvbmuxer/mpeg_pes_enc.c (original) +++ dvbmuxer/mpegpesenc.c Mon Mar 10 14:36:25 2008 @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "mpeg_pes.h" +#include "mpegpes.h" #include "bytestream.h" /** Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Mon Mar 10 14:36:25 2008 @@ -22,7 +22,7 @@ #include "crc.h" #include "mpegts.h" #include "bytestream.h" -#include "mpeg_pes.h" +#include "mpegpes.h" /* write DVB SI sections */

1 0

[soc]: r2001 - dvbmuxer/mpegtsenc.c
by bcoudurier 10 Mar '08

10 Mar '08

Author: bcoudurier Date: Mon Mar 10 14:35:12 2008 New Revision: 2001 Log: remove useless variables Modified: dvbmuxer/mpegtsenc.c Modified: dvbmuxer/mpegtsenc.c ============================================================================== --- dvbmuxer/mpegtsenc.c (original) +++ dvbmuxer/mpegtsenc.c Mon Mar 10 14:35:12 2008 @@ -786,18 +786,7 @@ static int output_packet(AVFormatContext static int mpegts_write_packet(AVFormatContext *ctx, AVPacket *pkt) { - int stream_index= pkt->stream_index; - int size = pkt->size; - static int total_size = 0; - AVStream *st = ctx->streams[stream_index]; - MpegTSWriteStream *stream = st->priv_data; - PESStream *pes_stream = &stream->pes_stream; - int64_t pts; - - total_size += size; ff_pes_write_packet(ctx, pkt); - pts= pes_stream->predecode_packet->pts; - for(;;){ int ret = output_packet(ctx, 0); if(ret<=0)

1 0

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

08 Mar '08

Author: vitor Date: Sat Mar 1 12:04:16 2008 New Revision: 1951 Log: Add box drawing filter. Draws a box of given dimensions and color in pictures. This filter is a good template for a filter that modifies the input frame (like a hardsub filter, for exemple). It is also a good testbed to the permission flags implementation. Contributed by Mike Sullivan (mike <_at_> affinesystems.com) Added: libavfilter/vf_drawbox.c Modified: libavfilter/Makefile libavfilter/allfilters.c Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Sat Mar 1 12:04:16 2008 @@ -14,6 +14,7 @@ OBJS = allfilters.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 Modified: libavfilter/allfilters.c ============================================================================== --- libavfilter/allfilters.c (original) +++ libavfilter/allfilters.c Sat Mar 1 12:04:16 2008 @@ -39,6 +39,7 @@ void avfilter_register_all(void) initialized = 1; REGISTER_VF(CROP,crop); + REGISTER_VF(DRAWBOX,drawbox); REGISTER_VF(FIFO,fifo); REGISTER_VF(FORMAT,format); REGISTER_VF(FPS,fps); Added: libavfilter/vf_drawbox.c ============================================================================== --- (empty file) +++ libavfilter/vf_drawbox.c Sat Mar 1 12:04:16 2008 @@ -0,0 +1,184 @@ +/* + * Box drawing filter. Also a nice template for a filter that needs to write + * in the input frame. + * + * Copyright (c) 2008 Mike Sullivan + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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 + */ + +#include <string.h> +#include <stdio.h> +#include <ctype.h> + +#include "avfilter.h" + +typedef struct +{ + const char *name; + unsigned char y; + unsigned char cb; + unsigned char cr; +} box_color; + +#define NUM_COLORS 8 +static box_color colors[] = +{ + {.name = "blue", .y = 40, .cr = 109, .cb = 240}, + {.name = "red", .y = 81, .cr = 240, .cb = 90}, + {.name = "black", .y = 16, .cr = 128, .cb = 128}, + {.name = "white", .y = 255, .cr = 128, .cb = 128}, + {.name = "green", .y = 144, .cr = 34, .cb = 53}, + {.name = "yellow", .y = 210, .cr = 146, .cb = 16}, + {.name = "gray", .y = 128, .cr = 128, .cb = 128}, + {.name = "grey", .y = 128, .cr = 128, .cb = 128} +}; + +typedef struct +{ + int x,y,w,h; + box_color color; + int vsub,hsub; //< chroma subsampling +} BoxContext; + +static void strlwr(char *str) +{ + int i = 0; + while(str[i] != '\0') { + if(isupper(str[i])) + str[i] = tolower(str[i]); + + i++; + } +} + +static box_color get_color(char *color) +{ + box_color tmp; + int i; + strlwr(color); + for(i = NUM_COLORS - 1; i >= 0; i--) { + tmp = colors[i]; + if(!strcmp(color, colors[i].name)) + break; + } + return tmp; +} + +static int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + BoxContext *context= ctx->priv; + char tmp[1024]; + + if(!args || strlen(args) > 1024) { + av_log(ctx, AV_LOG_ERROR, "Invalid arguments!\n"); + return -1; + } + + sscanf(args, "%d:%d:%d:%d:%s", &(context->x), &(context->y), + &(context->w), &(context->h), tmp); + + context->color = get_color(tmp); + return 0; +} + +static int query_formats(AVFilterContext *ctx) +{ + avfilter_set_common_formats(ctx, + avfilter_make_format_list(10, + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P) + ); + return 0; +} + +static int config_input(AVFilterLink *link) +{ + BoxContext *context = link->dst->priv; + + avcodec_get_chroma_sub_sample(link->format, + &context->hsub, &context->vsub); + + return 0; +} + +static void start_frame(AVFilterLink *link, AVFilterPicRef *picref) +{ + avfilter_start_frame(link->dst->outputs[0], picref); +} + + +static void draw_box(AVFilterPicRef *pic, BoxContext* context, box_color color) +{ + int x,y; + int channel; + unsigned char *row[4]; + int xb = context->x; + int yb = context->y; + + for (y = yb; (y < yb + context->h) && y < pic->h; y++) { + row[0] = pic->data[0] + y * pic->linesize[0]; + + for (channel = 1; channel < 3; channel++) + row[channel] = pic->data[channel] + + pic->linesize[channel] * (y>> context->vsub); + + for (x = xb; (x < xb + context->w) && x < pic->w; x++) + if((y - yb < 3) || (yb + context->h - y < 4) || + (x - xb < 3) || (xb + context->w - x < 4)) { + row[0][x] = color.y; + row[1][x >> context->hsub] = color.cb; + row[2][x >> context->hsub] = color.cr; + } + } +} + +static void end_frame(AVFilterLink *link) +{ + BoxContext *context = link->dst->priv; + AVFilterLink* output = link->dst->outputs[0]; + AVFilterPicRef *pic = link->cur_pic; + + draw_box(pic,context,context->color); + + avfilter_draw_slice(output, 0, pic->h); + avfilter_end_frame(output); +} + +AVFilter avfilter_vf_drawbox= +{ + .name = "drawbox", + .priv_size = sizeof(BoxContext), + .init = init, + + .query_formats = query_formats, + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, + .start_frame = start_frame, + .end_frame = end_frame, + .config_props = config_input, + .min_perms = AV_PERM_WRITE | + AV_PERM_READ, + .rej_perms = AV_PERM_REUSE | + AV_PERM_REUSE2}, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = CODEC_TYPE_VIDEO, }, + { .name = NULL}}, +};

3 3

[soc]: r2000 - libavfilter/vf_drawbox.c
by victor 08 Mar '08

08 Mar '08

Author: victor Date: Sun Mar 9 00:39:11 2008 New Revision: 2000 Log: Prefix strlwr() to prevent conflicts in platforms that define it. Modified: libavfilter/vf_drawbox.c Modified: libavfilter/vf_drawbox.c ============================================================================== --- libavfilter/vf_drawbox.c (original) +++ libavfilter/vf_drawbox.c Sun Mar 9 00:39:11 2008 @@ -55,7 +55,7 @@ typedef struct int vsub,hsub; //< chroma subsampling } BoxContext; -static void strlwr(char *str) +static void box_strlwr(char *str) { int i = 0; while(str[i] != '\0') { @@ -70,7 +70,7 @@ static box_color get_color(char *color) { box_color tmp; int i; - strlwr(color); + box_strlwr(color); for(i = NUM_COLORS - 1; i >= 0; i--) { tmp = colors[i]; if(!strcmp(color, colors[i].name))

1 0

[soc]: r1999 - libavfilter/avfiltergraphdesc.c
by vitor 08 Mar '08

08 Mar '08

Author: vitor Date: Sat Mar 8 22:09:01 2008 New Revision: 1999 Log: WIP work in new parser. avfilter_graph_parse_chain() now ignores whitespace Modified: libavfilter/avfiltergraphdesc.c Modified: libavfilter/avfiltergraphdesc.c ============================================================================== --- libavfilter/avfiltergraphdesc.c (original) +++ libavfilter/avfiltergraphdesc.c Sat Mar 8 22:09:01 2008 @@ -187,41 +187,167 @@ int avfilter_graph_parse_desc(AVFilterGr return 0; } +typedef struct Parser +{ + char next_chr; + char *buf; +} Parser; + +static void consume_whitespace(Parser *p) +{ + while (p->next_chr == ' ' || p->next_chr == '\n' || p->next_chr == '\t') { + p->buf++; + p->next_chr = p->buf[0]; + } +} + +static void init_parser(Parser *p, char *buf) +{ + p->buf = buf; + p->next_chr = buf[0]; + consume_whitespace(p); +} + +static char consume_char(Parser *p) +{ + char out; + consume_whitespace(p); + + out = p->next_chr; + + if (out) { + p->buf++; + p->next_chr = p->buf[0]; + } + + return out; +} + +static void unquote(char *str) +{ + char *p1, *p2; + p1=p2=str; + while (p1[0] != 0) { + if (p1[0] == '\'') p1++; + p2[0] = p1[0]; + p1++; + p2++; + } + + p2[0] = 0; +} + +static char *consume_string(Parser *p, int escaped) +{ + char *out; + int has_quoted=0; + int quit=0; + + while (p->buf[0] == ' ' || p->buf[0] == '\n' || p->buf[0] == '\t') + p->buf++; + + if (!p->buf[0]) { + p->next_chr = 0; + return p->buf; + } + + out = p->buf; + + while(!quit) { + switch(p->buf[0]) { + case 0: + case ' ': + case '(': + case ')': + case '=': + case ',': + quit=1; + break; + case '\'': + has_quoted = has_quoted || escaped; + do { + p->buf++; + } while(escaped && p->buf[0] && p->buf[0] != '\''); + if (p->buf[0] == '\'') p->buf++; + break; + default: + p->buf++; + break; + } + } + p->next_chr = p->buf[0]; + p->buf[0]=0; + + if(has_quoted) + unquote(out); + return out; +} + +static int parse_link_name(Parser *p, char **name) +{ + if (consume_char(p) != '(') + goto fail; + + *name = consume_string(p,0); + + if (!*name[0]) + goto fail; + + if (consume_char(p) != ')') + goto fail; + + return 0; + + fail: + *name = NULL; + return AVERROR_INVALIDDATA; +} + +static int parse_filter2(Parser *p, char **name, char **opts) +{ + char *null_str; + + *name = consume_string(p,0); + + null_str = p->buf; + + if (p->next_chr == '=') { + consume_char(p); + *opts = consume_string(p,1); + } else { + *opts = null_str; + } + return 0; +} + AVFilterGraphDesc *avfilter_graph_parse_chain(const char *filters) { AVFilterGraphDesc *ret; AVFilterGraphDescFilter **filterp, *filtern; AVFilterGraphDescLink **linkp, *linkn; - - char *str, *cur; + Parser p; + char *str; int index = 0; - cur = str = av_strdup(filters); - if(!(ret = av_mallocz(sizeof(AVFilterGraphDesc)))) - goto done; + return NULL; + + str = av_strdup(filters); + init_parser(&p, str); filterp = &ret->filters; linkp = &ret->links; - while(cur) { - char *nextfilter; + do { + char *filter; char *args; - nextfilter = strchr(cur, ','); - if(nextfilter) - *nextfilter++ = 0; - - args = strchr(cur, '='); - if(args) - *args++ = 0; - filtern = av_mallocz(sizeof(AVFilterGraphDescFilter)); filtern->name = av_malloc(8); snprintf(filtern->name, 8, "%d", index); - filtern->filter = av_strdup(cur); - if(args) - filtern->args = av_strdup(args); + parse_filter2(&p, &filter, &args); + filtern->filter = av_strdup(filter); + filtern->args = av_strdup(args); *filterp = filtern; filterp = &filtern->next; @@ -235,10 +361,10 @@ AVFilterGraphDesc *avfilter_graph_parse_ *linkp = linkn; linkp = &linkn->next; } - - cur = nextfilter; index ++; - } + } while (consume_char(&p) == ','); + + av_free(str); ret->inputs = av_mallocz(sizeof(AVFilterGraphDescExport)); ret->inputs->filter = av_malloc(8); @@ -248,8 +374,6 @@ AVFilterGraphDesc *avfilter_graph_parse_ ret->outputs->filter = av_malloc(8); snprintf(ret->outputs->filter, 8, "%d", index-1); -done: - av_free(str); return ret; }

1 0

[soc]: r1998 - libavfilter/Makefile
by vitor 08 Mar '08

08 Mar '08

Author: vitor Date: Sat Mar 8 20:57:46 2008 New Revision: 1998 Log: Yet another syncing with SVN Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Sat Mar 8 20:57:46 2008 @@ -1,5 +1,10 @@ include ../config.mak +NAME = avfilter +FFLIBS = avcodec avutil +FFLIBS-$(CONFIG_SWSCALER) += swscale +FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat + OBJS = allfilters.o \ avfilter.o \ avfiltergraph.o \ @@ -29,11 +34,4 @@ OBJS-$(CONFIG_MOVIE_FILTER) += vsrc HEADERS = avfilter.h -FFLIBS = avcodec avutil - -FFLIBS-$(CONFIG_SWSCALER) += swscale -FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat - -NAME=avfilter - include ../common.mak

1 0