Use generic multi-stream key frame finding routine to implement read_seek2 and map

read_seek to read_seek2.

Originally committed as revision 19681 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 26 insertions, 32 deletions

diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 5faf77b069..dc09fa6d4c 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -3599,57 +3599,51 @@ ret:-1 st:-1 ts:-0.645825 flags:1
 tests/data/b-lavf.ts
 ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:0.780000 pts:0.820000 pos:65612 size:12623 flags:0
+ret: 0 st: 1 dts:1.457556 pts:1.457556 pos:435596 size:409 flags:1
 ret: 0 st: 0 ts:0.788333 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
-ret: 0 st: 0 ts:-0.317500 flags:1
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:1.100000 pts:1.140000 pos:189504 size:12236 flags:0
+ret:-1 st: 0 ts:-0.317500 flags:1
 ret: 0 st: 1 ts:2.576667 flags:0
-ret: 0 st: 0 dts:0.860000 pts:0.900000 pos:96068 size:13086 flags:0
+ret:-5
 ret: 0 st: 1 ts:1.470833 flags:1
-ret: 0 st: 0 dts:0.780000 pts:0.820000 pos:65612 size:12623 flags:0
+ret: 0 st: 0 dts:1.140000 pts:1.180000 pos:203980 size:24787 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
-ret: 0 st:-1 ts:-0.740831 flags:1
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
+ret:-1 st:-1 ts:-0.740831 flags:1
 ret: 0 st: 0 ts:2.153333 flags:0
-ret: 0 st: 0 dts:0.820000 pts:0.860000 pos:80464 size:13388 flags:0
+ret:-5
 ret: 0 st: 0 ts:1.047500 flags:1
-ret: 0 st: 0 dts:0.740000 pts:0.780000 pos:48316 size:14502 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
 ret: 0 st: 1 ts:-0.058333 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
 ret: 0 st: 1 ts:2.835833 flags:1
-ret: 0 st: 0 dts:0.900000 pts:0.940000 pos:111296 size:12781 flags:0
+ret: 0 st: 1 dts:1.457556 pts:1.457556 pos:435596 size:409 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:0.780000 pts:0.820000 pos:65612 size:12623 flags:0
-ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret:-5
+ret:-1 st:-1 ts:0.624171 flags:1
 ret: 0 st: 0 ts:-0.481667 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
 ret: 0 st: 0 ts:2.412500 flags:1
-ret: 0 st: 0 dts:0.860000 pts:0.900000 pos:96068 size:13086 flags:0
+ret: 0 st: 1 dts:1.457556 pts:1.457556 pos:435596 size:409 flags:1
 ret: 0 st: 1 ts:1.306667 flags:0
-ret: 0 st: 0 dts:0.740000 pts:0.780000 pos:48316 size:14502 flags:0
-ret: 0 st: 1 ts:0.200844 flags:1
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:1.460000 pts:1.500000 pos:351184 size:12679 flags:0
+ret:-1 st: 1 ts:0.200844 flags:1
 ret: 0 st:-1 ts:-0.904994 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
 ret: 0 st:-1 ts:1.989173 flags:1
-ret: 0 st: 0 dts:0.820000 pts:0.860000 pos:80464 size:13388 flags:0
+ret: 0 st: 1 dts:1.457556 pts:1.457556 pos:435596 size:409 flags:1
 ret: 0 st: 0 ts:0.883344 flags:0
-ret: 0 st: 0 dts:0.740000 pts:0.780000 pos:48316 size:14502 flags:0
-ret: 0 st: 0 ts:-0.222489 flags:1
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:1.100000 pts:1.140000 pos:189504 size:12236 flags:0
+ret:-1 st: 0 ts:-0.222489 flags:1
 ret: 0 st: 1 ts:2.671678 flags:0
-ret: 0 st: 0 dts:0.860000 pts:0.900000 pos:96068 size:13086 flags:0
+ret:-5
 ret: 0 st: 1 ts:1.565844 flags:1
-ret: 0 st: 0 dts:0.780000 pts:0.820000 pos:65612 size:12623 flags:0
+ret: 0 st: 0 dts:1.140000 pts:1.180000 pos:203980 size:24787 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
-ret: 0 st:-1 ts:-0.645825 flags:1
-ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29140 size:16433 flags:0
+ret: 0 st: 0 dts:0.660000 pts:0.700000 pos:564 size:24801 flags:1
+ret:-1 st:-1 ts:-0.645825 flags:1
 ----------------
 tests/data/b-lavf.ul
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1