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

Hi there.......
by Jai Menon 26 Apr '08

26 Apr '08

Hi, With reference to Mike (Melanson) 's mail, I'm posting this as an introduction. I have been assigned the Apple Lossless Encoder task mentored by Justin Ruggles. Looking forward to completing this in a timely manner. Best of luck with your projects as well !! Regards, Jai Menon <realityman(a)gmx.net>

8 9

Hello everyone
by Keiji Costantini 25 Apr '08

25 Apr '08

(This is the third time I send this message - this time with the "valid" address) Hi all, I just subscribed to this mailing-list after reading Mike's mail (got a bit to search it, it was submerged by the google's ml-spam ^^') I apologize I'm going to open another thread while there is already one because I couldn't "reply to" any email (I didn't receive any yet :P - I just subscribed) I've been assigned for "LGPL reimplementation of GPL sws_scale parts" mentored by Luca Barbato. I'm very glad to be part of this project and this event. Best luck also from me to everyone! Regards (and apologizes for any mistake in my "Italian" English ^^') , Keiji Costantini

1 0

Hello everyone
by Keiji 25 Apr '08

25 Apr '08

Hello everyone! (let's see if this one will reach the ml) I read Mike's mail and subscribed to this ml. I was assigned to the " LGPL reimplementation of GPL sws_scale parts <http://code.google.com/soc/2008/ffmpeg/appinfo.html?csaid=5643E4EB650D683F>", mentored by Luca Barbato. I'm very glad to be part of this project and this event. Good luck to everyone from me too! Best regards (and apologizes for any mistake in my "Italian" English ^^') Keiji Costantini

1 0

Hello everyone
by Keiji 25 Apr '08

25 Apr '08

Hi all, I just subscribed to this mailing-list after reading Mike's mail (got a bit to search it, it was submerged by the google's ml-spam ^^') I apologize I'm going to open another thread while there is already one because I couldn't "reply to" any email (I didn't receive any yet :P - I just subscribed) I've been assigned for "LGPL reimplementation of GPL sws_scale parts" <http://code.google.com/soc/2008/ffmpeg/appinfo.html?csaid=5643E4EB650D683F> mentored by Luca Barbato. I'm looking forward to accomplish to this task in this summer ^^ Best luck also from me to everyone! Regards, Keiji Costantini

1 0

extension of ac3 parser
by Bartlomiej Wolowiec 24 Apr '08

24 Apr '08

I have a question, do the changes in parser, allowing it to correctly read the number of channels from package of frames, should be commited to soc repository or prepared to main repository? Required parts of the code: in AACAC3ParseContext adding int (*parse_header)(...) which, having full set of frames from buffer, will set parameters To allow realization of this function for eac3 I will add also: arrays to add in ac3tab.c ff_eac3_default_chmap (Default channel map for a dependent substream defined by acmod) ff_ac3_channels_mutliple (Number of channels determined by one bit in channel_map) adding parameter to ff_ac3_parse_header characterizing if the function should set channel_map in AC3HeaderInfo (read more bits) adding function (rep_channels and channels_bitmask will be used in decoder code): /** Reads full information about channels in eac3 frames @param buf[in] Array with frames @param bufsize[in] total size of frames @param channels_bitmask[out] bitmask describing all used channels @param rep_channels[out] 16-element array determinig how many times channel occured in frames @return Returns number of channels in the case of success or -1 in the case of error */ int ff_ac3_channels_info(const uint8_t *buf, int buf_size, uint16_t *channels_bitmask, int *rep_channels); -- Bartlomiej Wolowiec

3 15

[soc]: r2167 - libavfilter/Makefile
by vitor 24 Apr '08

24 Apr '08

Author: vitor Date: Thu Apr 24 15:01:21 2008 New Revision: 2167 Log: Sync with SVN Patch by Vitaliy Ostrovskiy (vitost at gmail). Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Thu Apr 24 15:01:21 2008 @@ -1,4 +1,4 @@ -include ../config.mak +include $(SUBDIR)../config.mak NAME = avfilter FFLIBS = avcodec avutil @@ -33,4 +33,4 @@ OBJS-$(CONFIG_MOVIE_FILTER) += vsrc HEADERS = avfilter.h -include ../common.mak +include $(SUBDIR)../subdir.mak

