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

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

28 Jun '09

Author: spyfeng Date: Sun Jun 28 04:03:40 2009 New Revision: 4536 Log: add seektest2.c for generating more test cases. Added: seek_api/seektest/seek_test2.c Added: seek_api/seektest/seek_test2.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ seek_api/seektest/seek_test2.c Sun Jun 28 04:03:40 2009 (r4536) @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2003 Fabrice Bellard + * Copyright (c) 2007 Michael Niedermayer + * + * 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 <stdint.h> +#include <stdlib.h> +#include <stdio.h> + +#include "libavutil/common.h" +#include "libavformat/avformat.h" + +#undef exit +#undef printf +#undef fprintf +#undef DEBUG_SEEK + +int main(int argc, char **argv) +{ + const char *filename; + AVFormatContext *ic; + int i, ret, stream_id; + int64_t timestamp; + AVFormatParameters params, *ap= &params; + memset(ap, 0, sizeof(params)); + ap->channels=1; + ap->sample_rate= 22050; + + /* initialize libavcodec, and register all codecs and formats */ + av_register_all(); + + if (argc != 2) { + printf("usage: %s input_file\n" + "\n", argv[0]); + exit(1); + } + + filename = argv[1]; + + /* allocate the media context */ + ic = avformat_alloc_context(); + if (!ic) { + fprintf(stderr, "Memory error\n"); + exit(1); + } + + ret = av_open_input_file(&ic, filename, NULL, 0, ap); + if (ret < 0) { + fprintf(stderr, "cannot open %s\n", filename); + exit(1); + } + + ret = av_find_stream_info(ic); + if (ret < 0) { + fprintf(stderr, "%s: could not find codec parameters\n", filename); + exit(1); + } + + for(i=0; ; i++){ + AVPacket pkt; + AVStream *av_uninit(st); + + memset(&pkt, 0, sizeof(pkt)); + if(ret>=0){ + ret= av_read_frame(ic, &pkt); + printf("ret:%2d", ret); + if(ret>=0){ + st= ic->streams[pkt.stream_index]; + 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; + + stream_id= (i>>1)%(ic->nb_streams+1) - 1; + timestamp= (i*19362894167LL) % (4*AV_TIME_BASE) - AV_TIME_BASE; + if(stream_id>=0){ + st= ic->streams[stream_id]; + 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, timestamp, 0); + else ret = avformat_seek_file(ic, stream_id, timestamp, timestamp, INT64_MAX, 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); + } + + return 0; +}

1 0

[soc]: r4535 - seek_api/seektest
by spyfeng 28 Jun '09

28 Jun '09

Author: spyfeng Date: Sun Jun 28 03:57:09 2009 New Revision: 4535 Log: add directory for seek api test. Added: seek_api/seektest/

1 0

[soc]: r4534 - seek_api/utils.c
by spyfeng 27 Jun '09

27 Jun '09

Author: spyfeng Date: Sat Jun 27 15:38:05 2009 New Revision: 4534 Log: remove code lines because we fixed in av_parser_parse2(). Modified: seek_api/utils.c Modified: seek_api/utils.c ============================================================================== --- seek_api/utils.c Sat Jun 27 15:35:59 2009 (r4533) +++ seek_api/utils.c Sat Jun 27 15:38:05 2009 (r4534) @@ -937,8 +937,6 @@ static int av_read_frame_internal(AVForm pkt->stream_index = st->index; pkt->pts = st->parser->pts; pkt->dts = st->parser->dts; - if (st->parser->pos == -1) - st->parser->pos = st->parser->last_pos + len; pkt->pos = st->parser->pos; pkt->destruct = NULL; compute_pkt_fields(s, st, st->parser, pkt);

1 0

[RFC] Possible jpeg2k decoder rewrite
by Jai Menon 26 Jun '09

26 Jun '09

Hi, So any opinions on $subject? Quite a lot of stuff is missing in the current code (none of which is documented) and its also poorly structured. Also I dunno how to add support for assembling out of order tile parts etc to current code :) Suggestions welcome. -- Regards, Jai

