mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits) ac3enc: merge AC3MDCTContext with AC3EncodeContext. ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext ac3enc: fix memleak mpeg1video: add CODEC_CAP_SLICE_THREADS. lavf: fix segfault in av_open_input_stream() mpegtsenc: set Random Access indicator on keyframe start packets lavf: Cleanup try_decode_frame() logic. Replace some gotos that lead to single return statements by direct return. build: move tests/seek_test.c to libavformat and reuse generic build rules mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Add a check for strptime(). lavf: factor out conversion of ISO8601 string to unix time wav: parse 'bext' metadata wav: keep parsing until EOF if the input is seekable and we know the size of the data tag wav: Refactor the tag checking into a switch statement wav: make sure neither data_size nor sample_count is negative. wav: refactor the 'fmt ' tag search and parsing. wav: add an option for writing BEXT chunk ffmpeg: get rid of a pointless limit on number of streams. ffmpeg: remove an unused define. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/2/head
Michael Niedermayer
14 years ago
commit
80e4fe4063
27 changed files with 252 additions and 259 deletions
@ -1,3 +1,3 @@ |
||||
178f5094fc874112d21b4a8716121d96 *./tests/data/lavf/lavf.ts |
||||
151774afed45b19da9b7e83613a1e72b *./tests/data/lavf/lavf.ts |
||||
406644 ./tests/data/lavf/lavf.ts |
||||
./tests/data/lavf/lavf.ts CRC=0x133216c1 |
||||
|
||||
@ -1,133 +0,0 @@ |
||||
/*
|
||||
* 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 <string.h> |
||||
|
||||
#include "libavutil/common.h" |
||||
#include "libavutil/mathematics.h" |
||||
#include "libavformat/avformat.h" |
||||
|
||||
#undef exit |
||||
#undef printf |
||||
#undef fprintf |
||||
|
||||
static char buffer[20]; |
||||
|
||||
static const char *ret_str(int v) |
||||
{ |
||||
switch (v) { |
||||
case AVERROR_EOF: return "-EOF"; |
||||
case AVERROR(EIO): return "-EIO"; |
||||
case AVERROR(ENOMEM): return "-ENOMEM"; |
||||
case AVERROR(EINVAL): return "-EINVAL"; |
||||
default: |
||||
snprintf(buffer, sizeof(buffer), "%2d", v); |
||||
return buffer; |
||||
} |
||||
} |
||||
|
||||
static void ts_str(char buffer[60], int64_t ts, AVRational base) |
||||
{ |
||||
double tsval; |
||||
if (ts == AV_NOPTS_VALUE) { |
||||
strcpy(buffer, " NOPTS "); |
||||
return; |
||||
} |
||||
tsval = ts * av_q2d(base); |
||||
snprintf(buffer, 60, "%9f", tsval); |
||||
} |
||||
|
||||
int main(int argc, char **argv) |
||||
{ |
||||
const char *filename; |
||||
AVFormatContext *ic = NULL; |
||||
int i, ret, stream_id; |
||||
int64_t timestamp; |
||||
AVFormatParameters params, *ap= ¶ms; |
||||
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]; |
||||
|
||||
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); |
||||
char ts_buf[60]; |
||||
|
||||
memset(&pkt, 0, sizeof(pkt)); |
||||
if(ret>=0){ |
||||
ret= av_read_frame(ic, &pkt); |
||||
if(ret>=0){ |
||||
char dts_buf[60]; |
||||
st= ic->streams[pkt.stream_index]; |
||||
ts_str(dts_buf, pkt.dts, st->time_base); |
||||
ts_str(ts_buf, pkt.pts, st->time_base); |
||||
printf("ret:%-10s st:%2d flags:%d dts:%s pts:%s pos:%7" PRId64 " size:%6d", ret_str(ret), pkt.stream_index, pkt.flags, dts_buf, ts_buf, pkt.pos, pkt.size); |
||||
av_free_packet(&pkt); |
||||
} else |
||||
printf("ret:%s", ret_str(ret)); // necessary to avoid trailing whitespace
|
||||
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); |
||||
ts_str(ts_buf, timestamp, stream_id < 0 ? AV_TIME_BASE_Q : st->time_base); |
||||
printf("ret:%-10s st:%2d flags:%d ts:%s\n", ret_str(ret), stream_id, i&1, ts_buf); |
||||
} |
||||
|
||||
av_close_input_file(ic); |
||||
|
||||
return 0; |
||||
} |
||||
Loading…
Reference in new issue