avcodec/ffv1enc: avoid slices larger than 360x288 if no value is specified

This improves speed by providing more independent things for more CPUs

Michael Niedermayer committed 1 year ago

Commit 175cd4c1 parent 1b04fb32 files · +13 −9Browse files

Unified · Split

2 files

libavcodec/ffv1enc.c +5 −1
tests/ref/fate/matroska-mastering-display-metadata +8 −8

                 if (  ff_need_new_slices(avctx->width , s->num_h_slices, s->chroma_h_shift)
                     ||ff_need_new_slices(avctx->height, s->num_v_slices, s->chroma_v_shift))
                     continue;
-            if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES || !avctx->slices)
+            if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES)
+                return 0;
+            if (maxw*maxh > 360*288)
+                continue;
+            if (!avctx->slices)
                 return 0;
         }
     }

tests/ref/fate/matroska-mastering-display-metadata+8−8

@@ -1,7 +1,7 @@
1	ad5e3c4e338599c81ef7d0f9ae25f871 *tests/data/fate/matroska-mastering-display-metadata.matroska	1	c1e5e2ecf433cf05af8556debc7d4d0b *tests/data/fate/matroska-mastering-display-metadata.matroska
2	1669589 tests/data/fate/matroska-mastering-display-metadata.matroska	2	1669773 tests/data/fate/matroska-mastering-display-metadata.matroska
3	#extradata 0: 4, 0x040901a3	3	#extradata 0: 4, 0x040901a3
4	#extradata 3: 200, 0x506463a8	4	#extradata 3: 202, 0xfce96279
5	#tb 0: 1/1000	5	#tb 0: 1/1000
6	#media_type 0: video	6	#media_type 0: video
7	#codec_id 0: prores	7	#codec_id 0: prores
@@ -24,23 +24,23 @@ ad5e3c4e338599c81ef7d0f9ae25f871 *tests/data/fate/matroska-mastering-display-met · 16 unmodified lines
24	#sar 3: 1/1	24	#sar 3: 1/1
25	0, 0, 0, 16, 57008, 0x43416399	25	0, 0, 0, 16, 57008, 0x43416399
26	1, 0, 0, 16, 2403, 0xaa818522	26	1, 0, 0, 16, 2403, 0xaa818522
27	3, 0, 0, 16, 274117, 0xc439610f	27	3, 0, 0, 16, 274884, 0x775840e5
28	0, 17, 17, 16, 57248, 0xa06cd7b5	28	0, 17, 17, 16, 57248, 0xa06cd7b5
29	1, 17, 17, 16, 2403, 0xe1a991e5	29	1, 17, 17, 16, 2403, 0xe1a991e5
30	2, 17, 17, 16, 1602, 0x5d868171	30	2, 17, 17, 16, 1602, 0x5d868171
31	3, 17, 17, 16, 273691, 0x5a3b88a5, F=0x0	31	3, 17, 17, 16, 273716, 0xa41fc5e3, F=0x0
32	0, 33, 33, 16, 57200, 0x5623da10	32	0, 33, 33, 16, 57200, 0x5623da10
33	1, 33, 33, 16, 2400, 0x6650907f	33	1, 33, 33, 16, 2400, 0x6650907f
34	2, 33, 33, 16, 1600, 0xa90f0044	34	2, 33, 33, 16, 1600, 0xa90f0044
35	3, 33, 33, 16, 272987, 0x48c443e7, F=0x0	35	3, 33, 33, 16, 272838, 0x3c308d03, F=0x0
36	0, 50, 50, 16, 57152, 0x52d89d3f	36	0, 50, 50, 16, 57152, 0x52d89d3f
37	1, 50, 50, 16, 2403, 0x43398a08	37	1, 50, 50, 16, 2403, 0x43398a08
38	2, 50, 50, 16, 1602, 0x3a350084	38	2, 50, 50, 16, 1602, 0x3a350084
39	3, 50, 50, 16, 271465, 0x251b9cbe, F=0x0	39	3, 50, 50, 16, 271251, 0xe802cc77, F=0x0
40	0, 67, 67, 16, 56960, 0x431d5189	40	0, 67, 67, 16, 56960, 0x431d5189
41	1, 67, 67, 16, 2403, 0x61cd96cb	41	1, 67, 67, 16, 2403, 0x61cd96cb
42	2, 67, 67, 16, 1602, 0xd74800c6	42	2, 67, 67, 16, 1602, 0xd74800c6
43	3, 67, 67, 16, 270800, 0x8fb2e217, F=0x0	43	3, 67, 67, 16, 270553, 0x36d83705, F=0x0
44	[STREAM]	44	[STREAM]
45	index=0	45	index=0
46	codec_name=prores	46	codec_name=prores

avcodec/ffv1enc: avoid slices larger than 360x288 if no value is specified

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code