This improves speed by providing more independent things for more CPUs
Unified · Split
| @@ -581,7 +581,11 @@ int ff_ffv1_encode_determine_slices(AVCodecContext *avctx) · 580 unmodified lines | ||
| 581 | 581 | if ( ff_need_new_slices(avctx->width , s->num_h_slices, s->chroma_h_shift) |
| 582 | 582 | ||ff_need_new_slices(avctx->height, s->num_v_slices, s->chroma_v_shift)) |
| 583 | 583 | continue; |
| 584 | − if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES || !avctx->slices) | |
| 584 | + if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= MAX_SLICES) | |
| 585 | + return 0; | |
| 586 | + if (maxw*maxh > 360*288) | |
| 587 | + continue; | |
| 588 | + if (!avctx->slices) | |
| 585 | 589 | return 0; |
| 586 | 590 | } |
| 587 | 591 | } |
| @@ -1,7 +1,7 @@ | ||
| 1 | −ad5e3c4e338599c81ef7d0f9ae25f871 *tests/data/fate/matroska-mastering-display-metadata.matroska | |
| 2 | −1669589 tests/data/fate/matroska-mastering-display-metadata.matroska | |
| 1 | +c1e5e2ecf433cf05af8556debc7d4d0b *tests/data/fate/matroska-mastering-display-metadata.matroska | |
| 2 | +1669773 tests/data/fate/matroska-mastering-display-metadata.matroska | |
| 3 | 3 | #extradata 0: 4, 0x040901a3 |
| 4 | −#extradata 3: 200, 0x506463a8 | |
| 4 | +#extradata 3: 202, 0xfce96279 | |
| 5 | 5 | #tb 0: 1/1000 |
| 6 | 6 | #media_type 0: video |
| 7 | 7 | #codec_id 0: prores |
| @@ -24,23 +24,23 @@ ad5e3c4e338599c81ef7d0f9ae25f871 *tests/data/fate/matroska-mastering-display-met · 16 unmodified lines | ||
| 24 | 24 | #sar 3: 1/1 |
| 25 | 25 | 0, 0, 0, 16, 57008, 0x43416399 |
| 26 | 26 | 1, 0, 0, 16, 2403, 0xaa818522 |
| 27 | −3, 0, 0, 16, 274117, 0xc439610f | |
| 27 | +3, 0, 0, 16, 274884, 0x775840e5 | |
| 28 | 28 | 0, 17, 17, 16, 57248, 0xa06cd7b5 |
| 29 | 29 | 1, 17, 17, 16, 2403, 0xe1a991e5 |
| 30 | 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 | 32 | 0, 33, 33, 16, 57200, 0x5623da10 |
| 33 | 33 | 1, 33, 33, 16, 2400, 0x6650907f |
| 34 | 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 | 36 | 0, 50, 50, 16, 57152, 0x52d89d3f |
| 37 | 37 | 1, 50, 50, 16, 2403, 0x43398a08 |
| 38 | 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 | 40 | 0, 67, 67, 16, 56960, 0x431d5189 |
| 41 | 41 | 1, 67, 67, 16, 2403, 0x61cd96cb |
| 42 | 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 | 44 | [STREAM] |
| 45 | 45 | index=0 |
| 46 | 46 | codec_name=prores |