July 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4583 - wmapro/wma3dec.c
by faust3 06 Jul '09

06 Jul '09

Author: faust3 Date: Sat Jul 4 10:44:32 2009 New Revision: 4583 Log: align vertical Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Sat Jul 4 10:39:12 2009 (r4582) +++ wmapro/wma3dec.c Sat Jul 4 10:44:32 2009 (r4583) @@ -860,7 +860,7 @@ static int decode_coeffs(WMA3DecodeConte vals[0] = (symbol_to_vec4[idx] >> 8) >> 4; vals[1] = (symbol_to_vec4[idx] >> 8) & 0xF; vals[2] = (symbol_to_vec4[idx] >> 4) & 0xF; - vals[3] = symbol_to_vec4[idx] & 0xF; + vals[3] = symbol_to_vec4[idx] & 0xF; } /** decode sign */

2 1

[soc]: r4635 - concat/libavformat/playlist.c
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 20:18:02 2009 New Revision: 4635 Log: included cmdutils for print_error Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 20:15:58 2009 (r4634) +++ concat/libavformat/playlist.c Mon Jul 6 20:18:02 2009 (r4635) @@ -22,6 +22,7 @@ #include "avformat.h" #include "playlist.h" #include "internal.h" +#include <cmdutils.h> void ff_playlist_make_playelem(PlayElem *pe) { @@ -43,7 +44,7 @@ void ff_playlist_make_playelem(PlayElem } err = av_find_stream_info(pe->ic); if (err < 0) { - fprintf(stderr, "failed codec probe av_find_stream_info\n"); + print_error("during-av_find_stream_info", err); } if(pe->ic->pb) { pe->ic->pb->eof_reached = 0;

2 1

