From aba29e6feba0ab0d52cdd711cd5c1dbe8bbb5877 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 31 Jan 2008 20:04:17 +0000 Subject: Fix b-libav.ul/al seek regression test. Originally committed as revision 11696 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/seek.regression.ref | 106 ++++++++++++++++++++++++++++++++++++++++++++++ tests/seek_test.c | 6 ++- 2 files changed, 111 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref index 5588520..955c7fc 100644 --- a/tests/seek.regression.ref +++ b/tests/seek.regression.ref @@ -2597,6 +2597,59 @@ ret: 0 st:-1 ts:-0.645825 flags:1 ret: 0 st: 0 dts:-0.645828 pts:-0.645828 pos:73394 size:4096 flags:1 ---------------- tests/data/b-libav.al +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1 +ret: 0 st:-1 ts:-1.000000 flags:0 +ret: 0 st: 0 dts:1.486077 pts:1.486077 pos:32768 size:1024 flags:1 +ret: 0 st:-1 ts:1.894167 flags:1 +ret: 0 st: 0 dts:1.894150 pts:1.894150 pos:41766 size:1024 flags:1 +ret: 0 st: 0 ts:0.788345 flags:0 +ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:17383 size:1024 flags:1 +ret: 0 st: 0 ts:-0.317506 flags:1 +ret:-5 +ret: 0 st:-1 ts:2.576668 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.470835 flags:1 +ret: 0 st: 0 dts:1.470839 pts:1.470839 pos:32432 size:1024 flags:1 +ret: 0 st: 0 ts:0.364989 flags:0 +ret: 0 st: 0 dts:0.364989 pts:0.364989 pos:8048 size:1024 flags:1 +ret: 0 st: 0 ts:-0.740816 flags:1 +ret: 0 st: 0 dts:1.851066 pts:1.851066 pos:40816 size:1024 flags:1 +ret: 0 st:-1 ts:2.153336 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.047503 flags:1 +ret: 0 st: 0 dts:1.047483 pts:1.047483 pos:23097 size:1024 flags:1 +ret: 0 st: 0 ts:-0.058322 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.835828 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.730004 flags:0 +ret: 0 st: 0 dts:1.730023 pts:1.730023 pos:38147 size:1024 flags:1 +ret: 0 st:-1 ts:0.624171 flags:1 +ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:13763 size:1024 flags:1 +ret: 0 st: 0 ts:-0.481678 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.412517 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.306672 flags:0 +ret: 0 st: 0 dts:1.306667 pts:1.306667 pos:28812 size:1024 flags:1 +ret: 0 st:-1 ts:0.200839 flags:1 +ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1 +ret: 0 st: 0 ts:-0.904989 flags:0 +ret: 0 st: 0 dts:1.686893 pts:1.686893 pos:37196 size:1024 flags:1 +ret: 0 st: 0 ts:1.989161 flags:1 +ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1 +ret: 0 st:-1 ts:0.883340 flags:0 +ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1 +ret: 0 st:-1 ts:-0.222493 flags:1 +ret:-5 +ret: 0 st: 0 ts:2.671655 flags:0 +ret:-5 +ret: 0 st: 0 ts:1.565850 flags:1 +ret: 0 st: 0 dts:1.565850 pts:1.565850 pos:34527 size:1024 flags:1 +ret: 0 st:-1 ts:0.460008 flags:0 +ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:10143 size:1024 flags:1 +ret: 0 st:-1 ts:-0.645825 flags:1 +ret: 0 st: 0 dts:1.946077 pts:1.946077 pos:42911 size:1024 flags:1 ---------------- tests/data/b-libav.asf ret: 0 st: 0 dts:3.100000 pts:3.100000 pos:575 size:28874 flags:1 @@ -3504,6 +3557,59 @@ ret: 0 st:-1 ts:-0.645825 flags:1 ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:-1 size:22036 flags:1 ---------------- tests/data/b-libav.ul +ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1 +ret: 0 st:-1 ts:-1.000000 flags:0 +ret: 0 st: 0 dts:1.486077 pts:1.486077 pos:32768 size:1024 flags:1 +ret: 0 st:-1 ts:1.894167 flags:1 +ret: 0 st: 0 dts:1.894150 pts:1.894150 pos:41766 size:1024 flags:1 +ret: 0 st: 0 ts:0.788345 flags:0 +ret: 0 st: 0 dts:0.788345 pts:0.788345 pos:17383 size:1024 flags:1 +ret: 0 st: 0 ts:-0.317506 flags:1 +ret:-5 +ret: 0 st:-1 ts:2.576668 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.470835 flags:1 +ret: 0 st: 0 dts:1.470839 pts:1.470839 pos:32432 size:1024 flags:1 +ret: 0 st: 0 ts:0.364989 flags:0 +ret: 0 st: 0 dts:0.364989 pts:0.364989 pos:8048 size:1024 flags:1 +ret: 0 st: 0 ts:-0.740816 flags:1 +ret: 0 st: 0 dts:1.851066 pts:1.851066 pos:40816 size:1024 flags:1 +ret: 0 st:-1 ts:2.153336 flags:0 +ret:-5 +ret: 0 st:-1 ts:1.047503 flags:1 +ret: 0 st: 0 dts:1.047483 pts:1.047483 pos:23097 size:1024 flags:1 +ret: 0 st: 0 ts:-0.058322 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.835828 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.730004 flags:0 +ret: 0 st: 0 dts:1.730023 pts:1.730023 pos:38147 size:1024 flags:1 +ret: 0 st:-1 ts:0.624171 flags:1 +ret: 0 st: 0 dts:0.624172 pts:0.624172 pos:13763 size:1024 flags:1 +ret: 0 st: 0 ts:-0.481678 flags:0 +ret:-5 +ret: 0 st: 0 ts:2.412517 flags:1 +ret:-5 +ret: 0 st:-1 ts:1.306672 flags:0 +ret: 0 st: 0 dts:1.306667 pts:1.306667 pos:28812 size:1024 flags:1 +ret: 0 st:-1 ts:0.200839 flags:1 +ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1 +ret: 0 st: 0 ts:-0.904989 flags:0 +ret: 0 st: 0 dts:1.686893 pts:1.686893 pos:37196 size:1024 flags:1 +ret: 0 st: 0 ts:1.989161 flags:1 +ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1 +ret: 0 st:-1 ts:0.883340 flags:0 +ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1 +ret: 0 st:-1 ts:-0.222493 flags:1 +ret:-5 +ret: 0 st: 0 ts:2.671655 flags:0 +ret:-5 +ret: 0 st: 0 ts:1.565850 flags:1 +ret: 0 st: 0 dts:1.565850 pts:1.565850 pos:34527 size:1024 flags:1 +ret: 0 st:-1 ts:0.460008 flags:0 +ret: 0 st: 0 dts:0.460000 pts:0.460000 pos:10143 size:1024 flags:1 +ret: 0 st:-1 ts:-0.645825 flags:1 +ret: 0 st: 0 dts:1.946077 pts:1.946077 pos:42911 size:1024 flags:1 ---------------- tests/data/b-libav.voc ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:32 size:512 flags:1 diff --git a/tests/seek_test.c b/tests/seek_test.c index 2ab7161..b1a2c93 100644 --- a/tests/seek_test.c +++ b/tests/seek_test.c @@ -31,6 +31,10 @@ int main(int argc, char **argv) AVFormatContext *ic; 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(); @@ -50,7 +54,7 @@ int main(int argc, char **argv) exit(1); } - ret = av_open_input_file(&ic, filename, NULL, 0, NULL); + ret = av_open_input_file(&ic, filename, NULL, 0, ap); if (ret < 0) { fprintf(stderr, "cannot open %s\n", filename); exit(1); -- cgit v1.1