From cba716f55e79ebb2db9627c6e3e11d6fc77ae737 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 5 Feb 2021 00:35:18 +0100 Subject: avformat/cdxl: improve frame rate guessing for standard cdxl Use audio size and sample rate to get real frame rate. Also make seeking more robust. --- tests/ref/fate/cdxl-bitline-ham6 | 2 +- tests/ref/fate/cdxl-demux | 18 +++++++++--------- tests/ref/fate/cdxl-ham6 | 2 +- tests/ref/fate/cdxl-ham8 | 2 +- tests/ref/fate/cdxl-pal8 | 2 +- tests/ref/fate/cdxl-pal8-small | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/ref/fate/cdxl-bitline-ham6 b/tests/ref/fate/cdxl-bitline-ham6 index 06f9f775f3..9d30e66216 100644 --- a/tests/ref/fate/cdxl-bitline-ham6 +++ b/tests/ref/fate/cdxl-bitline-ham6 @@ -1,4 +1,4 @@ -#tb 0: 1/25 +#tb 0: 1/15 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 162x130 diff --git a/tests/ref/fate/cdxl-demux b/tests/ref/fate/cdxl-demux index 6aa0505a79..324a40f2dc 100644 --- a/tests/ref/fate/cdxl-demux +++ b/tests/ref/fate/cdxl-demux @@ -1,4 +1,4 @@ -#tb 0: 1/25 +#tb 0: 628/3675 #media_type 0: video #codec_id 0: cdxl #dimensions 0: 176x128 @@ -12,19 +12,19 @@ 0, 0, 0, 1, 22688, 0xc954a244 1, 0, 0, 1884, 1884, 0x06925e3e 0, 1, 1, 1, 22688, 0x3ee4a304 -0, 2, 2, 1, 22688, 0x9777a305 -0, 3, 3, 1, 22688, 0xf00aa306 -0, 4, 4, 1, 22688, 0x48aca307 1, 1884, 1884, 1884, 1884, 0x1957ab65 -0, 5, 5, 1, 22688, 0xa13fa308 -0, 6, 6, 1, 22688, 0xf9d2a309 -0, 7, 7, 1, 22688, 0x5274a30a -0, 8, 8, 1, 22688, 0xab07a30b +0, 2, 2, 1, 22688, 0x9777a305 1, 3768, 3768, 1884, 1884, 0x7fcd6e47 -0, 9, 9, 1, 17896, 0x1a696b6e +0, 3, 3, 1, 22688, 0xf00aa306 1, 5652, 5652, 1884, 1884, 0xc974878e +0, 4, 4, 1, 22688, 0x48aca307 1, 7536, 7536, 1884, 1884, 0xecb5c4c8 +0, 5, 5, 1, 22688, 0xa13fa308 1, 9420, 9420, 1884, 1884, 0x87adce5f +0, 6, 6, 1, 22688, 0xf9d2a309 1, 11304, 11304, 1884, 1884, 0x3cf097e4 +0, 7, 7, 1, 22688, 0x5274a30a 1, 13188, 13188, 1884, 1884, 0xcc218105 +0, 8, 8, 1, 22688, 0xab07a30b 1, 15072, 15072, 1884, 1884, 0xf685762f +0, 9, 9, 1, 17896, 0x1a696b6e diff --git a/tests/ref/fate/cdxl-ham6 b/tests/ref/fate/cdxl-ham6 index d14132ba52..4c2c14be4a 100644 --- a/tests/ref/fate/cdxl-ham6 +++ b/tests/ref/fate/cdxl-ham6 @@ -1,4 +1,4 @@ -#tb 0: 1/25 +#tb 0: 12/121 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 160x120 diff --git a/tests/ref/fate/cdxl-ham8 b/tests/ref/fate/cdxl-ham8 index b858276482..cdd4f59d5d 100644 --- a/tests/ref/fate/cdxl-ham8 +++ b/tests/ref/fate/cdxl-ham8 @@ -1,4 +1,4 @@ -#tb 0: 1/25 +#tb 0: 628/3675 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 176x128 diff --git a/tests/ref/fate/cdxl-pal8 b/tests/ref/fate/cdxl-pal8 index d8fb6fd622..71e44bf5df 100644 --- a/tests/ref/fate/cdxl-pal8 +++ b/tests/ref/fate/cdxl-pal8 @@ -1,4 +1,4 @@ -#tb 0: 1/25 +#tb 0: 1/15 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 176x128 diff --git a/tests/ref/fate/cdxl-pal8-small b/tests/ref/fate/cdxl-pal8-small index 386619407b..34812382d1 100644 --- a/tests/ref/fate/cdxl-pal8-small +++ b/tests/ref/fate/cdxl-pal8-small @@ -1,4 +1,4 @@ -#tb 0: 1/25 +#tb 0: 1001/30000 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 128x80 -- cgit v1.2.3