[soc]: r4642 - in concat/libavformat: playlist.c playlist.h
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 22:40:04 2009 New Revision: 4642 Log: removed ff_conc_strings Modified: concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 22:08:38 2009 (r4641) +++ concat/libavformat/playlist.c Mon Jul 6 22:40:04 2009 (r4642) @@ -74,29 +74,6 @@ PlaylistContext* ff_playlist_alloc_conte return ctx; } -char* ff_conc_strings(char *string1, - char *string2) -{ - char *str1; - char *str2; - char *str; - str1 = string1; - str2 = string2; - while (*string1 != 0) - ++string1; - while (*string2 != 0) - ++string2; - str = av_malloc((string1-str1)+(string2-str2)); - string1 = str1; - string2 = str2; - while (*string1 != 0) - str[string1-str1] = *(string1++); - str += (string1-str1); - while (*string2 != 0) - str[string2-str2] = *(string2++); - return (str-string1)+str1; -} - char* ff_buf_getline(ByteIOContext *s) { char *q; @@ -238,11 +215,18 @@ int64_t ff_playlist_get_duration(AVForma return durn; } -void ff_playlist_relative_paths(char **flist, char *workingdir) +void ff_playlist_relative_paths(char **flist, const char *workingdir) { while (*flist != 0) { // determine if relative paths FILE *file; - char *fullfpath = ff_conc_strings(workingdir, *flist); + char *fullfpath; + int wdslen = strlen(workingdir); + int flslen = strlen(*flist); + fullfpath = av_malloc(sizeof(char) * (wdslen+flslen+1)); + av_strlcpy(fullfpath, workingdir, wdslen); + av_strlcpy(fullfpath+wdslen, *flist, flslen+1); + fullfpath[wdslen-1] = '/'; + fullfpath[wdslen+flslen] = 0; file = fopen(fullfpath, "r"); if (file) { fclose(file); Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 22:08:38 2009 (r4641) +++ concat/libavformat/playlist.h Mon Jul 6 22:40:04 2009 (r4642) @@ -57,14 +57,12 @@ PlaylistContext* ff_playlist_alloc_conte int ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index); -char* ff_conc_strings(char *string1, char *string2); - char* ff_buf_getline(ByteIOContext *s); void ff_split_wd_fn(const char *filepath, char **workingdir, char **filename); int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index); -void ff_playlist_relative_paths(char **flist, char *workingdir); +void ff_playlist_relative_paths(char **flist, const char *workingdir); #endif /* _PLAYLIST_H */

1 0

[soc]: r4641 - concat/libavformat/m3u.c
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 22:08:38 2009 New Revision: 4641 Log: switched to av_fast_realloc in m3u_list_files Modified: concat/libavformat/m3u.c Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Mon Jul 6 21:25:34 2009 (r4640) +++ concat/libavformat/m3u.c Mon Jul 6 22:08:38 2009 (r4641) @@ -41,13 +41,10 @@ static int m3u_probe(AVProbeData *p) } static int m3u_list_files(ByteIOContext *s, PlaylistContext *ctx) -// char ***flist_ptr, -// unsigned int *lfx_ptr, -// char *workingdir) { char **flist; int i, j; - int bufsize = 16; + int bufsize = 0; i = 0; flist = av_malloc(sizeof(char*) * bufsize); while (1) { @@ -56,11 +53,8 @@ static int m3u_list_files(ByteIOContext break; if (*c == 0) // hashed out continue; - flist[i] = c; - if (++i == bufsize) { - bufsize += 16; - flist = av_realloc(flist, sizeof(char*) * bufsize); - } + flist = av_fast_realloc(flist, &bufsize, i+2); + flist[i++] = c; } ctx->pelist_size = i; flist[i] = 0;

2 1

[soc]: r4640 - concat/upstreamrev
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 21:25:34 2009 New Revision: 4640 Log: synced with upstream Modified: concat/upstreamrev Modified: concat/upstreamrev ============================================================================== --- concat/upstreamrev Mon Jul 6 20:51:57 2009 (r4639) +++ concat/upstreamrev Mon Jul 6 21:25:34 2009 (r4640) @@ -1,5 +1,13 @@ -svn: 19346 -git: 2c73d654f72a730705996039d7e3d83da80e2a4c -committer: lorenm -commitdate: Sat, 4 Jul 2009 23:59:10 +0000 -commitlog: fix a buffer overrun on corrupt huffyuv streams +ffmpeg: +svn: 19360 +git: 3b38e9f3b90dd9abaf1ff071c9bd374b7f742c70 +committer: reimar +commitdate: Mon, 6 Jul 2009 17:08:32 +0000 +commitlog: Check for packet_lenght 0, it is already treated as invalid by the padding check, but that resulted in a confusing/wrong error message. + +libswscale: +svn: 19360 +git: 868da632ab136cebff1eee8beabc119480d66546 +committer: diego +commitdate: Sun, 5 Jul 2009 20:10:59 +0000 +commitlog: The AltiVec code in libswscale no longer is under GPL. Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code.

1 0

[soc]: r4639 - in concat: ffmpeg.c.diff libavformat/m3u.c libavformat/playlist.c libavformat/playlist.h libavformat/pls.c libavformat/xspf.c
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 20:51:57 2009 New Revision: 4639 Log: renamed make_context to alloc_context, make_playelem to init_playelem Modified: concat/ffmpeg.c.diff concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h concat/libavformat/pls.c concat/libavformat/xspf.c Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Mon Jul 6 20:33:01 2009 (r4638) +++ concat/ffmpeg.c.diff Mon Jul 6 20:51:57 2009 (r4639) @@ -1,5 +1,5 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 22bfed8..5790959 100644 +index 22bfed8..d30a5ac 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -70,6 +70,8 @@ @@ -102,7 +102,7 @@ index 22bfed8..5790959 100644 + ic = av_malloc(sizeof(*ic)); +// ic = avformat_alloc_context(); + printf("need to generate playlist ctx\n"); -+ playlist_ctx = ff_playlist_make_context(filename); ++ playlist_ctx = ff_playlist_alloc_context(filename); + playlist_ctx->pelist_size = 1; + playlist_ctx->pelist = av_malloc(playlist_ctx->pelist_size * sizeof(*(playlist_ctx->pelist))); + memset(playlist_ctx->pelist, 0, playlist_ctx->pelist_size * sizeof(*(playlist_ctx->pelist))); Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Mon Jul 6 20:33:01 2009 (r4638) +++ concat/libavformat/m3u.c Mon Jul 6 20:51:57 2009 (r4639) @@ -79,7 +79,7 @@ static int m3u_read_header(AVFormatConte AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_playlist_make_context(s->filename); + PlaylistContext *ctx = ff_playlist_alloc_context(s->filename); m3u_list_files(s->pb, ctx); s->priv_data = ctx; for (i = 0; i < ctx->pe_curidxs_size; ++i) { Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 20:33:01 2009 (r4638) +++ concat/libavformat/playlist.c Mon Jul 6 20:51:57 2009 (r4639) @@ -24,7 +24,7 @@ #include "internal.h" #include <cmdutils.h> -void ff_playlist_make_playelem(PlayElem *pe) +void ff_playlist_init_playelem(PlayElem *pe) { int err; pe->ic = av_malloc(sizeof(*(pe->ic))); @@ -57,7 +57,7 @@ void ff_playlist_make_playelem(PlayElem } } -PlaylistContext* ff_playlist_make_context(const char *filename) +PlaylistContext* ff_playlist_alloc_context(const char *filename) { int i; PlaylistContext *ctx = av_malloc(sizeof(*ctx)); @@ -160,7 +160,7 @@ int ff_playlist_populate_context(Playlis AVFormatParameters *nap; printf("playlist_populate_context called\n"); // ctx->pelist[ctx->pe_curidxs[stream_index]] = av_malloc(sizeof(*(ctx->pelist[ctx->pe_curidxs[stream_index]]))); - ff_playlist_make_playelem(ctx->pelist[ctx->pe_curidxs[stream_index]]); + ff_playlist_init_playelem(ctx->pelist[ctx->pe_curidxs[stream_index]]); ic = ctx->pelist[ctx->pe_curidxs[stream_index]]->ic; nap = ctx->pelist[ctx->pe_curidxs[stream_index]]->ap; ic->iformat->read_header(ic, 0); Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 20:33:01 2009 (r4638) +++ concat/libavformat/playlist.h Mon Jul 6 20:51:57 2009 (r4639) @@ -51,9 +51,9 @@ typedef struct PlaylistContext { int64_t *time_offsets; /**< Time offsets, in 10^-6 seconds, for each multimedia stream */ } PlaylistContext; -void ff_playlist_make_playelem(PlayElem* pe); +void ff_playlist_init_playelem(PlayElem* pe); -PlaylistContext* ff_playlist_make_context(const char *filename); +PlaylistContext* ff_playlist_alloc_context(const char *filename); int ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index); Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Mon Jul 6 20:33:01 2009 (r4638) +++ concat/libavformat/pls.c Mon Jul 6 20:51:57 2009 (r4639) @@ -68,7 +68,7 @@ static int pls_read_header(AVFormatConte AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_playlist_make_context(s->filename); + PlaylistContext *ctx = ff_playlist_alloc_context(s->filename); pls_list_files(s->pb, ctx); s->priv_data = ctx; for (i = 0; i < ctx->pe_curidxs_size; ++i) { Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Mon Jul 6 20:33:01 2009 (r4638) +++ concat/libavformat/xspf.c Mon Jul 6 20:51:57 2009 (r4639) @@ -68,7 +68,7 @@ static int xspf_read_header(AVFormatCont AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_playlist_make_context(s->filename); + PlaylistContext *ctx = ff_playlist_alloc_context(s->filename); xspf_list_files(s->pb, ctx); s->priv_data = ctx; for (i = 0; i < ctx->pe_curidxs_size; ++i) {

1 0

[soc]: r4638 - in concat/libavformat: playlist.c playlist.h
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 20:33:01 2009 New Revision: 4638 Log: added const attrib to function parameters Modified: concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 20:27:04 2009 (r4637) +++ concat/libavformat/playlist.c Mon Jul 6 20:33:01 2009 (r4638) @@ -57,7 +57,7 @@ void ff_playlist_make_playelem(PlayElem } } -PlaylistContext* ff_playlist_make_context(char *filename) +PlaylistContext* ff_playlist_make_context(const char *filename) { int i; PlaylistContext *ctx = av_malloc(sizeof(*ctx)); @@ -127,7 +127,7 @@ char* ff_buf_getline(ByteIOContext *s) return oq; } -void ff_split_wd_fn(char *filepath, +void ff_split_wd_fn(const char *filepath, char **workingdir, char **filename) { Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 20:27:04 2009 (r4637) +++ concat/libavformat/playlist.h Mon Jul 6 20:33:01 2009 (r4638) @@ -53,7 +53,7 @@ typedef struct PlaylistContext { void ff_playlist_make_playelem(PlayElem* pe); -PlaylistContext* ff_playlist_make_context(char *filename); +PlaylistContext* ff_playlist_make_context(const char *filename); int ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index); @@ -61,7 +61,7 @@ char* ff_conc_strings(char *string1, cha char* ff_buf_getline(ByteIOContext *s); -void ff_split_wd_fn(char *filepath, char **workingdir, char **filename); +void ff_split_wd_fn(const char *filepath, char **workingdir, char **filename); int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index);

1 0

[soc]: r4637 - in concat/libavformat: concatgen.c playlist.c playlist.h
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 20:27:04 2009 New Revision: 4637 Log: removed time_offsets_size, fixed a printf Modified: concat/libavformat/concatgen.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Mon Jul 6 20:21:55 2009 (r4636) +++ concat/libavformat/concatgen.c Mon Jul 6 20:27:04 2009 (r4637) @@ -42,7 +42,7 @@ int ff_concatgen_read_packet(AVFormatCon if (pkt) { int64_t time_offset; time_offset = av_rescale_q(ctx->time_offsets[pkt->stream_index], AV_TIME_BASE_Q, ic->streams[stream_index]->time_base); - printf("%s conv stream time from %ld to %ld/%ld is %ld\n", ic->iformat->name, ctx->time_offsets[pkt->stream_index], ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, time_offset); + printf("%s conv stream time from %ld to %d/%d is %ld\n", ic->iformat->name, ctx->time_offsets[pkt->stream_index], ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, time_offset); // TODO changing either dts or pts leads to timing issues on h264 pkt->dts += time_offset; if (!ic->streams[pkt->stream_index]->codec->has_b_frames) @@ -59,7 +59,7 @@ int ff_concatgen_read_packet(AVFormatCon // playld->dts_offset += ic->streams[0]->cur_dts; // playld->dts_offset += playld->dts_prevpacket; printf("switching streams\n"); - for (i = 0; i < ic->nb_streams && i < ctx->time_offsets_size; ++i) { + for (i = 0; i < ic->nb_streams && i < ctx->pe_curidxs_size; ++i) { ctx->time_offsets[i] += ff_playlist_get_duration(ic, i); } ++ctx->pe_curidxs[stream_index]; Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 20:21:55 2009 (r4636) +++ concat/libavformat/playlist.c Mon Jul 6 20:27:04 2009 (r4637) @@ -61,14 +61,13 @@ PlaylistContext* ff_playlist_make_contex { int i; PlaylistContext *ctx = av_malloc(sizeof(*ctx)); - ctx->time_offsets_size = 2; // TODO don't assume we have just 2 streams - ctx->time_offsets = av_malloc(sizeof(*(ctx->time_offsets)) * ctx->time_offsets_size); - for (i = 0; i < ctx->time_offsets_size; ++i) - ctx->time_offsets[i] = 0; ctx->pe_curidxs_size = 2; // TODO don't assume we have just 2 streams ctx->pe_curidxs = av_malloc(sizeof(*(ctx->pe_curidxs)) * ctx->pe_curidxs_size); for (i = 0; i < ctx->pe_curidxs_size; ++i) ctx->pe_curidxs[i] = 0; + ctx->time_offsets = av_malloc(sizeof(*(ctx->time_offsets)) * ctx->pe_curidxs_size); + for (i = 0; i < ctx->pe_curidxs_size; ++i) + ctx->time_offsets[i] = 0; ff_split_wd_fn(filename, &ctx->workingdir, &ctx->filename); Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 20:21:55 2009 (r4636) +++ concat/libavformat/playlist.h Mon Jul 6 20:27:04 2009 (r4637) @@ -49,7 +49,6 @@ typedef struct PlaylistContext { char *workingdir; /**< Directory in which the playlist file is stored in */ char *filename; /**< Filename (not path) of the playlist file */ int64_t *time_offsets; /**< Time offsets, in 10^-6 seconds, for each multimedia stream */ - int time_offsets_size; /**< Length of the time_offsets array (number of multimedia streams) currently set to 2 (video and audio) */ } PlaylistContext; void ff_playlist_make_playelem(PlayElem* pe);

1 0

[soc]: r4636 - concat/libavformat/playlist.h
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 20:21:55 2009 New Revision: 4636 Log: removed redundant chlist_size, ch_curidx Modified: concat/libavformat/playlist.h Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Mon Jul 6 20:18:02 2009 (r4635) +++ concat/libavformat/playlist.h Mon Jul 6 20:21:55 2009 (r4636) @@ -46,8 +46,6 @@ typedef struct PlaylistContext { int *pe_curidxs; /**< Index of the PlayElem that each multimedia stream (video and audio) is currently on */ int pe_curidxs_size; /**< Length of pe_curidxs array (number of multimedia streams) currently set to 2 (video and audio) */ AVChapter **chlist; /**< List of chapters, with each playlist element representing a chapter */ - int chlist_size; /**< Length of chlist array (number of chapters) */ - int ch_curidx; /**< Index of the current chapter */ char *workingdir; /**< Directory in which the playlist file is stored in */ char *filename; /**< Filename (not path) of the playlist file */ int64_t *time_offsets; /**< Time offsets, in 10^-6 seconds, for each multimedia stream */

1 0

[soc]: r4634 - concat/libavformat/playlist.c
by gkovacs 06 Jul '09

06 Jul '09

Author: gkovacs Date: Mon Jul 6 20:15:58 2009 New Revision: 4634 Log: removed unnecessary return value Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Mon Jul 6 20:11:15 2009 (r4633) +++ concat/libavformat/playlist.c Mon Jul 6 20:15:58 2009 (r4634) @@ -54,7 +54,6 @@ void ff_playlist_make_playelem(PlayElem if(!pe->fmt) { fprintf(stderr, "failed pe ic fmt not set"); } - return pe; } PlaylistContext* ff_playlist_make_context(char *filename)

1 0