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

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

06 Jul '09

Author: gkovacs Date: Sat Jul 4 23:38:07 2009 New Revision: 4603 Log: removed stream time conversion convenience functions Modified: concat/libavformat/concatgen.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sat Jul 4 23:24:40 2009 (r4602) +++ concat/libavformat/concatgen.c Sat Jul 4 23:38:07 2009 (r4603) @@ -40,7 +40,11 @@ int concatgen_read_packet(AVFormatContex } if (ret >= 0) { if (pkt) { - int64_t time_offset = ff_conv_stream_time(ic, pkt->stream_index, ctx->time_offsets[pkt->stream_index]); + int64_t time_offset; + AVRational avbasetime = {1, AV_TIME_BASE}; + time_offset = av_rescale_q(ctx->time_offsets[pkt->stream_index], avbasetime, 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); + // 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) pkt->pts = pkt->dts + 1; Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Jul 4 23:24:40 2009 (r4602) +++ concat/libavformat/playlist.c Sat Jul 4 23:38:07 2009 (r4603) @@ -235,29 +235,6 @@ int ff_playlist_populate_context(Playlis return 0; } -// converts duration to stream base -int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration) -{ - int64_t durn; - AVRational avtimebase; - avtimebase.num = 1; - avtimebase.den = AV_TIME_BASE; - durn = av_rescale_q(avt_duration, avtimebase, ic->streams[stream_index]->time_base); - printf("%s conv stream time from %ld to %ld/%ld is %ld\n", ic->iformat->name, avt_duration, ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, durn); - return durn; -} - -// converts duration to AV_TIME_BASE -int64_t ff_conv_base_time(AVFormatContext *ic, int stream_index, int64_t stream_duration) -{ - int64_t durn; - AVRational avtimebase; - avtimebase.num = 1; - avtimebase.den = AV_TIME_BASE; - durn = av_rescale_q(stream_duration, ic->streams[stream_index]->time_base, avtimebase); - return durn; -} - // returns duration in seconds * AV_TIME_BASE int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index) { @@ -274,7 +251,8 @@ int64_t ff_playlist_get_duration(AVForma int64_t durn; // durn = ic->duration; - durn = ff_conv_base_time(ic, stream_index, ic->streams[stream_index]->duration); + AVRational avbasetime = {1, AV_TIME_BASE}; + durn = av_rescale_q(ic->streams[stream_index]->duration, ic->streams[stream_index]->time_base, avbasetime); // durn = ic->streams[stream_index]->duration; // ogg gives wrong value printf("duration is %ld\n", durn); Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Jul 4 23:24:40 2009 (r4602) +++ concat/libavformat/playlist.h Sat Jul 4 23:38:07 2009 (r4603) @@ -64,10 +64,6 @@ char* ff_buf_getline(ByteIOContext *s); void ff_split_wd_fn(char *filepath, char **workingdir, char **filename); -int64_t ff_conv_stream_time(AVFormatContext *ic, int stream_index, int64_t avt_duration); - -int64_t ff_conv_base_time(AVFormatContext *ic, int stream_index, int64_t stream_duration); - int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index); #endif /* _PLAYLIST_H */

2 1

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

06 Jul '09

Author: gkovacs Date: Mon Jul 6 02:00:49 2009 New Revision: 4624 Log: stubbed xspf.c Added: concat/libavformat/xspf.c Added: concat/libavformat/xspf.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ concat/libavformat/xspf.c Mon Jul 6 02:00:49 2009 (r4624) @@ -0,0 +1,2 @@ + +

1 0

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

06 Jul '09

Author: gkovacs Date: Mon Jul 6 01:58:37 2009 New Revision: 4623 Log: added xml parser Modified: concat/libavformat/datanode.c Modified: concat/libavformat/datanode.c ============================================================================== --- concat/libavformat/datanode.c Sun Jul 5 22:42:36 2009 (r4622) +++ concat/libavformat/datanode.c Mon Jul 6 01:58:37 2009 (r4623) @@ -111,6 +111,157 @@ DataNode *ff_datanode_tree_from_ini(Byte DataNode *ff_datanode_tree_from_xml(ByteIOContext *p) { + int c; + char *s; + char tag; + // tag: + // 0 = awaiting opening tag + // 1 = either in the opening tag or closing parent + // 2 = awaiting closing tag + // 3 = either in the closing tag or opening child + char ncn; // no closing needed if true + char quo; // text is in quotes if true + char ctg; // this is the closing tag if true + int i, b; + DataNode *o; + DataNode *d; + int ctgidx; // current index in ctgbuf + int ctgbuflen; // buffer length of ctgbuf + char *ctgbuf = 0; + // ctgbuf: used to verify that closing tag matches opening tag name + d = av_malloc(sizeof(*d)); + memset(d, 0, sizeof(*d)); + o = d; + s = d->name; + tag = ncn = quo = ctg = ctgidx = ctgbuflen = i = b = 0; + while (1) { + c = url_fgetc(p); + if (c == 0 || c == EOF) + break; + + parsetag: + + if (quo) { // we're in quoted text, tag changes don't matter + if (c == '"') { // quote closed + quo = 0; + } + goto writeoutput; + } + else if (c == '"') { // quote opened + quo = 1; + goto writeoutput; + } + if (tag == 0) { // awaiting opening tag + if (c == '<') { // opening tag + tag = 1; + d = ff_datanode_mknext(d); + i = b = 0; + s = d->name; + continue; + } + } + else if (tag == 1) { // in the opening tag + if (c == '>') { // opening tag closed + if (ncn) { // no closing tag needed + ncn = 0; + tag = 0; + } + else + tag = 2; + i = b = 0; + s = d->value; + continue; + } + else if (c == '/') { + if (d->name) { // tag closed, no closing tag needed + ncn = 1; + continue; + } + else { // closing parent + tag = 3; + ctg = 1; + ctgidx = 0; + memset(ctgbuf, 0, ctgbuflen); + d = d->parent; + s = d->name; + continue; + } + } + else if (c == ' ') { // no longer tag name but attributes + // ignore attributes by null-terminating string + c = 0; + } + } + else if (tag == 2) { // awaiting closing tag + if (c == '<') { // closing tag + tag = 3; + i = b = 0; + s = d->name; + continue; + } + } + else if (tag == 3) { // either in the closing tag or opening a new one + if (ctg) { + if (ctgidx >= ctgbuflen-1) { + ctgbuflen += DATANODE_STR_BUFSIZE; + ctgbuf = av_realloc(ctgbuf, ctgbuflen); + } + if (c == '>') { + if (strncmp(d->name, ctgbuf, strlen(d->name)) || + strlen(d->name) != ctgidx) { + fprintf(stderr, "malformed closing tag for %s\n", d->name); + // closing anyways + } + // closing tag closed + ctg = 0; + memset(ctgbuf, 0, ctgbuflen); + ctgidx = 0; + tag = 0; + } + else if (c == ' ') { // ignore spaces and material afterwards + ctgbuf[ctgidx++] = 0; + ctgbuf[ctgidx] = 0; + } + else { + ctgbuf[ctgidx++] = c; + ctgbuf[ctgidx] = 0; + } + continue; + } + if (c == '/') { // closing tag + ctg = 1; + continue; + } + else { // opening child tag + tag = 1; + d = ff_datanode_mkchild(d); + i = b = 0; + s = d->name; + goto parsetag; + } + } + + writeoutput: + + if (i >= b-1) { + b += DATANODE_STR_BUFSIZE; + if (s == d->name) { + s = av_realloc(s, b); + d->name = s; + } + else if (s == d->value) { + s = av_realloc(s, b); + d->value = s; + } + } + s[i++] = c; + s[i] = 0; + } + return o; +} + +DataNode *ff_datanode_tree_from_xml(ByteIOContext *p) +{ // TODO return NULL; }

1 0

[soc]: r4622 - in concat/libavformat: Makefile.diff allformats.c.diff
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 22:42:36 2009 New Revision: 4622 Log: fixed alphabetical order Modified: concat/libavformat/Makefile.diff concat/libavformat/allformats.c.diff Modified: concat/libavformat/Makefile.diff ============================================================================== --- concat/libavformat/Makefile.diff Sun Jul 5 22:38:14 2009 (r4621) +++ concat/libavformat/Makefile.diff Sun Jul 5 22:42:36 2009 (r4622) @@ -1,12 +1,12 @@ diff --git a/libavformat/Makefile b/libavformat/Makefile -index 8e8a869..1dee9be 100644 +index 8e8a869..d2aaf47 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile -@@ -175,6 +175,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += raw.o - OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o - OBJS-$(CONFIG_PCM_U8_DEMUXER) += raw.o - OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o +@@ -34,6 +34,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o + OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o + OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o + OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += raw.o +OBJS-$(CONFIG_CONCAT_DEMUXER) += m3u.o pls.o playlist.o concat.o concatgen.o datanode.o - OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o avc.o - OBJS-$(CONFIG_PVA_DEMUXER) += pva.o - OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o + OBJS-$(CONFIG_CRC_MUXER) += crcenc.o + OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o + OBJS-$(CONFIG_DAUD_MUXER) += daud.o Modified: concat/libavformat/allformats.c.diff ============================================================================== --- concat/libavformat/allformats.c.diff Sun Jul 5 22:38:14 2009 (r4621) +++ concat/libavformat/allformats.c.diff Sun Jul 5 22:42:36 2009 (r4622) @@ -1,14 +1,28 @@ diff --git a/libavformat/allformats.c b/libavformat/allformats.c -index ad47631..433be82 100644 +index ad47631..83d7d21 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c -@@ -66,6 +66,9 @@ void av_register_all(void) +@@ -66,6 +66,7 @@ void av_register_all(void) REGISTER_DEMUXER (BFI, bfi); REGISTER_DEMUXER (C93, c93); REGISTER_DEMUXER (CAVSVIDEO, cavsvideo); + REGISTER_DEMUXER (CONCAT, concat); -+ REGISTER_DEMUXER (M3U, m3u); -+ REGISTER_DEMUXER (PLS, pls); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); REGISTER_MUXDEMUX (DIRAC, dirac); +@@ -98,6 +99,7 @@ void av_register_all(void) + REGISTER_MUXER (IPOD, ipod); + REGISTER_DEMUXER (ISS, iss); + REGISTER_DEMUXER (LMLM4, lmlm4); ++ REGISTER_DEMUXER (M3U, m3u); + REGISTER_MUXDEMUX (M4V, m4v); + REGISTER_MUXDEMUX (MATROSKA, matroska); + REGISTER_MUXER (MATROSKA_AUDIO, matroska_audio); +@@ -155,6 +157,7 @@ void av_register_all(void) + REGISTER_MUXDEMUX (PCM_U16BE, pcm_u16be); + REGISTER_MUXDEMUX (PCM_U16LE, pcm_u16le); + REGISTER_MUXDEMUX (PCM_U8, pcm_u8); ++ REGISTER_DEMUXER (PLS, pls); + REGISTER_MUXER (PSP, psp); + REGISTER_DEMUXER (PVA, pva); + REGISTER_DEMUXER (QCP, qcp);

1 0

[soc]: r4621 - in concat/libavformat: datanode.c datanode.h m3u.c playlist.c playlist.h pls.c
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 22:38:14 2009 New Revision: 4621 Log: fixed stringlist export and rel paths Modified: concat/libavformat/datanode.c concat/libavformat/datanode.h concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h concat/libavformat/pls.c Modified: concat/libavformat/datanode.c ============================================================================== --- concat/libavformat/datanode.c Sun Jul 5 21:52:51 2009 (r4620) +++ concat/libavformat/datanode.c Sun Jul 5 22:38:14 2009 (r4621) @@ -193,18 +193,27 @@ void ff_stringlist_append(StringList *l, l->str = str; } +char *ff_stringlist_at(StringList *l, int i) +{ + while ((i-- > 0)) + l = l->next; + return l->str; +} + void ff_stringlist_export(StringList *l, char ***flist_ptr, unsigned int *lfx_ptr) { unsigned int i; char **flist; unsigned int strlen = ff_stringlist_len(l); *lfx_ptr = strlen; - flist = av_malloc(sizeof(*flist)*(strlen+1)); - memset(flist, 0, sizeof(*flist)*(strlen+1)); - for (i = 0; l && (i < strlen); ++i) { - flist[i] = (l = l->next); + *flist_ptr = av_malloc(sizeof(**flist_ptr)*(strlen+1)); + memset(*flist_ptr, 0, sizeof(**flist_ptr)*(strlen+1)); + flist = *flist_ptr; + for (i = 0; i < strlen; ++i) { + flist[i] = l->str; + l = l->next; } - *flist_ptr = flist; + flist[i] = 0; } unsigned int ff_stringlist_len(StringList *l) @@ -212,7 +221,7 @@ unsigned int ff_stringlist_len(StringLis unsigned int i = 0; while ((l = l->next)) ++i; - return i; + return i+1; } void ff_stringlist_print(StringList *l) Modified: concat/libavformat/datanode.h ============================================================================== --- concat/libavformat/datanode.h Sun Jul 5 21:52:51 2009 (r4620) +++ concat/libavformat/datanode.h Sun Jul 5 22:38:14 2009 (r4621) @@ -60,6 +60,8 @@ StringList *ff_stringlist_alloc(); void ff_stringlist_append(StringList *l, char *str); +char *ff_stringlist_at(StringList *l, int i); + void ff_stringlist_export(StringList *l, char ***flist_ptr, unsigned int *lfx_ptr); void ff_stringlist_print(StringList *l); Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sun Jul 5 21:52:51 2009 (r4620) +++ concat/libavformat/m3u.c Sun Jul 5 22:38:14 2009 (r4621) @@ -65,16 +65,7 @@ static int m3u_list_files(ByteIOContext *flist_ptr = ofl; *lfx_ptr = i; ofl[i] = 0; - while (*ofl != 0) { // determine if relative paths - FILE *file; - char *fullfpath = ff_conc_strings(workingdir, *ofl); - file = fopen(fullfpath, "r"); - if (file) { - fclose(file); - *ofl = fullfpath; - } - ++ofl; - } + ff_playlist_relative_paths(ofl, workingdir); return 0; } Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sun Jul 5 21:52:51 2009 (r4620) +++ concat/libavformat/playlist.c Sun Jul 5 22:38:14 2009 (r4621) @@ -259,3 +259,16 @@ int64_t ff_playlist_get_duration(AVForma return durn; } +void ff_playlist_relative_paths(char **flist, char *workingdir) +{ + while (*flist != 0) { // determine if relative paths + FILE *file; + char *fullfpath = ff_conc_strings(workingdir, *flist); + file = fopen(fullfpath, "r"); + if (file) { + fclose(file); + *flist = fullfpath; + } + ++flist; + } +} Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sun Jul 5 21:52:51 2009 (r4620) +++ concat/libavformat/playlist.h Sun Jul 5 22:38:14 2009 (r4621) @@ -66,4 +66,6 @@ void ff_split_wd_fn(char *filepath, char int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index); +void ff_playlist_relative_paths(char **flist, char *workingdir); + #endif /* _PLAYLIST_H */ Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Sun Jul 5 21:52:51 2009 (r4620) +++ concat/libavformat/pls.c Sun Jul 5 22:38:14 2009 (r4621) @@ -54,6 +54,7 @@ static int pls_list_files(ByteIOContext ff_datanode_filter_values_by_name(d, l, "File"); ff_stringlist_print(l); ff_stringlist_export(l, flist_ptr, lfx_ptr); + ff_playlist_relative_paths(*flist_ptr, workingdir); return 0; }

1 0

[soc]: r4620 - in concat/libavformat: Makefile.diff allformats.c.diff concat.c datanode.c datanode.h pls.c
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 21:52:51 2009 New Revision: 4620 Log: added pls demuxer Modified: concat/libavformat/Makefile.diff concat/libavformat/allformats.c.diff concat/libavformat/concat.c concat/libavformat/datanode.c concat/libavformat/datanode.h concat/libavformat/pls.c Modified: concat/libavformat/Makefile.diff ============================================================================== --- concat/libavformat/Makefile.diff Sun Jul 5 21:48:52 2009 (r4619) +++ concat/libavformat/Makefile.diff Sun Jul 5 21:52:51 2009 (r4620) @@ -1,12 +1,12 @@ diff --git a/libavformat/Makefile b/libavformat/Makefile -index 8e8a869..23074a7 100644 +index 8e8a869..1dee9be 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -175,6 +175,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += raw.o OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o OBJS-$(CONFIG_PCM_U8_DEMUXER) += raw.o OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o -+OBJS-$(CONFIG_CONCAT_DEMUXER) += m3u.o playlist.o concat.o concatgen.o datanode.o ++OBJS-$(CONFIG_CONCAT_DEMUXER) += m3u.o pls.o playlist.o concat.o concatgen.o datanode.o OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o avc.o OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o Modified: concat/libavformat/allformats.c.diff ============================================================================== --- concat/libavformat/allformats.c.diff Sun Jul 5 21:48:52 2009 (r4619) +++ concat/libavformat/allformats.c.diff Sun Jul 5 21:52:51 2009 (r4620) @@ -1,12 +1,14 @@ diff --git a/libavformat/allformats.c b/libavformat/allformats.c -index ad47631..08a460b 100644 +index ad47631..433be82 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c -@@ -66,6 +66,7 @@ void av_register_all(void) +@@ -66,6 +66,9 @@ void av_register_all(void) REGISTER_DEMUXER (BFI, bfi); REGISTER_DEMUXER (C93, c93); REGISTER_DEMUXER (CAVSVIDEO, cavsvideo); ++ REGISTER_DEMUXER (CONCAT, concat); + REGISTER_DEMUXER (M3U, m3u); ++ REGISTER_DEMUXER (PLS, pls); REGISTER_MUXER (CRC, crc); REGISTER_MUXDEMUX (DAUD, daud); REGISTER_MUXDEMUX (DIRAC, dirac); Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Sun Jul 5 21:48:52 2009 (r4619) +++ concat/libavformat/concat.c Sun Jul 5 21:52:51 2009 (r4620) @@ -63,7 +63,7 @@ AVInputFormat *concat_make_demuxer() return cdm; } -#if 0 +#if CONFIG_CONCAT_DEMUXER AVInputFormat concat_demuxer = { "concat", NULL_IF_CONFIG_SMALL("CONCAT format"), Modified: concat/libavformat/datanode.c ============================================================================== --- concat/libavformat/datanode.c Sun Jul 5 21:48:52 2009 (r4619) +++ concat/libavformat/datanode.c Sun Jul 5 21:52:51 2009 (r4620) @@ -40,9 +40,9 @@ DataNode *ff_datanode_mknext(DataNode *o return d; } -DataNode *ff_datanode_tree_from_ini(char *p) +DataNode *ff_datanode_tree_from_ini(ByteIOContext *p) { - char c; + int c; char *s; char e; int i, b; @@ -54,7 +54,10 @@ DataNode *ff_datanode_tree_from_ini(char s = d->name; e = 1; i = b = 0; - while ((c = *p++)) { + while (1) { + c = url_fgetc(p); + if (c == 0 || c == EOF) + break; if (c == '\n') { d = ff_datanode_mknext(d); i = b = 0; @@ -106,7 +109,7 @@ DataNode *ff_datanode_tree_from_ini(char return o; } -DataNode *ff_datanode_tree_from_xml(char *p) +DataNode *ff_datanode_tree_from_xml(ByteIOContext *p) { // TODO return NULL; @@ -143,9 +146,9 @@ void ff_datanode_filter_values_by_name(D ff_datanode_filter_values_by_name(ff_datanode_getlognext(d), l, n); } -int ff_datanode_getdepth(DataNode *d) +unsigned int ff_datanode_getdepth(DataNode *d) { - int i = 0; + unsigned int i = 0; while ((d = d->parent)) ++i; return i; @@ -190,6 +193,28 @@ void ff_stringlist_append(StringList *l, l->str = str; } +void ff_stringlist_export(StringList *l, char ***flist_ptr, unsigned int *lfx_ptr) +{ + unsigned int i; + char **flist; + unsigned int strlen = ff_stringlist_len(l); + *lfx_ptr = strlen; + flist = av_malloc(sizeof(*flist)*(strlen+1)); + memset(flist, 0, sizeof(*flist)*(strlen+1)); + for (i = 0; l && (i < strlen); ++i) { + flist[i] = (l = l->next); + } + *flist_ptr = flist; +} + +unsigned int ff_stringlist_len(StringList *l) +{ + unsigned int i = 0; + while ((l = l->next)) + ++i; + return i; +} + void ff_stringlist_print(StringList *l) { if (!l) @@ -200,3 +225,4 @@ void ff_stringlist_print(StringList *l) putchar('\n'); ff_stringlist_print(l->next); } + Modified: concat/libavformat/datanode.h ============================================================================== --- concat/libavformat/datanode.h Sun Jul 5 21:48:52 2009 (r4619) +++ concat/libavformat/datanode.h Sun Jul 5 21:52:51 2009 (r4620) @@ -44,15 +44,15 @@ DataNode *ff_datanode_mkchild(DataNode * DataNode *ff_datanode_mknext(DataNode *o); -DataNode *ff_datanode_tree_from_ini(char *p); +DataNode *ff_datanode_tree_from_ini(ByteIOContext *p); -DataNode *ff_datanode_tree_from_xml(char *p); +DataNode *ff_datanode_tree_from_xml(ByteIOContext *p); DataNode *ff_datanode_getlognext(DataNode *d); void ff_datanode_filter_values_by_name(DataNode *d, StringList *l, char *n); -int ff_datanode_getdepth(DataNode *d); +unsigned int ff_datanode_getdepth(DataNode *d); void ff_datanode_visualize(DataNode *d); @@ -60,6 +60,10 @@ StringList *ff_stringlist_alloc(); void ff_stringlist_append(StringList *l, char *str); +void ff_stringlist_export(StringList *l, char ***flist_ptr, unsigned int *lfx_ptr); + void ff_stringlist_print(StringList *l); +unsigned int ff_stringlist_len(StringList *l); + #endif /* AVFORMAT_DATANODE_H */ Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Sun Jul 5 21:48:52 2009 (r4619) +++ concat/libavformat/pls.c Sun Jul 5 21:52:51 2009 (r4620) @@ -1,2 +1,99 @@ +/* + * PLS muxer and demuxer + * Copyright (c) 2009 Geza Kovacs + * + * 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 "concatgen.h" +#include "datanode.h" +/* The ffmpeg codecs we support, and the IDs they have in the file */ +static const AVCodecTag codec_pls_tags[] = { + { 0, 0 }, +}; + +static int pls_probe(AVProbeData *p) +{ + if (p->buf != 0) { + if (!strncmp(p->buf, "[playli", 7)) + return AVPROBE_SCORE_MAX; + else + return 0; + } + if (match_ext(p->filename, "pls")) + return AVPROBE_SCORE_MAX/2; + else + return 0; +} + +static int pls_list_files(ByteIOContext *s, + char ***flist_ptr, + unsigned int *lfx_ptr, + char *workingdir) +{ + StringList *l; + DataNode *d; + l = ff_stringlist_alloc(); + d = ff_datanode_tree_from_ini(s); + ff_datanode_visualize(d); + ff_datanode_filter_values_by_name(d, l, "File"); + ff_stringlist_print(l); + ff_stringlist_export(l, flist_ptr, lfx_ptr); + return 0; +} + +static int pls_read_header(AVFormatContext *s, + AVFormatParameters *ap) +{ + int i; + PlaylistContext *ctx = ff_playlist_make_context(s->filename); + pls_list_files(s->pb, + &(ctx->flist), + &(ctx->pelist_size), + ctx->workingdir); + ctx->pelist = av_malloc(ctx->pelist_size * sizeof(*(ctx->pelist))); + memset(ctx->pelist, 0, ctx->pelist_size * sizeof(*(ctx->pelist))); + s->priv_data = ctx; + for (i = 0; i < ctx->pe_curidxs_size; ++i) { + ff_playlist_populate_context(ctx, s, i); + } + return 0; +} + +#if CONFIG_PLS_DEMUXER +AVInputFormat pls_demuxer = { + "pls", + NULL_IF_CONFIG_SMALL("PLS format"), + sizeof(PlaylistContext), + pls_probe, + pls_read_header, + ff_concatgen_read_packet, + ff_concatgen_read_close, + ff_concatgen_read_seek, + ff_concatgen_read_timestamp, + NULL, //flags + NULL, //extensions + NULL, //value + ff_concatgen_read_play, + ff_concatgen_read_pause, + (const AVCodecTag* const []){codec_pls_tags, 0}, + ff_concatgen_read_seek, //m3u_read_seek2 + NULL, //metadata_conv + NULL, //next +}; +#endif

2 1

[soc]: r4619 - concat/libavformat/pls.c
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 21:48:52 2009 New Revision: 4619 Log: stubbed pls.c Added: concat/libavformat/pls.c Added: concat/libavformat/pls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ concat/libavformat/pls.c Sun Jul 5 21:48:52 2009 (r4619) @@ -0,0 +1,2 @@ + +

1 0

[soc]: r4618 - concat/libavformat/datanode.c
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 20:55:46 2009 New Revision: 4618 Log: changing for to while loop Modified: concat/libavformat/datanode.c Modified: concat/libavformat/datanode.c ============================================================================== --- concat/libavformat/datanode.c Sun Jul 5 20:51:57 2009 (r4617) +++ concat/libavformat/datanode.c Sun Jul 5 20:55:46 2009 (r4618) @@ -54,7 +54,7 @@ DataNode *ff_datanode_tree_from_ini(char s = d->name; e = 1; i = b = 0; - for (; (c = *p++); ) { + while ((c = *p++)) { if (c == '\n') { d = ff_datanode_mknext(d); i = b = 0;

1 0

[soc]: r4617 - concat/libavformat/datanode.c
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 20:51:57 2009 New Revision: 4617 Log: fixed typo Modified: concat/libavformat/datanode.c Modified: concat/libavformat/datanode.c ============================================================================== --- concat/libavformat/datanode.c Sun Jul 5 20:47:22 2009 (r4616) +++ concat/libavformat/datanode.c Sun Jul 5 20:51:57 2009 (r4617) @@ -106,7 +106,7 @@ DataNode *ff_datanode_tree_from_ini(char return o; } -DataNode *ff_datanode_tree_from_ini(char *p) +DataNode *ff_datanode_tree_from_xml(char *p) { // TODO return NULL;

1 0

[soc]: r4616 - in concat/libavformat: Makefile.diff datanode.c datanode.h
by gkovacs 05 Jul '09

05 Jul '09

Author: gkovacs Date: Sun Jul 5 20:47:22 2009 New Revision: 4616 Log: added datanode for ini (pls) file parsing Modified: concat/libavformat/Makefile.diff concat/libavformat/datanode.c concat/libavformat/datanode.h Modified: concat/libavformat/Makefile.diff ============================================================================== --- concat/libavformat/Makefile.diff Sun Jul 5 20:46:17 2009 (r4615) +++ concat/libavformat/Makefile.diff Sun Jul 5 20:47:22 2009 (r4616) @@ -1,12 +1,12 @@ diff --git a/libavformat/Makefile b/libavformat/Makefile -index 8e8a869..adb8d8e 100644 +index 8e8a869..23074a7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -175,6 +175,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += raw.o OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o OBJS-$(CONFIG_PCM_U8_DEMUXER) += raw.o OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o -+OBJS-$(CONFIG_CONCAT_DEMUXER) += m3u.o playlist.o concat.o concatgen.o ++OBJS-$(CONFIG_CONCAT_DEMUXER) += m3u.o playlist.o concat.o concatgen.o datanode.o OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o avc.o OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o Modified: concat/libavformat/datanode.c ============================================================================== --- concat/libavformat/datanode.c Sun Jul 5 20:46:17 2009 (r4615) +++ concat/libavformat/datanode.c Sun Jul 5 20:47:22 2009 (r4616) @@ -1,2 +1,202 @@ +/* + * Library to parse and represent ini (and later xml) files + * Copyright (c) 2009 Geza Kovacs + * + * 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 "datanode.h" + +DataNode *ff_datanode_mkchild(DataNode *o) +{ + DataNode *d = av_malloc(sizeof(*d)); + memset(d, 0, sizeof(*d)); + o->child = d; + d->parent = o; + return d; +} + +DataNode *ff_datanode_mknext(DataNode *o) +{ + DataNode *d = av_malloc(sizeof(*d)); + memset(d, 0, sizeof(*d)); + o->next = d; + d->prev = o; + d->parent = o->parent; + return d; +} + +DataNode *ff_datanode_tree_from_ini(char *p) +{ + char c; + char *s; + char e; + int i, b; + DataNode *o; + DataNode *d; + d = av_malloc(sizeof(*d)); + memset(d, 0, sizeof(*d)); + o = d; + s = d->name; + e = 1; + i = b = 0; + for (; (c = *p++); ) { + if (c == '\n') { + d = ff_datanode_mknext(d); + i = b = 0; + s = d->name; + e = 1; + continue; + } + if (!e) { + continue; + } + if (c == '#') { + e = 0; + continue; + } + if (c == '[') { + if (d->parent) { + d = d->parent; + } + d = ff_datanode_mknext(d); + i = b = 0; + s = d->name; + continue; + } + if (c == ']') { + d = ff_datanode_mkchild(d); + i = b = 0; + s = d->name; + continue; + } + if (c == '=') { + i = b = 0; + s = d->value; + continue; + } + if (i >= b-1) { + b += DATANODE_STR_BUFSIZE; + if (s == d->name) { + s = av_realloc(s, b); + d->name = s; + } + else if (s == d->value) { + s = av_realloc(s, b); + d->value = s; + } + } + s[i++] = c; + s[i] = 0; + } + return o; +} + +DataNode *ff_datanode_tree_from_ini(char *p) +{ + // TODO + return NULL; +} + +DataNode *ff_datanode_getlognext(DataNode *d) +{ + if (d->child) + return d->child; + if (d->next) + return d->next; + while ((d = d->parent)) { + if (d->next) + return d->next; + } + return NULL; +} + +void ff_datanode_filter_names_by_value(DataNode *d, StringList *l, char *v) +{ + if (!d) + return; + if (d->value && !strncmp(v, d->value, strlen(v))) + ff_stringlist_append(l, d->name); + ff_datanode_filter_names_by_value(ff_datanode_getlognext(d), l, v); +} + +void ff_datanode_filter_values_by_name(DataNode *d, StringList *l, char *n) +{ + if (!d) + return; + if (d->value && !strncmp(n, d->name, strlen(n))) + ff_stringlist_append(l, d->value); + ff_datanode_filter_values_by_name(ff_datanode_getlognext(d), l, n); +} + +int ff_datanode_getdepth(DataNode *d) +{ + int i = 0; + while ((d = d->parent)) + ++i; + return i; +} + +void ff_datanode_visualize(DataNode *d) +{ + int i, depth; + if (!d) + return; + depth = ff_datanode_getdepth(d); + for (i = 0; i < depth; ++i) + putchar('>'); + printf("name: "); + if (d->name) + printf("%s", d->name); + putchar('\n'); + for (i = 0; i < depth; ++i) + putchar('>'); + printf("value: "); + if (d->value) + printf("%s", d->value); + putchar('\n'); + ff_datanode_visualize(ff_datanode_getlognext(d)); +} + +StringList *ff_stringlist_alloc() +{ + StringList *l = av_malloc(sizeof(*l)); + memset(l, 0, sizeof(*l)); + return l; +} +void ff_stringlist_append(StringList *l, char *str) +{ + while (l->next) + l = l->next; + if (l->str) { + l->next = ff_stringlist_alloc(); + l->next->str = str; + } else + l->str = str; +} +void ff_stringlist_print(StringList *l) +{ + if (!l) + return; + printf("str: "); + if (l->str) + printf("%s", l->str); + putchar('\n'); + ff_stringlist_print(l->next); +} Modified: concat/libavformat/datanode.h ============================================================================== --- concat/libavformat/datanode.h Sun Jul 5 20:46:17 2009 (r4615) +++ concat/libavformat/datanode.h Sun Jul 5 20:47:22 2009 (r4616) @@ -1,2 +1,65 @@ +/* + * Format to represent ini (and later xml) as doubly linked 2D data nodes + * Copyright (c) 2009 Geza Kovacs + * + * 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 + */ + +#ifndef AVFORMAT_DATANODE_H +#define AVFORMAT_DATANODE_H + +#include "avformat.h" +#define DATANODE_STR_BUFSIZE 5 +typedef struct DataNode { + char *name; + char *value; + struct DataNode *child; + struct DataNode *parent; + struct DataNode *next; + struct DataNode *prev; +} DataNode; + +typedef struct StringList { + char *str; + struct StringList *next; +} StringList; + +DataNode *ff_datanode_mkchild(DataNode *o); + +DataNode *ff_datanode_mknext(DataNode *o); + +DataNode *ff_datanode_tree_from_ini(char *p); + +DataNode *ff_datanode_tree_from_xml(char *p); + +DataNode *ff_datanode_getlognext(DataNode *d); + +void ff_datanode_filter_values_by_name(DataNode *d, StringList *l, char *n); + +int ff_datanode_getdepth(DataNode *d); + +void ff_datanode_visualize(DataNode *d); + +StringList *ff_stringlist_alloc(); + +void ff_stringlist_append(StringList *l, char *str); + +void ff_stringlist_print(StringList *l); + +#endif /* AVFORMAT_DATANODE_H */

1 0