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

[PATCH] jpeg2k : support higher sample precision
by Jai Menon 12 Jul '09

12 Jul '09

Hi, Attached patch fixes decoding of files where component precision > 8. Possible test files are : codestreams_profile1/p1_04.j2k testfiles_jp2/file6.jp2 testfiles_jp2/file7.jp2 Posting here for comments. -- Regards, Jai

2 15

[soc]: r4553 - in concat/libavformat: m3u.c playlist.c playlist.h
by gkovacs 30 Jun '09

30 Jun '09

Author: gkovacs Date: Tue Jun 30 21:28:59 2009 New Revision: 4553 Log: fixed timestamps on outputted files, ffmpeg with same-format inputs should now be working Modified: concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Tue Jun 30 19:43:58 2009 (r4552) +++ concat/libavformat/m3u.c Tue Jun 30 21:28:59 2009 (r4553) @@ -87,18 +87,13 @@ static int m3u_read_header(AVFormatConte AVFormatParameters *ap) { printf("m3u read header called\n"); - PlaylistD *playld = av_malloc(sizeof(PlaylistD)); - ff_split_wd_fn(s->filename, - &playld->workingdir, - &playld->filename); + PlaylistD *playld = ff_make_playlistd(s->filename); m3u_list_files(s->pb, &(playld->flist), &(playld->pelist_size), playld->workingdir); -// playld = av_make_playlistd(flist, flist_len); playld->pelist = av_malloc(playld->pelist_size * sizeof(PlayElem*)); memset(playld->pelist, 0, playld->pelist_size * sizeof(PlayElem*)); - playld->pe_curidx = 0; s->priv_data = playld; ff_playlist_populate_context(playld, s); return 0; @@ -107,20 +102,36 @@ static int m3u_read_header(AVFormatConte static int m3u_read_packet(AVFormatContext *s, AVPacket *pkt) { - int i; int ret; - int time_offset = 0; PlaylistD *playld; AVFormatContext *ic; playld = s->priv_data; retr: ic = playld->pelist[playld->pe_curidx]->ic; ret = ic->iformat->read_packet(ic, pkt); -// if (pkt) { -// pkt->stream_index += get_stream_offset(s); -// } - if (ret < 0 && playld->pe_curidx < playld->pelist_size - 1) - { + if (ret >= 0) { + // TODO storing previous packet pts/dts is ugly hack + // ic->stream[]->cur_dts correct + // ic->strea[]->duration correct + // pkt->pts incorrect (huge negative) + // pkt->dts correct, depended on by ffmpeg (need to change) + // ic->stream[]->pts incorrect (0) + // ic->start_time always 0 + // changing ic->start_time has no effect + // ic->duration correct, divide by AV_TIME_BASE to get seconds + if (pkt) { + playld->dts_prevpacket = pkt->dts; + pkt->dts += playld->dts_offset; + } + } + // TODO switch from AVERROR_EOF to AVERROR_EOS + else if (ret == AVERROR_EOF && playld->pe_curidx < playld->pelist_size - 1) { + // TODO account for out-of-sync audio/video by using per-stream offsets + // using streams[]->duration slightly overestimates offset +// playld->dts_offset += ic->streams[0]->duration; + // using streams[]->cur_dts slightly overestimates offset +// playld->dts_offset += ic->streams[0]->cur_dts; + playld->dts_offset += playld->dts_prevpacket; ++playld->pe_curidx; // pkt->destruct(pkt); pkt = av_malloc(sizeof(AVPacket)); Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Tue Jun 30 19:43:58 2009 (r4552) +++ concat/libavformat/playlist.c Tue Jun 30 21:28:59 2009 (r4553) @@ -45,7 +45,7 @@ int ff_alloc_playelem(unsigned char *fil return 0; } -PlayElem* ff_make_playelem(unsigned char *filename) +PlayElem* ff_make_playelem(char *filename) { int err; PlayElem *pe = av_malloc(sizeof(PlayElem)); @@ -77,15 +77,17 @@ PlayElem* ff_make_playelem(unsigned char return pe; } -PlaylistD* ff_make_playlistd(unsigned char **flist, - int flist_len) +PlaylistD* ff_make_playlistd(char *filename) { - int i; PlaylistD *playld = av_malloc(sizeof(PlaylistD)); +// playld->pts_offset = 0; + playld->dts_offset = 0; +// playld->pts_prevpacket = 0; + playld->dts_prevpacket = 0; playld->pe_curidx = 0; - playld->pelist_size = flist_len; - playld->pelist = av_malloc(playld->pelist_size * sizeof(PlayElem*)); - memset(playld->pelist, 0, playld->pelist_size * sizeof(PlayElem*)); + ff_split_wd_fn(filename, + &playld->workingdir, + &playld->filename); return playld; } @@ -170,7 +172,6 @@ int ff_playlist_populate_context(Playlis AVFormatContext *s) { int i; -// unsigned int stream_offset; AVFormatContext *ic; AVFormatParameters *nap; printf("playlist_populate_context called\n"); @@ -178,12 +179,9 @@ int ff_playlist_populate_context(Playlis ic = playld->pelist[playld->pe_curidx]->ic; nap = playld->pelist[playld->pe_curidx]->ap; ic->iformat->read_header(ic, 0); -// stream_offset = get_stream_offset(s); s->nb_streams = ic->nb_streams; -// s->nb_streams = ic->nb_streams + stream_offset; for (i = 0; i < ic->nb_streams; ++i) { s->streams[i] = ic->streams[i]; -// s->streams[i+stream_offset] = ic->streams[i]; } // TODO remove this ugly hack s->av_class = ic->av_class; Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Tue Jun 30 19:43:58 2009 (r4552) +++ concat/libavformat/playlist.h Tue Jun 30 21:28:59 2009 (r4553) @@ -41,11 +41,15 @@ typedef struct PlaylistD { int ch_curidx; char *workingdir; char *filename; +// int64_t pts_offset; + int64_t dts_offset; +// int64_t pts_prevpacket; + int64_t dts_prevpacket; } PlaylistD; -PlayElem* ff_make_playelem(unsigned char *filename); +PlayElem* ff_make_playelem(char *filename); -PlaylistD* ff_make_playlistd(unsigned char **flist, int flist_len); +PlaylistD* ff_make_playlistd(char *filename); int ff_playlist_populate_context(PlaylistD *playld, AVFormatContext *s);

1 0

[soc]: r4533 - seek_api/parser.c
by spyfeng 30 Jun '09

30 Jun '09

Author: spyfeng Date: Sat Jun 27 15:35:59 2009 New Revision: 4533 Log: set correct pos when cannot get pos from ff_fetch_timestamp(). Modified: seek_api/parser.c Modified: seek_api/parser.c ============================================================================== --- seek_api/parser.c Sat Jun 27 15:28:08 2009 (r4532) +++ seek_api/parser.c Sat Jun 27 15:35:59 2009 (r4533) @@ -188,6 +188,8 @@ int av_parser_parse2(AVCodecParserContex if (index < 0) index = 0; s->cur_offset += index; + if (s->pos == -1) + s->pos = s->last_pos + index; return index; }

3 4

[soc]: r4552 - seek_api/seektest/seek_test2.c
by spyfeng 30 Jun '09

30 Jun '09

Author: spyfeng Date: Tue Jun 30 19:43:58 2009 New Revision: 4552 Log: continue read the frame when seek failed. Modified: seek_api/seektest/seek_test2.c Modified: seek_api/seektest/seek_test2.c ============================================================================== --- seek_api/seektest/seek_test2.c Tue Jun 30 19:10:52 2009 (r4551) +++ seek_api/seektest/seek_test2.c Tue Jun 30 19:43:58 2009 (r4552) @@ -78,7 +78,7 @@ int main(int argc, char **argv) AVStream *av_uninit(st); memset(&pkt, 0, sizeof(pkt)); - if(ret>=0){ + //if(ret>=0){ ret= av_read_frame(ic, &pkt); printf("ret:%2d", ret); if(ret>=0){ @@ -86,7 +86,7 @@ int main(int argc, char **argv) printf(" st:%2d dts:%"PRId64" pts:%"PRId64" pos:%" PRId64 " size:%d flags:%d", pkt.stream_index, pkt.dts/**av_q2d(st->time_base)*/, pkt.pts/**av_q2d(st->time_base)*/, pkt.pos, pkt.size, pkt.flags); } printf("\n"); - } + //} if(i>25) break;

1 0

[soc]: r4551 - seek_api/mpeg.c
by spyfeng 30 Jun '09

30 Jun '09

Author: spyfeng Date: Tue Jun 30 19:10:52 2009 New Revision: 4551 Log: rename pre_* to prev_* in find_keyframe() for more readable. Modified: seek_api/mpeg.c Modified: seek_api/mpeg.c ============================================================================== --- seek_api/mpeg.c Tue Jun 30 19:03:20 2009 (r4550) +++ seek_api/mpeg.c Tue Jun 30 19:10:52 2009 (r4551) @@ -592,7 +592,7 @@ static int64_t mpegps_read_dts(AVFormatC static int find_keyframe(AVFormatContext *s, int stream_index, int64_t *ret_pos, int64_t *pts, int64_t target_ts, int flags) { AVPacket pkt1, *pkt = &pkt1; - int64_t pre_pts = *pts, pre_pos = *ret_pos; + int64_t prev_pts = *pts, prev_pos = *ret_pos; url_fseek(s->pb, *ret_pos, SEEK_SET); for (;;) { @@ -609,15 +609,15 @@ static int find_keyframe(AVFormatContext *ret_pos = pkt->pos; if (*pts < target_ts) { - pre_pts = *pts; - pre_pos = *ret_pos; + prev_pts = *pts; + prev_pos = *ret_pos; } else break; } - if (flags & AVSEEK_FLAG_BACKWARD && ((pre_pts + *pts) >> 2 > target_ts)) { - *ret_pos = pre_pts; - *pts = pre_pos; + if (flags & AVSEEK_FLAG_BACKWARD && ((prev_pts + *pts) >> 2 > target_ts)) { + *ret_pos = prev_pts; + *pts = prev_pos; } return 0; }

1 0

[soc]: r4550 - seek_api/parser.c
by spyfeng 30 Jun '09

30 Jun '09

Author: spyfeng Date: Tue Jun 30 19:03:20 2009 New Revision: 4550 Log: set correct pos value when pos is -1. Modified: seek_api/parser.c Modified: seek_api/parser.c ============================================================================== --- seek_api/parser.c Mon Jun 29 19:42:38 2009 (r4549) +++ seek_api/parser.c Tue Jun 30 19:03:20 2009 (r4550) @@ -190,7 +190,7 @@ int av_parser_parse2(AVCodecParserContex index = 0; s->cur_offset += index; if (s->pos == -1) - s->pos = s->last_pos + index; + s->pos = s->cur_frame_pos[s->cur_frame_start_index]; return index; }

1 0

[soc]: r4549 - seek_api/seektest/seek_test2.c
by spyfeng 29 Jun '09

29 Jun '09

Author: spyfeng Date: Mon Jun 29 19:42:38 2009 New Revision: 4549 Log: remove magic number 0.09 and compute it. Modified: seek_api/seektest/seek_test2.c Modified: seek_api/seektest/seek_test2.c ============================================================================== --- seek_api/seektest/seek_test2.c Mon Jun 29 19:10:38 2009 (r4548) +++ seek_api/seektest/seek_test2.c Mon Jun 29 19:42:38 2009 (r4549) @@ -99,7 +99,7 @@ int main(int argc, char **argv) //FIXME fully test the new seek API if(i&1) ret = avformat_seek_file(ic, stream_id, timestamp - ts_delta, timestamp, timestamp + ts_delta, 1); else ret = avformat_seek_file(ic, stream_id, timestamp - ts_delta, timestamp, timestamp + ts_delta, 0); - printf("ret:%2d st:%2d ts:%.2f flags:%d\n", ret, stream_id, timestamp*(stream_id<0 ? 0.09:1/*1.0/AV_TIME_BASE : av_q2d(st->time_base*90000)*/), i&1); + printf("ret:%2d st:%2d ts:%"PRId64" flags:%d\n", ret, stream_id, stream_id < 0 ? av_rescale(timestamp, st->time_base.den, AV_TIME_BASE * (int64_t)st->time_base.num) : timestamp, i&1); } return 0;

1 0

[soc]: r4548 - seek_api/seektest/seek_test2.c
by spyfeng 29 Jun '09

29 Jun '09

Author: spyfeng Date: Mon Jun 29 19:10:38 2009 New Revision: 4548 Log: add a magic value for setting the timestamp range for test. Modified: seek_api/seektest/seek_test2.c Modified: seek_api/seektest/seek_test2.c ============================================================================== --- seek_api/seektest/seek_test2.c Mon Jun 29 18:42:21 2009 (r4547) +++ seek_api/seektest/seek_test2.c Mon Jun 29 19:10:38 2009 (r4548) @@ -34,6 +34,7 @@ int main(int argc, char **argv) { const char *filename; + const int ts_delta = 3000; // FIXME for more test case AVFormatContext *ic; int i, ret, stream_id; int64_t timestamp; @@ -96,8 +97,8 @@ int main(int argc, char **argv) timestamp= av_rescale_q(timestamp, AV_TIME_BASE_Q, st->time_base); } //FIXME fully test the new seek API - if(i&1) ret = avformat_seek_file(ic, stream_id, INT64_MIN, timestamp, INT64_MAX, 0); - else ret = avformat_seek_file(ic, stream_id, INT64_MIN, timestamp, INT64_MAX, 0); + if(i&1) ret = avformat_seek_file(ic, stream_id, timestamp - ts_delta, timestamp, timestamp + ts_delta, 1); + else ret = avformat_seek_file(ic, stream_id, timestamp - ts_delta, timestamp, timestamp + ts_delta, 0); printf("ret:%2d st:%2d ts:%.2f flags:%d\n", ret, stream_id, timestamp*(stream_id<0 ? 0.09:1/*1.0/AV_TIME_BASE : av_q2d(st->time_base*90000)*/), i&1); }

1 0

[soc]: r4540 - seek_api/mpeg.c
by spyfeng 29 Jun '09

29 Jun '09

Author: spyfeng Date: Sun Jun 28 05:37:40 2009 New Revision: 4540 Log: check the returned pts value with given range. Modified: seek_api/mpeg.c Modified: seek_api/mpeg.c ============================================================================== --- seek_api/mpeg.c Sun Jun 28 04:13:13 2009 (r4539) +++ seek_api/mpeg.c Sun Jun 28 05:37:40 2009 (r4540) @@ -706,7 +706,12 @@ static int mpegps_read_seek(struct AVFor } success: av_update_cur_dts(s, st, pts); - return 0; + if (pts <= max_ts && pts >= min_ts) + return 0; + else { + av_log(s, AV_LOG_ERROR,"The target pts = %"PRId64" is out of range. min_ts = %"PRId64", max_ts = %"PRId64"\n", pts, min_ts, max_ts); + return -1; + } } AVInputFormat mpegps_demuxer = {

3 2

[soc]: r4547 - seek_api/mpeg.c
by spyfeng 29 Jun '09

29 Jun '09

Author: spyfeng Date: Mon Jun 29 18:42:21 2009 New Revision: 4547 Log: Don't update the dts when seek failed. Modified: seek_api/mpeg.c Modified: seek_api/mpeg.c ============================================================================== --- seek_api/mpeg.c Mon Jun 29 17:55:18 2009 (r4546) +++ seek_api/mpeg.c Mon Jun 29 18:42:21 2009 (r4547) @@ -705,10 +705,10 @@ static int mpegps_read_seek(struct AVFor return -1; } success: - av_update_cur_dts(s, st, pts); - if (pts <= max_ts && pts >= min_ts) + if (pts <= max_ts && pts >= min_ts) { + av_update_cur_dts(s, st, pts); return 0; - else { + } else { av_log(s, AV_LOG_ERROR,"The target pts = %"PRId64" is out of range. min_ts = %"PRId64", max_ts = %"PRId64"\n", pts, min_ts, max_ts); return -1; }

1 0