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

[soc]: r2054 - libavfilter/avfiltergraph.c
by vitor 26 Mar '08

26 Mar '08

Author: vitor Date: Wed Mar 26 22:06:01 2008 New Revision: 2054 Log: Rename functions now static Modified: libavfilter/avfiltergraph.c Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Wed Mar 26 22:06:01 2008 @@ -253,7 +253,7 @@ static int link_filter(AVFilterGraph *ct return 0; } -int graph_load_from_desc3(AVFilterGraph *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) +static int load_from_desc(AVFilterGraph *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) { AVFilterGraphDescExport *curpad; char tmp[20]; @@ -477,7 +477,7 @@ static int parse_inouts(const char **buf /** * Free a graph description. */ -void avfilter_graph_free_desc(AVFilterGraphDesc *desc) +static void free_desc(AVFilterGraphDesc *desc) { void *next; @@ -624,7 +624,7 @@ static AVFilterGraphDesc *parse_chain(co fail: free_inout(head); - avfilter_graph_free_desc(ret); + free_desc(ret); return NULL; } @@ -643,11 +643,11 @@ int avfilter_graph_parse_chain(AVFilterG if (!desc) return -1; - if (graph_load_from_desc3(graph, desc, in, inpad, out, outpad) < 0) { - avfilter_graph_free_desc(desc); + if (load_from_desc(graph, desc, in, inpad, out, outpad) < 0) { + free_desc(desc); return -1; } - avfilter_graph_free_desc(desc); + free_desc(desc); return 0; }

1 0

[soc]: r2053 - libavfilter/avfiltergraph.c
by vitor 26 Mar '08

26 Mar '08

Author: vitor Date: Wed Mar 26 21:57:17 2008 New Revision: 2053 Log: Move funtion to avoid forward declaration Modified: libavfilter/avfiltergraph.c Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Wed Mar 26 21:57:17 2008 @@ -474,6 +474,40 @@ static int parse_inouts(const char **buf return pad; } +/** + * Free a graph description. + */ +void avfilter_graph_free_desc(AVFilterGraphDesc *desc) +{ + void *next; + + while(desc->filters) { + next = desc->filters->next; + av_free(desc->filters->filter); + av_free(desc->filters->args); + av_free(desc->filters); + desc->filters = next; + } + + while(desc->links) { + next = desc->links->next; + av_free(desc->links); + desc->links = next; + } + + while(desc->inputs) { + next = desc->inputs->next; + av_free(desc->inputs); + desc->inputs = next; + } + + while(desc->outputs) { + next = desc->outputs->next; + av_free(desc->outputs); + desc->outputs = next; + } +} + static AVFilterGraphDesc *parse_chain(const char *filters, int has_in) { AVFilterGraphDesc *ret; @@ -617,38 +651,3 @@ int avfilter_graph_parse_chain(AVFilterG avfilter_graph_free_desc(desc); return 0; } - -/** - * Free a graph description. - */ -void avfilter_graph_free_desc(AVFilterGraphDesc *desc) -{ - void *next; - - while(desc->filters) { - next = desc->filters->next; - av_free(desc->filters->filter); - av_free(desc->filters->args); - av_free(desc->filters); - desc->filters = next; - } - - while(desc->links) { - next = desc->links->next; - av_free(desc->links); - desc->links = next; - } - - while(desc->inputs) { - next = desc->inputs->next; - av_free(desc->inputs); - desc->inputs = next; - } - - while(desc->outputs) { - next = desc->outputs->next; - av_free(desc->outputs); - desc->outputs = next; - } -} -

1 0

[soc]: r2051 - in libavfilter: avfiltergraph.c avfiltergraph.h diffs/04_ffmpeg_filters.diff
by vitor 26 Mar '08

26 Mar '08

Author: vitor Date: Wed Mar 26 21:51:24 2008 New Revision: 2051 Log: Remove usage of AVFilterGraphDesc outside avfiltergraph.c Modified: libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/diffs/04_ffmpeg_filters.diff Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Wed Mar 26 21:51:24 2008 @@ -554,16 +554,25 @@ static AVFilterGraphDesc *parse_chain(co /** * Parse a string describing a filter graph. */ -AVFilterGraphDesc *avfilter_graph_parse_chain(const char *filters) +int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) { - AVFilterGraphDesc *ret; + AVFilterGraphDesc *desc; /* Try first to parse supposing there is no (in) element */ - if ((ret = parse_chain(filters, 0))) - return ret; + if (!(desc = parse_chain(filters, 0))) { + /* If it didn't work, parse supposing there is an (in) element */ + desc = parse_chain(filters, 1); + } + if (!desc) + return -1; - /* Parse supposing there is an (in) element */ - return parse_chain(filters, 1); + if (graph_load_from_desc3(graph, desc, in, inpad, out, outpad) < 0) { + avfilter_graph_free_desc(desc); + return -1; + } + + avfilter_graph_free_desc(desc); + return 0; } /** Modified: libavfilter/avfiltergraph.h ============================================================================== --- libavfilter/avfiltergraph.h (original) +++ libavfilter/avfiltergraph.h Wed Mar 26 21:51:24 2008 @@ -72,12 +72,16 @@ typedef struct AVFilterGraph { } AVFilterGraph; /** - * Parse a graph composed of a simple chain of filters which is described by - * a single string. - * @param filters String listing filters and their arguments. - * @return The parsed graph description. + * Add to a graph a graph described by a string. + * @param graph the filter graph where to link the parsed graph context + * @param filters string to be parsed + * @param in input to the graph to be parsed (TODO: allow several) + * @param inpad pad index of the input + * @param in output to the graph to be parsed (TODO: allow several) + * @param inpad pad index of the output + * @return zero on success, -1 on error */ -AVFilterGraphDesc *avfilter_graph_parse_chain(const char *filters); +int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad); /** * Free a filter graph description. Modified: libavfilter/diffs/04_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/04_ffmpeg_filters.diff (original) +++ libavfilter/diffs/04_ffmpeg_filters.diff Wed Mar 26 21:51:24 2008 @@ -38,7 +38,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -288,6 +303,254 @@ +@@ -288,6 +303,253 @@ static struct termios oldtty; #endif @@ -269,8 +269,7 @@ Index: ffmpeg.c + } + + if(vfilters) { -+ graph_load_from_desc3(filt_graph_all, -+ avfilter_graph_parse_chain(vfilters), ++ avfilter_graph_parse_chain(filt_graph_all, vfilters, + curr_filter, 0, ist->out_video_filter, 0); + } else { + if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0) @@ -293,7 +292,7 @@ Index: ffmpeg.c static void term_exit(void) { #ifdef HAVE_TERMIOS_H -@@ -754,6 +1017,9 @@ +@@ -754,6 +1016,9 @@ if (nb_frames <= 0) return; @@ -303,7 +302,7 @@ Index: ffmpeg.c if (ost->video_crop) { if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); -@@ -763,6 +1029,7 @@ +@@ -763,6 +1028,7 @@ } else { formatted_picture = in_picture; } @@ -311,7 +310,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -778,12 +1045,14 @@ +@@ -778,12 +1044,14 @@ } } @@ -326,7 +325,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1165,6 +1434,17 @@ +@@ -1165,6 +1433,17 @@ &buffer_to_free); } @@ -344,7 +343,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1227,10 +1507,23 @@ +@@ -1227,10 +1506,23 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -368,7 +367,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: do_subtitle_out(os, ost, ist, &subtitle, -@@ -1693,10 +1986,21 @@ +@@ -1693,10 +1985,21 @@ fprintf(stderr, "Cannot get resampling context\n"); exit(1); } @@ -390,7 +389,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3804,6 +4108,9 @@ +@@ -3804,6 +4107,9 @@ #ifdef CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

1 0

[soc]: r2050 - libavfilter/avfiltergraph.c
by vitor 26 Mar '08

26 Mar '08

Author: vitor Date: Wed Mar 26 21:37:43 2008 New Revision: 2050 Log: Simplify graph_load_from_desc3() Modified: libavfilter/avfiltergraph.c Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Wed Mar 26 21:37:43 2008 @@ -160,55 +160,54 @@ int avfilter_graph_config_formats(AVFilt return 0; } -static int graph_load_from_desc2(AVFilterGraph *ctx, AVFilterGraphDesc *desc) +static int create_filter(AVFilterGraph *ctx, int index, char *name, + char *args) { - AVFilterGraphDescFilter *curfilt; - AVFilterGraphDescLink *curlink; - AVFilterContext *filt, *filtb; + AVFilterContext *filt; AVFilter *filterdef; char tmp[20]; - /* create all filters */ - for(curfilt = desc->filters; curfilt; curfilt = curfilt->next) { - snprintf(tmp, 20, "%d", curfilt->index); - if(!(filterdef = avfilter_get_by_name(curfilt->filter)) || - !(filt = avfilter_open(filterdef, tmp))) { - av_log(&log_ctx, AV_LOG_ERROR, - "error creating filter '%s'\n", curfilt->filter); - goto fail; - } - avfilter_graph_add_filter(ctx, filt); - if(avfilter_init_filter(filt, curfilt->args, NULL)) { - av_log(&log_ctx, AV_LOG_ERROR, - "error initializing filter '%s'\n", curfilt->filter); - goto fail; - } + snprintf(tmp, 20, "%d", index); + if(!(filterdef = avfilter_get_by_name(name)) || + !(filt = avfilter_open(filterdef, tmp))) { + av_log(&log_ctx, AV_LOG_ERROR, + "error creating filter '%s'\n", name); + return -1; } - - /* create all links */ - for(curlink = desc->links; curlink; curlink = curlink->next) { - snprintf(tmp, 20, "%d", curlink->src); - if(!(filt = avfilter_graph_get_filter(ctx, tmp))) { - av_log(&log_ctx, AV_LOG_ERROR, "link source does not exist in graph\n"); - goto fail; - } - snprintf(tmp, 20, "%d", curlink->dst); - if(!(filtb = avfilter_graph_get_filter(ctx, tmp))) { - av_log(&log_ctx, AV_LOG_ERROR, "link destination does not exist in graph\n"); - goto fail; - } - if(avfilter_link(filt, curlink->srcpad, filtb, curlink->dstpad)) { - av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n"); - goto fail; - } + avfilter_graph_add_filter(ctx, filt); + if(avfilter_init_filter(filt, args, NULL)) { + av_log(&log_ctx, AV_LOG_ERROR, + "error initializing filter '%s'\n", name); + return -1; } return 0; +} -fail: - uninit(ctx); - return -1; +static int link_filter(AVFilterGraph *ctx, int src, int srcpad, + int dst, int dstpad) +{ + AVFilterContext *filt, *filtb; + + char tmp[20]; + + snprintf(tmp, 20, "%d", src); + if(!(filt = avfilter_graph_get_filter(ctx, tmp))) { + av_log(&log_ctx, AV_LOG_ERROR, "link source does not exist in graph\n"); + return -1; + } + snprintf(tmp, 20, "%d", dst); + if(!(filtb = avfilter_graph_get_filter(ctx, tmp))) { + av_log(&log_ctx, AV_LOG_ERROR, "link destination does not exist in graph\n"); + return -1; + } + if(avfilter_link(filt, srcpad, filtb, dstpad)) { + av_log(&log_ctx, AV_LOG_ERROR, "cannot create link between source and destination filters\n"); + return -1; + } + + return 0; } int graph_load_from_desc3(AVFilterGraph *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) @@ -216,9 +215,23 @@ int graph_load_from_desc3(AVFilterGraph AVFilterGraphDescExport *curpad; char tmp[20]; AVFilterContext *filt; + AVFilterGraphDescFilter *curfilt; + AVFilterGraphDescLink *curlink; - if (graph_load_from_desc2(graph, desc) < 0) - goto fail; + + /* create all filters */ + for(curfilt = desc->filters; curfilt; curfilt = curfilt->next) { + if (create_filter(graph, curfilt->index, curfilt->filter, + curfilt->args) < 0) + goto fail; + } + + /* create all links */ + for(curlink = desc->links; curlink; curlink = curlink->next) { + if (link_filter(graph, curlink->src, curlink->srcpad, + curlink->dst, curlink->dstpad) < 0) + goto fail; + } /* export all input pads */ for(curpad = desc->inputs; curpad; curpad = curpad->next) {

1 0

[soc]: r2049 - in libavfilter: avfiltergraph.c avfiltergraph.h diffs/04_ffmpeg_filters.diff
by vitor 26 Mar '08

26 Mar '08

Author: vitor Date: Wed Mar 26 21:31:53 2008 New Revision: 2049 Log: Rename variable GraphContext -> AVFilterGraph Modified: libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/diffs/04_ffmpeg_filters.diff Modified: libavfilter/avfiltergraph.c ============================================================================== --- libavfilter/avfiltergraph.c (original) +++ libavfilter/avfiltergraph.c Wed Mar 26 21:31:53 2008 @@ -41,7 +41,7 @@ static const AVClass filter_parser_class static const AVClass *log_ctx = &filter_parser_class; -static void uninit(GraphContext *graph) +static void uninit(AVFilterGraph *graph) { for(; graph->filter_count > 0; graph->filter_count --) avfilter_destroy(graph->filters[graph->filter_count - 1]); @@ -49,7 +49,7 @@ static void uninit(GraphContext *graph) } /* TODO: insert in sorted order */ -void avfilter_graph_add_filter(GraphContext *graph, AVFilterContext *filter) +void avfilter_graph_add_filter(AVFilterGraph *graph, AVFilterContext *filter) { graph->filters = av_realloc(graph->filters, sizeof(AVFilterContext*) * ++graph->filter_count); @@ -57,7 +57,7 @@ void avfilter_graph_add_filter(GraphCont } /* search intelligently, once we insert in order */ -AVFilterContext *avfilter_graph_get_filter(GraphContext *graph, char *name) +AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name) { int i; @@ -71,7 +71,7 @@ AVFilterContext *avfilter_graph_get_filt return NULL; } -static int query_formats(GraphContext *graph) +static int query_formats(AVFilterGraph *graph) { int i, j; @@ -133,7 +133,7 @@ static void pick_format(AVFilterLink *li avfilter_formats_unref(&link->out_formats); } -static void pick_formats(GraphContext *graph) +static void pick_formats(AVFilterGraph *graph) { int i, j; @@ -147,7 +147,7 @@ static void pick_formats(GraphContext *g } } -int avfilter_graph_config_formats(GraphContext *graph) +int avfilter_graph_config_formats(AVFilterGraph *graph) { /* find supported formats from sub-filters, and merge along links */ if(query_formats(graph)) @@ -160,7 +160,7 @@ int avfilter_graph_config_formats(GraphC return 0; } -static int graph_load_from_desc2(GraphContext *ctx, AVFilterGraphDesc *desc) +static int graph_load_from_desc2(AVFilterGraph *ctx, AVFilterGraphDesc *desc) { AVFilterGraphDescFilter *curfilt; AVFilterGraphDescLink *curlink; @@ -211,7 +211,7 @@ fail: return -1; } -int graph_load_from_desc3(GraphContext *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) +int graph_load_from_desc3(AVFilterGraph *graph, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad) { AVFilterGraphDescExport *curpad; char tmp[20]; Modified: libavfilter/avfiltergraph.h ============================================================================== --- libavfilter/avfiltergraph.h (original) +++ libavfilter/avfiltergraph.h Wed Mar 26 21:31:53 2008 @@ -69,7 +69,7 @@ typedef struct typedef struct AVFilterGraph { unsigned filter_count; AVFilterContext **filters; -} GraphContext; +} AVFilterGraph; /** * Parse a graph composed of a simple chain of filters which is described by @@ -90,20 +90,20 @@ void avfilter_graph_free_desc(AVFilterGr * @param graph The filter graph * @param filter The filter to be added */ -void avfilter_graph_add_filter(GraphContext *graphctx, AVFilterContext *filter); +void avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter); /** * Configure the formats of all the links in the graph. */ -int avfilter_graph_config_formats(GraphContext *graphctx); +int avfilter_graph_config_formats(AVFilterGraph *graphctx); /** * Configure the parameters (resolution, etc) of all links in the graph. */ -int avfilter_graph_config_links(GraphContext *graphctx); +int avfilter_graph_config_links(AVFilterGraph *graphctx); -int graph_load_from_desc3(GraphContext *ctx, AVFilterGraphDesc *desc, +int graph_load_from_desc3(AVFilterGraph *ctx, AVFilterGraphDesc *desc, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad); Modified: libavfilter/diffs/04_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/04_ffmpeg_filters.diff (original) +++ libavfilter/diffs/04_ffmpeg_filters.diff Wed Mar 26 21:31:53 2008 @@ -208,7 +208,7 @@ Index: ffmpeg.c +{ + AVFilterContext *curr_filter; + /** filter graph containing all filters including input & output */ -+ GraphContext *filt_graph_all = av_mallocz(sizeof(GraphContext)); ++ AVFilterGraph *filt_graph_all = av_mallocz(sizeof(AVFilterGraph)); + AVCodecContext *codec = ost->st->codec; + AVCodecContext *icodec = ist->st->codec; +

1 0

[soc]: r2048 - in eac3: ac3dec.h checkout.sh ffmpeg.patch
by bwolowiec 26 Mar '08

26 Mar '08

Author: bwolowiec Date: Wed Mar 26 14:50:45 2008 New Revision: 2048 Log: updating eac3 svn to ffmpeg rev 12599 Modified: eac3/ac3dec.h eac3/checkout.sh eac3/ffmpeg.patch Modified: eac3/ac3dec.h ============================================================================== --- eac3/ac3dec.h (original) +++ eac3/ac3dec.h Wed Mar 26 14:50:45 2008 @@ -28,6 +28,7 @@ #define AC3DEC_H #include "ac3tab.h" +#include "ac3.h" #include "ac3dec_data.h" #include "bitstream.h" #include "dsputil.h" @@ -49,14 +50,6 @@ #define MAX_BLOCKS 6 #define MAX_SPX_CODES 18 -/** Stream Type */ -typedef enum { - EAC3_STREAM_TYPE_INDEPENDENT = 0, - EAC3_STREAM_TYPE_DEPENDENT, - EAC3_STREAM_TYPE_AC3_CONVERT, - EAC3_STREAM_TYPE_RESERVED -} EAC3StreamType; - /** * table for exponent to scale_factor mapping * ff_ac3_scale_factors[i] = 2 ^ -i Modified: eac3/checkout.sh ============================================================================== --- eac3/checkout.sh (original) +++ eac3/checkout.sh Wed Mar 26 14:50:45 2008 @@ -4,7 +4,7 @@ echo "checking out ffmpeg svn" for i in $FILES Makefile ac3_parser.c ac3enc.c ac3.c ac3.h; do rm -f ffmpeg/libavcodec/$i done -svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 12191 +svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r 12599 echo "patching ffmpeg" cd ffmpeg patch -p0 <../ffmpeg.patch Modified: eac3/ffmpeg.patch ============================================================================== --- eac3/ffmpeg.patch (original) +++ eac3/ffmpeg.patch Wed Mar 26 14:50:45 2008 @@ -1,9 +1,9 @@ Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 12191) +--- libavcodec/Makefile (revision 12599) +++ libavcodec/Makefile (working copy) -@@ -33,7 +33,7 @@ - HEADERS = avcodec.h opt.h +@@ -30,7 +30,7 @@ + OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_AASC_DECODER) += aasc.o -OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o ac3.o mdct.o fft.o @@ -13,7 +13,7 @@ Index: libavcodec/Makefile OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o Index: libavcodec/ac3_parser.c =================================================================== ---- libavcodec/ac3_parser.c (revision 12191) +--- libavcodec/ac3_parser.c (revision 12599) +++ libavcodec/ac3_parser.c (working copy) @@ -38,7 +38,6 @@ { @@ -28,10 +28,10 @@ Index: libavcodec/ac3_parser.c hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2; + hdr->num_blocks = 6; + hdr->stream_type = EAC3_STREAM_TYPE_INDEPENDENT; } else { /* Enhanced AC-3 */ - hdr->crc1 = 0; -@@ -101,9 +101,9 @@ +@@ -105,9 +105,9 @@ return AC3_PARSE_ERROR_SAMPLE_RATE; hdr->sample_rate = ff_ac3_sample_rate_tab[sr_code2] / 2; hdr->sr_shift = 1; @@ -43,7 +43,7 @@ Index: libavcodec/ac3_parser.c hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code]; hdr->sr_shift = 0; } -@@ -112,7 +112,7 @@ +@@ -116,7 +116,7 @@ hdr->lfe_on = get_bits1(&gbc); hdr->bit_rate = (uint32_t)(8.0 * hdr->frame_size * hdr->sample_rate / @@ -52,18 +52,18 @@ Index: libavcodec/ac3_parser.c hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; } -@@ -133,7 +133,7 @@ - *sample_rate = hdr.sample_rate; - *bit_rate = hdr.bit_rate; - *channels = hdr.channels; -- *samples = AC3_FRAME_SIZE; -+ *samples = hdr.num_blocks * 256; +@@ -136,7 +136,7 @@ + hdr_info->sample_rate = hdr.sample_rate; + hdr_info->bit_rate = hdr.bit_rate; + hdr_info->channels = hdr.channels; +- hdr_info->samples = AC3_FRAME_SIZE; ++ hdr_info->samples = hdr.num_blocks * 256; return hdr.frame_size; } Index: libavcodec/ac3.c =================================================================== ---- libavcodec/ac3.c (revision 12191) +--- libavcodec/ac3.c (revision 12599) +++ libavcodec/ac3.c (working copy) @@ -173,7 +173,8 @@ } @@ -96,9 +96,9 @@ Index: libavcodec/ac3.c /** Index: libavcodec/ac3.h =================================================================== ---- libavcodec/ac3.h (revision 12191) +--- libavcodec/ac3.h (revision 12599) +++ libavcodec/ac3.h (working copy) -@@ -94,6 +94,7 @@ +@@ -95,6 +95,7 @@ uint32_t bit_rate; uint8_t channels; uint16_t frame_size; @@ -106,7 +106,7 @@ Index: libavcodec/ac3.h /** @} */ } AC3HeaderInfo; -@@ -156,10 +157,12 @@ +@@ -163,10 +164,12 @@ * @param[in] end ending bin location * @param[in] snr_offset SNR adjustment * @param[in] floor noise floor @@ -122,7 +122,7 @@ Index: libavcodec/ac3.h int8_t *exp, int start, int end, Index: libavcodec/ac3enc.c =================================================================== ---- libavcodec/ac3enc.c (revision 12191) +--- libavcodec/ac3enc.c (revision 12599) +++ libavcodec/ac3enc.c (working copy) @@ -463,7 +463,8 @@ for(ch=0;ch<s->nb_all_channels;ch++) {

1 0

[rfc] using git for the new students
by Luca Barbato 26 Mar '08

26 Mar '08

Beside the concerns from mike and possibly others (I'll guide you through the git documentation pointing the nice one and/or giving you answers), I'd like to use git to manage our students this year. Pros: - sane branch : mentors won't have to track by diff and new files like the last year, you can get your branch from the main git repo and pull changes from the student repo. - good merge support : getting the whole history back (even cleaned up if necessary) will be way simpler thanks git-svn. Cons: - mentors have to learn git. lu -- Luca Barbato Gentoo Council Member Gentoo/linux Gentoo/PPC http://dev.gentoo.org/~lu_zero

2 1

[soc]: r2047 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:57:19 2008 New Revision: 2047 Log: zero all array Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:57:19 2008 @@ -92,7 +92,7 @@ static void qmf_decompose(DCAContext *c, (0.0, 0.0, ..., 0.0, -1.0, 1.0, 0.0, ..., 0.0) so that -1.0 cancels 1.0 from the previous step */ - memset(accum,0,sizeof(int32_t)); + memset(accum,0,sizeof(accum)); for (k = 48, j = 0, i = c->start[channel]; i < 512; k++, j++, i++) accum[(k & 32) ? (31 - (k & 31)) : (k & 31)] += mul32(c->history[channel][i], UnQMF[j]);

1 0

[soc]: r2046 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:56:04 2008 New Revision: 2046 Log: this variable is unused for now Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:56:04 2008 @@ -339,7 +339,7 @@ static int DCA_encode_frame(AVCodecConte } static int DCA_encode_init(AVCodecContext *avctx) { - DCAContext *c = avctx->priv_data; + //DCAContext *c = avctx->priv_data; if(avctx->channels != 2 || avctx->sample_rate != 44100) { av_log(avctx, AV_LOG_ERROR, "Only 44.1 kHz stereo is supported at the moment!\n");

1 0

[soc]: r2045 - dcaenc/dcaenc.c
by kostya 26 Mar '08

26 Mar '08

Author: kostya Date: Wed Mar 26 06:55:33 2008 New Revision: 2045 Log: identation Modified: dcaenc/dcaenc.c Modified: dcaenc/dcaenc.c ============================================================================== --- dcaenc/dcaenc.c (original) +++ dcaenc/dcaenc.c Wed Mar 26 06:55:33 2008 @@ -329,9 +329,9 @@ static int DCA_encode_frame(AVCodecConte for (k = 0; k < 32; k++) { /* k is the sample number in a 32-sample block */ c->pcm[k] = samples[2 * (32*i+k) + channel] << 16; } - /* Put subband samples into the proper place */ - qmf_decompose(c, c->pcm, &c->subband[i][channel][0], channel); - } + /* Put subband samples into the proper place */ + qmf_decompose(c, c->pcm, &c->subband[i][channel][0], channel); + } put_frame(c, c->subband, frame);

1 0