3 16

[soc]: r4531 - seek_api/mpeg.c
by spyfeng 25 Jun '09

25 Jun '09

Author: spyfeng Date: Thu Jun 25 19:41:22 2009 New Revision: 4531 Log: new version seek api. make it work with or without index entries. Modified: seek_api/mpeg.c Modified: seek_api/mpeg.c ============================================================================== --- seek_api/mpeg.c Wed Jun 24 21:47:00 2009 (r4530) +++ seek_api/mpeg.c Thu Jun 25 19:41:22 2009 (r4531) @@ -647,6 +647,16 @@ static int mpegps_read_seek(struct AVFor av_log(s, AV_LOG_ERROR, "Not active stream!\n"); return -1; } + pos_min = s->data_offset; + ts_min = mpegps_read_dts(s, stream_index, &pos_min, INT64_MAX); + if (ts_min == AV_NOPTS_VALUE) + return -1; + if (ts < ts_min) { + pos = pos_min; + pts = ts_min; + url_fseek(s->pb, pos, SEEK_SET); + goto success; + } if (st->index_entries) { AVIndexEntry *e; @@ -659,39 +669,35 @@ static int mpegps_read_seek(struct AVFor pos = e->pos; pts = e->timestamp; av_log(s, AV_LOG_DEBUG, "the seek pos = %"PRId64", pts = %"PRId64", targe timestamp = %"PRId64"\n", pos, pts, ts); - if (flags & AVSEEK_FLAG_ANY) { + if (ts == pts) { + url_fseek(s->pb, pos, SEEK_SET); + goto success; + } + if (flags & AVSEEK_FLAG_ANY) { while(pts > ts) { // find the index timestamp smaller than target timestamp index--; pts = st->index_entries[index].timestamp; pos = st->index_entries[index].pos; } + } - if (find_keyframe(s, stream_index, &pos, &pts, ts, flags) == 0) { - goto success; - } else { - return -1; - } - } else { - url_fseek(s->pb, pos, SEEK_SET); + if (find_keyframe(s, stream_index, &pos, &pts, ts, flags) == 0) { goto success; + } else { + return -1; } } + // search the scr use binary search - ts_max = - ts_min = AV_NOPTS_VALUE; + ts_max = AV_NOPTS_VALUE; pos_limit = -1; - if (flags & AVSEEK_FLAG_ANY) // add flag AVSEEK_FLAG_BACKWARD in order to get the smaller timestamp frame, then we can use av_read_frame() get next frame - ret_pos = av_gen_search(s, stream_index, ts, pos_min, pos_max, pos_limit, ts_min, ts_max, flags | AVSEEK_FLAG_BACKWARD, &ret_ts, mpegps_read_dts); - else - ret_pos = av_gen_search(s, stream_index, ts, pos_min, pos_max, pos_limit, ts_min, ts_max, flags, &ret_ts, mpegps_read_dts); - av_log(s, AV_LOG_DEBUG, "the seek pos = %"PRId64", ret_ts = %"PRId64"\n", pos, ret_ts); + ret_pos = av_gen_search(s, stream_index, ts, pos_min, pos_max, pos_limit, ts_min, ts_max, flags, &ret_ts, mpegps_read_dts); + av_log(s, AV_LOG_DEBUG, "the seek pos = %"PRId64", ret_ts = %"PRId64"\n", ret_pos, ret_ts); if (ret_pos<0) return -1; - if (ret_ts < pts) { // in order to find the keyframe closer to target timestamp - pos = ret_pos; - pts = ret_ts; - } + pts = ret_ts; + pos = ret_pos; if (find_keyframe(s, stream_index, &pos, &pts, ts, flags) == 0) { goto success;

1 0

[soc]: r4530 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 21:47:00 2009 New Revision: 4530 Log: replace division with shift Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 21:38:31 2009 (r4529) +++ wmapro/wma3dec.c Wed Jun 24 21:47:00 2009 (r4530) @@ -441,7 +441,7 @@ static av_cold int decode_init(AVCodecCo /** calculate subwoofer cutoff values */ for (i=0;i< s->num_possible_block_sizes;i++) { - int block_size = s->samples_per_frame / (1 << i); + int block_size = s->samples_per_frame >> i; int cutoff = ceil(block_size * 440.0 / (double)s->avctx->sample_rate + 0.5); s->subwoofer_cutoffs[i] = av_clip(cutoff,4,block_size);

1 0

[soc]: r4529 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 21:38:31 2009 New Revision: 4529 Log: remove empty line to clarify that the preceding comment belongs to the following code Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 21:31:52 2009 (r4528) +++ wmapro/wma3dec.c Wed Jun 24 21:38:31 2009 (r4529) @@ -440,7 +440,6 @@ static av_cold int decode_init(AVCodecCo } /** calculate subwoofer cutoff values */ - for (i=0;i< s->num_possible_block_sizes;i++) { int block_size = s->samples_per_frame / (1 << i); int cutoff = ceil(block_size * 440.0

1 0

[soc]: r4528 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 21:31:52 2009 New Revision: 4528 Log: merge assignment and index increment Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 21:25:59 2009 (r4527) +++ wmapro/wma3dec.c Wed Jun 24 21:31:52 2009 (r4528) @@ -396,10 +396,8 @@ static av_cold int decode_init(AVCodecCo int offset = (subframe_len * 2 * critical_freq[x]) / s->avctx->sample_rate + 2; offset &= ~3; - if ( offset > sfb_offsets[band - 1] ) { - sfb_offsets[band] = offset; - ++band; - } + if ( offset > sfb_offsets[band - 1] ) + sfb_offsets[band++] = offset; } sfb_offsets[band - 1] = subframe_len; s->num_sfb[i] = band - 1;

1 0

[soc]: r4527 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 21:25:59 2009 New Revision: 4527 Log: avoid modulo 4 Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 21:12:28 2009 (r4526) +++ wmapro/wma3dec.c Wed Jun 24 21:25:59 2009 (r4527) @@ -395,7 +395,7 @@ static av_cold int decode_init(AVCodecCo for (x=0;x < MAX_BANDS-1 && sfb_offsets[band-1] < subframe_len;x++) { int offset = (subframe_len * 2 * critical_freq[x]) / s->avctx->sample_rate + 2; - offset -= offset % 4; + offset &= ~3; if ( offset > sfb_offsets[band - 1] ) { sfb_offsets[band] = offset; ++band;

1 0

[soc]: r4526 - wmapro/wma3dec.c
by faust3 24 Jun '09

24 Jun '09

Author: faust3 Date: Wed Jun 24 21:12:28 2009 New Revision: 4526 Log: remove unneeded shift Modified: wmapro/wma3dec.c Modified: wmapro/wma3dec.c ============================================================================== --- wmapro/wma3dec.c Wed Jun 24 21:08:32 2009 (r4525) +++ wmapro/wma3dec.c Wed Jun 24 21:12:28 2009 (r4526) @@ -311,7 +311,7 @@ static av_cold int decode_init(AVCodecCo s->max_num_subframes = 1 << log2_num_subframes; s->num_possible_block_sizes = log2_num_subframes + 1; s->min_samples_per_subframe = s->samples_per_frame / s->max_num_subframes; - s->dynamic_range_compression = (s->decode_flags & 0x80) >> 7; + s->dynamic_range_compression = (s->decode_flags & 0x80); if (s->max_num_subframes > MAX_SUBFRAMES) { av_log(avctx, AV_LOG_ERROR, "invalid number of subframes %i\n",

1 0