1 0

[soc]: r2166 - libavfilter/diffs/04_ffmpeg_filters.diff
by vitor 24 Apr '08

24 Apr '08

Author: vitor Date: Thu Apr 24 14:56:32 2008 New Revision: 2166 Log: Fix compilation. Thanks to Vitaliy Ostrovskiy for noticing it and suggesting a fix. Modified: libavfilter/diffs/04_ffmpeg_filters.diff Modified: libavfilter/diffs/04_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/04_ffmpeg_filters.diff (original) +++ libavfilter/diffs/04_ffmpeg_filters.diff Thu Apr 24 14:56:32 2008 @@ -39,7 +39,7 @@ Index: ffmpeg.c } AVInputStream; typedef struct AVInputFile { -@@ -288,6 +304,255 @@ +@@ -288,6 +304,266 @@ static struct termios oldtty; #endif @@ -270,9 +270,20 @@ Index: ffmpeg.c + } + + if(vfilters) { -+ if (avfilter_parse_graph(filt_graph_all, vfilters, -+ curr_filter, 0, -+ ist->out_video_filter, 0, NULL) < 0) ++ AVFilterInOut *inouts = av_malloc(sizeof(AVFilterInOut)); ++ inouts->name = "in"; ++ inouts->filter = curr_filter; ++ inouts->type = LinkTypeOut; ++ inouts->pad_idx = 0; ++ inouts->next = av_malloc(sizeof(AVFilterInOut)); ++ ++ inouts->next->name = "out"; ++ inouts->next->filter = ist->out_video_filter; ++ inouts->next->type = LinkTypeIn; ++ inouts->next->pad_idx = 0; ++ inouts->next->next = NULL; ++ ++ if (avfilter_parse_graph(filt_graph_all, vfilters, inouts, NULL) < 0) + return -1; + } else { + if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0) @@ -295,7 +306,7 @@ Index: ffmpeg.c static void term_exit(void) { #ifdef HAVE_TERMIOS_H -@@ -754,6 +1019,9 @@ +@@ -754,6 +1030,9 @@ if (nb_frames <= 0) return; @@ -305,7 +316,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 +1031,7 @@ +@@ -763,6 +1042,7 @@ } else { formatted_picture = in_picture; } @@ -313,7 +324,7 @@ Index: ffmpeg.c final_picture = formatted_picture; padding_src = formatted_picture; -@@ -778,12 +1047,14 @@ +@@ -778,12 +1058,14 @@ } } @@ -328,7 +339,7 @@ Index: ffmpeg.c if (ost->video_pad) { av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, -@@ -1053,6 +1324,7 @@ +@@ -1053,6 +1335,7 @@ static short *samples= NULL; AVSubtitle subtitle, *subtitle_to_free; int got_subtitle; @@ -336,7 +347,7 @@ Index: ffmpeg.c if(ist->next_pts == AV_NOPTS_VALUE) ist->next_pts= ist->pts; -@@ -1165,6 +1437,17 @@ +@@ -1165,6 +1448,17 @@ &buffer_to_free); } @@ -354,7 +365,7 @@ Index: ffmpeg.c // preprocess audio (volume) if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) { if (audio_volume != 256) { -@@ -1202,9 +1485,16 @@ +@@ -1202,9 +1496,16 @@ } } #endif @@ -371,7 +382,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1227,6 +1517,9 @@ +@@ -1227,6 +1528,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -381,7 +392,7 @@ Index: ffmpeg.c do_video_out(os, ost, ist, &picture, &frame_size); video_size += frame_size; if (vstats_filename && frame_size) -@@ -1285,7 +1578,15 @@ +@@ -1285,7 +1589,15 @@ av_free_packet(&opkt); } } @@ -397,7 +408,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1693,10 +1994,21 @@ +@@ -1693,10 +2005,21 @@ fprintf(stderr, "Cannot get resampling context\n"); exit(1); } @@ -419,7 +430,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3804,6 +4116,9 @@ +@@ -3804,6 +4127,9 @@ #ifdef CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

1 0

[soc]: r2152 - libavfilter/graphparser.c
by vitor 24 Apr '08

24 Apr '08

Author: vitor Date: Wed Apr 23 20:24:46 2008 New Revision: 2152 Log: Replace if(acroread appli_Goethe.pdf &){B}else{C} by if(a){C}else{B} Modified: libavfilter/graphparser.c Modified: libavfilter/graphparser.c ============================================================================== --- libavfilter/graphparser.c (original) +++ libavfilter/graphparser.c Wed Apr 23 20:24:46 2008 @@ -286,17 +286,7 @@ static int parse_inputs(const char **buf /* First check if the label is not in the openLinks list */ p = extract_inout(name, openLinks); - /* Not in the list, so add it as an input */ - if(!p) { - AVFilterInOut *currlinkn = av_malloc(sizeof(AVFilterInOut)); - - currlinkn->name = name; - currlinkn->type = LinkTypeIn; - currlinkn->filter = NULL; - currlinkn->pad_idx = pad; - currlinkn->next = *currInputs; - *currInputs = currlinkn; - } else { + if(p) { /* A label of a open link. Make it one of the inputs of the next filter */ AVFilterInOut *currlinkn = p; @@ -307,6 +297,16 @@ static int parse_inputs(const char **buf } currlinkn->next = *currInputs; *currInputs = currlinkn; + } else { + /* Not in the list, so add it as an input */ + AVFilterInOut *currlinkn = av_malloc(sizeof(AVFilterInOut)); + + currlinkn->name = name; + currlinkn->type = LinkTypeIn; + currlinkn->filter = NULL; + currlinkn->pad_idx = pad; + currlinkn->next = *currInputs; + *currInputs = currlinkn; } consume_whitespace(buf); pad++; @@ -332,15 +332,7 @@ static int parse_outputs(const char **bu /* First check if the label is not in the openLinks list */ match = extract_inout(name, openLinks); - /* Not in the list, so add the first input as a openLink */ - if(!match) { - AVFilterInOut *p = *currInputs; - *currInputs = (*currInputs)->next; - p->next = *openLinks; - p->type = LinkTypeOut; - p->name = name; - *openLinks = p; - } else { + if(match) { /* A label of a open link. Link it. */ AVFilterInOut *p = *currInputs; if (match->type != LinkTypeIn) { @@ -355,6 +347,14 @@ static int parse_outputs(const char **bu return -1; av_free(match); av_free(p); + } else { + /* Not in the list, so add the first input as a openLink */ + AVFilterInOut *p = *currInputs; + *currInputs = (*currInputs)->next; + p->next = *openLinks; + p->type = LinkTypeOut; + p->name = name; + *openLinks = p; } consume_whitespace(buf); pad++;

4 3

[soc]: r2165 - libavfilter/graphparser.h
by vitor 23 Apr '08

23 Apr '08

Author: vitor Date: Wed Apr 23 22:56:51 2008 New Revision: 2165 Log: Update doxy comment Modified: libavfilter/graphparser.h Modified: libavfilter/graphparser.h ============================================================================== --- libavfilter/graphparser.h (original) +++ libavfilter/graphparser.h Wed Apr 23 22:56:51 2008 @@ -46,9 +46,7 @@ typedef struct AVFilterInOut { * 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 out output to the graph to be parsed (TODO: allow several) + * @param inouts linked list to the inputs and outputs of the graph * @param outpad pad index of the output * @return zero on success, -1 on error */

1 0

[soc]: r2164 - libavfilter/graphparser.c
by vitor 23 Apr '08

23 Apr '08

Author: vitor Date: Wed Apr 23 22:46:17 2008 New Revision: 2164 Log: Simplify Modified: libavfilter/graphparser.c Modified: libavfilter/graphparser.c ============================================================================== --- libavfilter/graphparser.c (original) +++ libavfilter/graphparser.c Wed Apr 23 22:46:17 2008 @@ -346,14 +346,13 @@ static int parse_outputs(const char **bu * Parse a string describing a filter graph. */ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, - AVFilterInOut *inouts, AVClass *log_ctx) + AVFilterInOut *openLinks, AVClass *log_ctx) { int index = 0; char chr = 0; int pad = 0; AVFilterInOut *currInputs = NULL; - AVFilterInOut *openLinks = inouts; do { AVFilterContext *filter;

1 0