History

lavc/mpeg4videodec: do not invent a framerate from guessed numbers

Improves timestamps for fate-m4v*

Anton Khirnov committed 3 years ago

Commit cdfd15f1 parent 4a376f43 files · +43 −45Browse files

Unified · Split

3 files
  1. libavcodec/mpeg4videodec.c +0 −3
  2. tests/ref/fate/m4v +42 −42
  3. tests/ref/fate/m4v-cfr +1 −0
libavcodec/mpeg4videodec.c+0−3
@@ -3141,9 +3141,6 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb, · 3140 unmodified lines
31413141
31423142 av_log(s->avctx, AV_LOG_WARNING,
31433143 "time_increment_bits set to %d bits, based on bitstream analysis\n", ctx->time_increment_bits);
3144− if (s->avctx->framerate.num && 4*s->avctx->framerate.num < 1<<ctx->time_increment_bits) {
3145− s->avctx->framerate.num = 1<<ctx->time_increment_bits;
3146− }
31473144 }
31483145
31493146 if (IS_3IV1)
tests/ref/fate/m4v+42−42
@@ -1,47 +1,47 @@
1−#tb 0: 1/60
1+#tb 0: 1/5
22 #media_type 0: video
33 #codec_id 0: rawvideo
44 #dimensions 0: 320x240
55 #sar 0: 1/1
66 0, 0, 0, 1, 115200, 0x7262156b
7−0, 11, 11, 1, 115200, 0xa6aebc2f
8−0, 22, 22, 1, 115200, 0x9c7beba1
9−0, 33, 33, 1, 115200, 0x556037a2
10−0, 44, 44, 1, 115200, 0x532e3a23
11−0, 60, 60, 1, 115200, 0x110511f4
12−0, 71, 71, 1, 115200, 0xb7f929a4
13−0, 82, 82, 1, 115200, 0xdab9f3c2
14−0, 93, 93, 1, 115200, 0x441413dd
15−0, 104, 104, 1, 115200, 0x01163f33
16−0, 120, 120, 1, 115200, 0x47720c78
17−0, 131, 131, 1, 115200, 0x07c21356
18−0, 142, 142, 1, 115200, 0x085d4291
19−0, 153, 153, 1, 115200, 0xf6db074c
20−0, 164, 164, 1, 115200, 0x95093e75
21−0, 180, 180, 1, 115200, 0x5f8118ef
22−0, 191, 191, 1, 115200, 0x2b4de34a
23−0, 202, 202, 1, 115200, 0x0a731857
24−0, 213, 213, 1, 115200, 0xd75ef3be
25−0, 224, 224, 1, 115200, 0x321cf5a9
26−0, 240, 240, 1, 115200, 0x3eb222fd
27−0, 251, 251, 1, 115200, 0xc7d92f3e
28−0, 262, 262, 1, 115200, 0x6fda0366
29−0, 273, 273, 1, 115200, 0x6bb61b03
30−0, 284, 284, 1, 115200, 0x5f367ef8
31−0, 300, 300, 1, 115200, 0x237d0c77
32−0, 311, 311, 1, 115200, 0xafa813ef
33−0, 322, 322, 1, 115200, 0x39263ef4
34−0, 333, 333, 1, 115200, 0x47c70441
35−0, 344, 344, 1, 115200, 0xd43fffb0
36−0, 360, 360, 1, 115200, 0x75696afb
37−0, 371, 371, 1, 115200, 0xb0f117a3
38−0, 382, 382, 1, 115200, 0x002f42f0
39−0, 393, 393, 1, 115200, 0xa192487e
40−0, 404, 404, 1, 115200, 0x19a7072e
41−0, 420, 420, 1, 115200, 0xc500669c
42−0, 431, 431, 1, 115200, 0xe4636ba9
43−0, 442, 442, 1, 115200, 0xdf3d5d86
44−0, 453, 453, 1, 115200, 0xf30825d5
45−0, 464, 464, 1, 115200, 0xe3c944a1
46−0, 480, 480, 1, 115200, 0x8fec4420
47−0, 491, 491, 1, 115200, 0x9381fdab
7+0, 1, 1, 1, 115200, 0xa6aebc2f
8+0, 2, 2, 1, 115200, 0x9c7beba1
9+0, 3, 3, 1, 115200, 0x556037a2
10+0, 4, 4, 1, 115200, 0x532e3a23
11+0, 5, 5, 1, 115200, 0x110511f4
12+0, 6, 6, 1, 115200, 0xb7f929a4
13+0, 7, 7, 1, 115200, 0xdab9f3c2
14+0, 8, 8, 1, 115200, 0x441413dd
15+0, 9, 9, 1, 115200, 0x01163f33
16+0, 10, 10, 1, 115200, 0x47720c78
17+0, 11, 11, 1, 115200, 0x07c21356
18+0, 12, 12, 1, 115200, 0x085d4291
19+0, 13, 13, 1, 115200, 0xf6db074c
20+0, 14, 14, 1, 115200, 0x95093e75
21+0, 15, 15, 1, 115200, 0x5f8118ef
22+0, 16, 16, 1, 115200, 0x2b4de34a
23+0, 17, 17, 1, 115200, 0x0a731857
24+0, 18, 18, 1, 115200, 0xd75ef3be
25+0, 19, 19, 1, 115200, 0x321cf5a9
26+0, 20, 20, 1, 115200, 0x3eb222fd
27+0, 21, 21, 1, 115200, 0xc7d92f3e
28+0, 22, 22, 1, 115200, 0x6fda0366
29+0, 23, 23, 1, 115200, 0x6bb61b03
30+0, 24, 24, 1, 115200, 0x5f367ef8
31+0, 25, 25, 1, 115200, 0x237d0c77
32+0, 26, 26, 1, 115200, 0xafa813ef
33+0, 27, 27, 1, 115200, 0x39263ef4
34+0, 28, 28, 1, 115200, 0x47c70441
35+0, 29, 29, 1, 115200, 0xd43fffb0
36+0, 30, 30, 1, 115200, 0x75696afb
37+0, 31, 31, 1, 115200, 0xb0f117a3
38+0, 32, 32, 1, 115200, 0x002f42f0
39+0, 33, 33, 1, 115200, 0xa192487e
40+0, 34, 34, 1, 115200, 0x19a7072e
41+0, 35, 35, 1, 115200, 0xc500669c
42+0, 36, 36, 1, 115200, 0xe4636ba9
43+0, 37, 37, 1, 115200, 0xdf3d5d86
44+0, 38, 38, 1, 115200, 0xf30825d5
45+0, 39, 39, 1, 115200, 0xe3c944a1
46+0, 40, 40, 1, 115200, 0x8fec4420
47+0, 41, 41, 1, 115200, 0x9381fdab
tests/ref/fate/m4v-cfr+1−0
@@ -44,3 +44,4 @@ · 43 unmodified lines
4444 0, 38, 38, 1, 115200, 0xf30825d5
4545 0, 39, 39, 1, 115200, 0xe3c944a1
4646 0, 40, 40, 1, 115200, 0x8fec4420
47+0, 41, 41, 1, 115200, 0x9381fdab

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t