History

swscale/input: parametrize ff_sws_init_input_funcs() pointers

Following the precedent set by ff_sws_init_output_funcs().

Niklas Haas committed 2 years ago

Commit 73b33441 parent 20b350b3 files · +206 −193Browse files

Unified · Split

3 files
  1. libswscale/input.c +197 −191
  2. libswscale/swscale.c +2 −1
  3. libswscale/swscale_internal.h +7 −1
libswscale/input.c+197−191
@@ -1285,86 +1285,92 @@ static void rgbaf16##endian_name##ToA_c(uint8_t *_dst, const uint8_t *_src, cons · 1284 unmodified lines
12851285 rgbaf16_funcs_endian(le, 0)
12861286 rgbaf16_funcs_endian(be, 1)
12871287
1288−av_cold void ff_sws_init_input_funcs(SwsContext *c)
1288+av_cold void ff_sws_init_input_funcs(SwsContext *c,
1289+ planar1_YV12_fn *lumToYV12,
1290+ planar1_YV12_fn *alpToYV12,
1291+ planar2_YV12_fn *chrToYV12,
1292+ planarX_YV12_fn *readLumPlanar,
1293+ planarX_YV12_fn *readAlpPlanar,
1294+ planarX2_YV12_fn *readChrPlanar)
12891295 {
12901296 enum AVPixelFormat srcFormat = c->srcFormat;
12911297
1292− c->chrToYV12 = NULL;
1298+ *chrToYV12 = NULL;
12931299 switch (srcFormat) {
12941300 case AV_PIX_FMT_YUYV422:
1295− c->chrToYV12 = yuy2ToUV_c;
1301+ *chrToYV12 = yuy2ToUV_c;
12961302 break;
12971303 case AV_PIX_FMT_YVYU422:
1298− c->chrToYV12 = yvy2ToUV_c;
1304+ *chrToYV12 = yvy2ToUV_c;
12991305 break;
13001306 case AV_PIX_FMT_UYVY422:
1301− c->chrToYV12 = uyvyToUV_c;
1307+ *chrToYV12 = uyvyToUV_c;
13021308 break;
13031309 case AV_PIX_FMT_NV12:
13041310 case AV_PIX_FMT_NV16:
13051311 case AV_PIX_FMT_NV24:
1306− c->chrToYV12 = nv12ToUV_c;
1312+ *chrToYV12 = nv12ToUV_c;
13071313 break;
13081314 case AV_PIX_FMT_NV21:
13091315 case AV_PIX_FMT_NV42:
1310− c->chrToYV12 = nv21ToUV_c;
1316+ *chrToYV12 = nv21ToUV_c;
13111317 break;
13121318 case AV_PIX_FMT_RGB8:
13131319 case AV_PIX_FMT_BGR8:
13141320 case AV_PIX_FMT_PAL8:
13151321 case AV_PIX_FMT_BGR4_BYTE:
13161322 case AV_PIX_FMT_RGB4_BYTE:
1317− c->chrToYV12 = palToUV_c;
1323+ *chrToYV12 = palToUV_c;
13181324 break;
13191325 case AV_PIX_FMT_GBRP9LE:
1320− c->readChrPlanar = planar_rgb9le_to_uv;
1326+ *readChrPlanar = planar_rgb9le_to_uv;
13211327 break;
13221328 case AV_PIX_FMT_GBRAP10LE:
13231329 case AV_PIX_FMT_GBRP10LE:
1324− c->readChrPlanar = planar_rgb10le_to_uv;
1330+ *readChrPlanar = planar_rgb10le_to_uv;
13251331 break;
13261332 case AV_PIX_FMT_GBRAP12LE:
13271333 case AV_PIX_FMT_GBRP12LE:
1328− c->readChrPlanar = planar_rgb12le_to_uv;
1334+ *readChrPlanar = planar_rgb12le_to_uv;
13291335 break;
13301336 case AV_PIX_FMT_GBRAP14LE:
13311337 case AV_PIX_FMT_GBRP14LE:
1332− c->readChrPlanar = planar_rgb14le_to_uv;
1338+ *readChrPlanar = planar_rgb14le_to_uv;
13331339 break;
13341340 case AV_PIX_FMT_GBRAP16LE:
13351341 case AV_PIX_FMT_GBRP16LE:
1336− c->readChrPlanar = planar_rgb16le_to_uv;
1342+ *readChrPlanar = planar_rgb16le_to_uv;
13371343 break;
13381344 case AV_PIX_FMT_GBRAPF32LE:
13391345 case AV_PIX_FMT_GBRPF32LE:
1340− c->readChrPlanar = planar_rgbf32le_to_uv;
1346+ *readChrPlanar = planar_rgbf32le_to_uv;
13411347 break;
13421348 case AV_PIX_FMT_GBRP9BE:
1343− c->readChrPlanar = planar_rgb9be_to_uv;
1349+ *readChrPlanar = planar_rgb9be_to_uv;
13441350 break;
13451351 case AV_PIX_FMT_GBRAP10BE:
13461352 case AV_PIX_FMT_GBRP10BE:
1347− c->readChrPlanar = planar_rgb10be_to_uv;
1353+ *readChrPlanar = planar_rgb10be_to_uv;
13481354 break;
13491355 case AV_PIX_FMT_GBRAP12BE:
13501356 case AV_PIX_FMT_GBRP12BE:
1351− c->readChrPlanar = planar_rgb12be_to_uv;
1357+ *readChrPlanar = planar_rgb12be_to_uv;
13521358 break;
13531359 case AV_PIX_FMT_GBRAP14BE:
13541360 case AV_PIX_FMT_GBRP14BE:
1355− c->readChrPlanar = planar_rgb14be_to_uv;
1361+ *readChrPlanar = planar_rgb14be_to_uv;
13561362 break;
13571363 case AV_PIX_FMT_GBRAP16BE:
13581364 case AV_PIX_FMT_GBRP16BE:
1359− c->readChrPlanar = planar_rgb16be_to_uv;
1365+ *readChrPlanar = planar_rgb16be_to_uv;
13601366 break;
13611367 case AV_PIX_FMT_GBRAPF32BE:
13621368 case AV_PIX_FMT_GBRPF32BE:
1363− c->readChrPlanar = planar_rgbf32be_to_uv;
1369+ *readChrPlanar = planar_rgbf32be_to_uv;
13641370 break;
13651371 case AV_PIX_FMT_GBRAP:
13661372 case AV_PIX_FMT_GBRP:
1367− c->readChrPlanar = planar_rgb_to_uv;
1373+ *readChrPlanar = planar_rgb_to_uv;
13681374 break;
13691375 #if HAVE_BIGENDIAN
13701376 case AV_PIX_FMT_YUV420P9LE:
@@ -1396,7 +1402,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) · 25 unmodified lines
13961402 case AV_PIX_FMT_YUVA420P16LE:
13971403 case AV_PIX_FMT_YUVA422P16LE:
13981404 case AV_PIX_FMT_YUVA444P16LE:
1399− c->chrToYV12 = bswap16UV_c;
1405+ *chrToYV12 = bswap16UV_c;
14001406 break;
14011407 #else
14021408 case AV_PIX_FMT_YUV420P9BE:
@@ -1428,314 +1434,314 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) · 25 unmodified lines
14281434 case AV_PIX_FMT_YUVA420P16BE:
14291435 case AV_PIX_FMT_YUVA422P16BE:
14301436 case AV_PIX_FMT_YUVA444P16BE:
1431− c->chrToYV12 = bswap16UV_c;
1437+ *chrToYV12 = bswap16UV_c;
14321438 break;
14331439 #endif
14341440 case AV_PIX_FMT_VUYA:
14351441 case AV_PIX_FMT_VUYX:
1436− c->chrToYV12 = read_vuyx_UV_c;
1442+ *chrToYV12 = read_vuyx_UV_c;
14371443 break;
14381444 case AV_PIX_FMT_XV30LE:
1439− c->chrToYV12 = read_xv30le_UV_c;
1445+ *chrToYV12 = read_xv30le_UV_c;
14401446 break;
14411447 case AV_PIX_FMT_AYUV64LE:
1442− c->chrToYV12 = read_ayuv64le_UV_c;
1448+ *chrToYV12 = read_ayuv64le_UV_c;
14431449 break;
14441450 case AV_PIX_FMT_XV36LE:
1445− c->chrToYV12 = read_xv36le_UV_c;
1451+ *chrToYV12 = read_xv36le_UV_c;
14461452 break;
14471453 case AV_PIX_FMT_P010LE:
14481454 case AV_PIX_FMT_P210LE:
14491455 case AV_PIX_FMT_P410LE:
1450− c->chrToYV12 = p010LEToUV_c;
1456+ *chrToYV12 = p010LEToUV_c;
14511457 break;
14521458 case AV_PIX_FMT_P010BE:
14531459 case AV_PIX_FMT_P210BE:
14541460 case AV_PIX_FMT_P410BE:
1455− c->chrToYV12 = p010BEToUV_c;
1461+ *chrToYV12 = p010BEToUV_c;
14561462 break;
14571463 case AV_PIX_FMT_P012LE:
14581464 case AV_PIX_FMT_P212LE:
14591465 case AV_PIX_FMT_P412LE:
1460− c->chrToYV12 = p012LEToUV_c;
1466+ *chrToYV12 = p012LEToUV_c;
14611467 break;
14621468 case AV_PIX_FMT_P012BE:
14631469 case AV_PIX_FMT_P212BE:
14641470 case AV_PIX_FMT_P412BE:
1465− c->chrToYV12 = p012BEToUV_c;
1471+ *chrToYV12 = p012BEToUV_c;
14661472 break;
14671473 case AV_PIX_FMT_P016LE:
14681474 case AV_PIX_FMT_P216LE:
14691475 case AV_PIX_FMT_P416LE:
1470− c->chrToYV12 = p016LEToUV_c;
1476+ *chrToYV12 = p016LEToUV_c;
14711477 break;
14721478 case AV_PIX_FMT_P016BE:
14731479 case AV_PIX_FMT_P216BE:
14741480 case AV_PIX_FMT_P416BE:
1475− c->chrToYV12 = p016BEToUV_c;
1481+ *chrToYV12 = p016BEToUV_c;
14761482 break;
14771483 case AV_PIX_FMT_Y210LE:
1478− c->chrToYV12 = y210le_UV_c;
1484+ *chrToYV12 = y210le_UV_c;
14791485 break;
14801486 case AV_PIX_FMT_Y212LE:
1481− c->chrToYV12 = y212le_UV_c;
1487+ *chrToYV12 = y212le_UV_c;
14821488 break;
14831489 }
14841490 if (c->chrSrcHSubSample) {
14851491 switch (srcFormat) {
14861492 case AV_PIX_FMT_RGBA64BE:
1487− c->chrToYV12 = rgb64BEToUV_half_c;
1493+ *chrToYV12 = rgb64BEToUV_half_c;
14881494 break;
14891495 case AV_PIX_FMT_RGBA64LE:
1490− c->chrToYV12 = rgb64LEToUV_half_c;
1496+ *chrToYV12 = rgb64LEToUV_half_c;
14911497 break;
14921498 case AV_PIX_FMT_BGRA64BE:
1493− c->chrToYV12 = bgr64BEToUV_half_c;
1499+ *chrToYV12 = bgr64BEToUV_half_c;
14941500 break;
14951501 case AV_PIX_FMT_BGRA64LE:
1496− c->chrToYV12 = bgr64LEToUV_half_c;
1502+ *chrToYV12 = bgr64LEToUV_half_c;
14971503 break;
14981504 case AV_PIX_FMT_RGB48BE:
1499− c->chrToYV12 = rgb48BEToUV_half_c;
1505+ *chrToYV12 = rgb48BEToUV_half_c;
15001506 break;
15011507 case AV_PIX_FMT_RGB48LE:
1502− c->chrToYV12 = rgb48LEToUV_half_c;
1508+ *chrToYV12 = rgb48LEToUV_half_c;
15031509 break;
15041510 case AV_PIX_FMT_BGR48BE:
1505− c->chrToYV12 = bgr48BEToUV_half_c;
1511+ *chrToYV12 = bgr48BEToUV_half_c;
15061512 break;
15071513 case AV_PIX_FMT_BGR48LE:
1508− c->chrToYV12 = bgr48LEToUV_half_c;
1514+ *chrToYV12 = bgr48LEToUV_half_c;
15091515 break;
15101516 case AV_PIX_FMT_RGB32:
1511− c->chrToYV12 = bgr32ToUV_half_c;
1517+ *chrToYV12 = bgr32ToUV_half_c;
15121518 break;
15131519 case AV_PIX_FMT_RGB32_1:
1514− c->chrToYV12 = bgr321ToUV_half_c;
1520+ *chrToYV12 = bgr321ToUV_half_c;
15151521 break;
15161522 case AV_PIX_FMT_BGR24:
1517− c->chrToYV12 = bgr24ToUV_half_c;
1523+ *chrToYV12 = bgr24ToUV_half_c;
15181524 break;
15191525 case AV_PIX_FMT_BGR565LE:
1520− c->chrToYV12 = bgr16leToUV_half_c;
1526+ *chrToYV12 = bgr16leToUV_half_c;
15211527 break;
15221528 case AV_PIX_FMT_BGR565BE:
1523− c->chrToYV12 = bgr16beToUV_half_c;
1529+ *chrToYV12 = bgr16beToUV_half_c;
15241530 break;
15251531 case AV_PIX_FMT_BGR555LE:
1526− c->chrToYV12 = bgr15leToUV_half_c;
1532+ *chrToYV12 = bgr15leToUV_half_c;
15271533 break;
15281534 case AV_PIX_FMT_BGR555BE:
1529− c->chrToYV12 = bgr15beToUV_half_c;
1535+ *chrToYV12 = bgr15beToUV_half_c;
15301536 break;
15311537 case AV_PIX_FMT_GBRAP:
15321538 case AV_PIX_FMT_GBRP:
1533− c->chrToYV12 = gbr24pToUV_half_c;
1539+ *chrToYV12 = gbr24pToUV_half_c;
15341540 break;
15351541 case AV_PIX_FMT_BGR444LE:
1536− c->chrToYV12 = bgr12leToUV_half_c;
1542+ *chrToYV12 = bgr12leToUV_half_c;
15371543 break;
15381544 case AV_PIX_FMT_BGR444BE:
1539− c->chrToYV12 = bgr12beToUV_half_c;
1545+ *chrToYV12 = bgr12beToUV_half_c;
15401546 break;
15411547 case AV_PIX_FMT_BGR32:
1542− c->chrToYV12 = rgb32ToUV_half_c;
1548+ *chrToYV12 = rgb32ToUV_half_c;
15431549 break;
15441550 case AV_PIX_FMT_BGR32_1:
1545− c->chrToYV12 = rgb321ToUV_half_c;
1551+ *chrToYV12 = rgb321ToUV_half_c;
15461552 break;
15471553 case AV_PIX_FMT_RGB24:
1548− c->chrToYV12 = rgb24ToUV_half_c;
1554+ *chrToYV12 = rgb24ToUV_half_c;
15491555 break;
15501556 case AV_PIX_FMT_RGB565LE:
1551− c->chrToYV12 = rgb16leToUV_half_c;
1557+ *chrToYV12 = rgb16leToUV_half_c;
15521558 break;
15531559 case AV_PIX_FMT_RGB565BE:
1554− c->chrToYV12 = rgb16beToUV_half_c;
1560+ *chrToYV12 = rgb16beToUV_half_c;
15551561 break;
15561562 case AV_PIX_FMT_RGB555LE:
1557− c->chrToYV12 = rgb15leToUV_half_c;
1563+ *chrToYV12 = rgb15leToUV_half_c;
15581564 break;
15591565 case AV_PIX_FMT_RGB555BE:
1560− c->chrToYV12 = rgb15beToUV_half_c;
1566+ *chrToYV12 = rgb15beToUV_half_c;
15611567 break;
15621568 case AV_PIX_FMT_RGB444LE:
1563− c->chrToYV12 = rgb12leToUV_half_c;
1569+ *chrToYV12 = rgb12leToUV_half_c;
15641570 break;
15651571 case AV_PIX_FMT_RGB444BE:
1566− c->chrToYV12 = rgb12beToUV_half_c;
1572+ *chrToYV12 = rgb12beToUV_half_c;
15671573 break;
15681574 case AV_PIX_FMT_X2RGB10LE:
1569− c->chrToYV12 = rgb30leToUV_half_c;
1575+ *chrToYV12 = rgb30leToUV_half_c;
15701576 break;
15711577 case AV_PIX_FMT_X2BGR10LE:
1572− c->chrToYV12 = bgr30leToUV_half_c;
1578+ *chrToYV12 = bgr30leToUV_half_c;
15731579 break;
15741580 case AV_PIX_FMT_RGBAF16BE:
1575− c->chrToYV12 = rgbaf16beToUV_half_c;
1581+ *chrToYV12 = rgbaf16beToUV_half_c;
15761582 break;
15771583 case AV_PIX_FMT_RGBAF16LE:
1578− c->chrToYV12 = rgbaf16leToUV_half_c;
1584+ *chrToYV12 = rgbaf16leToUV_half_c;
15791585 break;
15801586 }
15811587 } else {
15821588 switch (srcFormat) {
15831589 case AV_PIX_FMT_RGBA64BE:
1584− c->chrToYV12 = rgb64BEToUV_c;
1590+ *chrToYV12 = rgb64BEToUV_c;
15851591 break;
15861592 case AV_PIX_FMT_RGBA64LE:
1587− c->chrToYV12 = rgb64LEToUV_c;
1593+ *chrToYV12 = rgb64LEToUV_c;
15881594 break;
15891595 case AV_PIX_FMT_BGRA64BE:
1590− c->chrToYV12 = bgr64BEToUV_c;
1596+ *chrToYV12 = bgr64BEToUV_c;
15911597 break;
15921598 case AV_PIX_FMT_BGRA64LE:
1593− c->chrToYV12 = bgr64LEToUV_c;
1599+ *chrToYV12 = bgr64LEToUV_c;
15941600 break;
15951601 case AV_PIX_FMT_RGB48BE:
1596− c->chrToYV12 = rgb48BEToUV_c;
1602+ *chrToYV12 = rgb48BEToUV_c;
15971603 break;
15981604 case AV_PIX_FMT_RGB48LE:
1599− c->chrToYV12 = rgb48LEToUV_c;
1605+ *chrToYV12 = rgb48LEToUV_c;
16001606 break;
16011607 case AV_PIX_FMT_BGR48BE:
1602− c->chrToYV12 = bgr48BEToUV_c;
1608+ *chrToYV12 = bgr48BEToUV_c;
16031609 break;
16041610 case AV_PIX_FMT_BGR48LE:
1605− c->chrToYV12 = bgr48LEToUV_c;
1611+ *chrToYV12 = bgr48LEToUV_c;
16061612 break;
16071613 case AV_PIX_FMT_RGB32:
1608− c->chrToYV12 = bgr32ToUV_c;
1614+ *chrToYV12 = bgr32ToUV_c;
16091615 break;
16101616 case AV_PIX_FMT_RGB32_1:
1611− c->chrToYV12 = bgr321ToUV_c;
1617+ *chrToYV12 = bgr321ToUV_c;
16121618 break;
16131619 case AV_PIX_FMT_BGR24:
1614− c->chrToYV12 = bgr24ToUV_c;
1620+ *chrToYV12 = bgr24ToUV_c;
16151621 break;
16161622 case AV_PIX_FMT_BGR565LE:
1617− c->chrToYV12 = bgr16leToUV_c;
1623+ *chrToYV12 = bgr16leToUV_c;
16181624 break;
16191625 case AV_PIX_FMT_BGR565BE:
1620− c->chrToYV12 = bgr16beToUV_c;
1626+ *chrToYV12 = bgr16beToUV_c;
16211627 break;
16221628 case AV_PIX_FMT_BGR555LE:
1623− c->chrToYV12 = bgr15leToUV_c;
1629+ *chrToYV12 = bgr15leToUV_c;
16241630 break;
16251631 case AV_PIX_FMT_BGR555BE:
1626− c->chrToYV12 = bgr15beToUV_c;
1632+ *chrToYV12 = bgr15beToUV_c;
16271633 break;
16281634 case AV_PIX_FMT_BGR444LE:
1629− c->chrToYV12 = bgr12leToUV_c;
1635+ *chrToYV12 = bgr12leToUV_c;
16301636 break;
16311637 case AV_PIX_FMT_BGR444BE:
1632− c->chrToYV12 = bgr12beToUV_c;
1638+ *chrToYV12 = bgr12beToUV_c;
16331639 break;
16341640 case AV_PIX_FMT_BGR32:
1635− c->chrToYV12 = rgb32ToUV_c;
1641+ *chrToYV12 = rgb32ToUV_c;
16361642 break;
16371643 case AV_PIX_FMT_BGR32_1:
1638− c->chrToYV12 = rgb321ToUV_c;
1644+ *chrToYV12 = rgb321ToUV_c;
16391645 break;
16401646 case AV_PIX_FMT_RGB24:
1641− c->chrToYV12 = rgb24ToUV_c;
1647+ *chrToYV12 = rgb24ToUV_c;
16421648 break;
16431649 case AV_PIX_FMT_RGB565LE:
1644− c->chrToYV12 = rgb16leToUV_c;
1650+ *chrToYV12 = rgb16leToUV_c;
16451651 break;
16461652 case AV_PIX_FMT_RGB565BE:
1647− c->chrToYV12 = rgb16beToUV_c;
1653+ *chrToYV12 = rgb16beToUV_c;
16481654 break;
16491655 case AV_PIX_FMT_RGB555LE:
1650− c->chrToYV12 = rgb15leToUV_c;
1656+ *chrToYV12 = rgb15leToUV_c;
16511657 break;
16521658 case AV_PIX_FMT_RGB555BE:
1653− c->chrToYV12 = rgb15beToUV_c;
1659+ *chrToYV12 = rgb15beToUV_c;
16541660 break;
16551661 case AV_PIX_FMT_RGB444LE:
1656− c->chrToYV12 = rgb12leToUV_c;
1662+ *chrToYV12 = rgb12leToUV_c;
16571663 break;
16581664 case AV_PIX_FMT_RGB444BE:
1659− c->chrToYV12 = rgb12beToUV_c;
1665+ *chrToYV12 = rgb12beToUV_c;
16601666 break;
16611667 case AV_PIX_FMT_X2RGB10LE:
1662− c->chrToYV12 = rgb30leToUV_c;
1668+ *chrToYV12 = rgb30leToUV_c;
16631669 break;
16641670 case AV_PIX_FMT_X2BGR10LE:
1665− c->chrToYV12 = bgr30leToUV_c;
1671+ *chrToYV12 = bgr30leToUV_c;
16661672 break;
16671673 case AV_PIX_FMT_RGBAF16BE:
1668− c->chrToYV12 = rgbaf16beToUV_c;
1674+ *chrToYV12 = rgbaf16beToUV_c;
16691675 break;
16701676 case AV_PIX_FMT_RGBAF16LE:
1671− c->chrToYV12 = rgbaf16leToUV_c;
1677+ *chrToYV12 = rgbaf16leToUV_c;
16721678 break;
16731679 }
16741680 }
16751681
1676− c->lumToYV12 = NULL;
1677− c->alpToYV12 = NULL;
1682+ *lumToYV12 = NULL;
1683+ *alpToYV12 = NULL;
16781684 switch (srcFormat) {
16791685 case AV_PIX_FMT_GBRP9LE:
1680− c->readLumPlanar = planar_rgb9le_to_y;
1686+ *readLumPlanar = planar_rgb9le_to_y;
16811687 break;
16821688 case AV_PIX_FMT_GBRAP10LE:
1683− c->readAlpPlanar = planar_rgb10le_to_a;
1689+ *readAlpPlanar = planar_rgb10le_to_a;
16841690 case AV_PIX_FMT_GBRP10LE:
1685− c->readLumPlanar = planar_rgb10le_to_y;
1691+ *readLumPlanar = planar_rgb10le_to_y;
16861692 break;
16871693 case AV_PIX_FMT_GBRAP12LE:
1688− c->readAlpPlanar = planar_rgb12le_to_a;
1694+ *readAlpPlanar = planar_rgb12le_to_a;
16891695 case AV_PIX_FMT_GBRP12LE:
1690− c->readLumPlanar = planar_rgb12le_to_y;
1696+ *readLumPlanar = planar_rgb12le_to_y;
16911697 break;
16921698 case AV_PIX_FMT_GBRAP14LE:
1693− c->readAlpPlanar = planar_rgb14le_to_a;
1699+ *readAlpPlanar = planar_rgb14le_to_a;
16941700 case AV_PIX_FMT_GBRP14LE:
1695− c->readLumPlanar = planar_rgb14le_to_y;
1701+ *readLumPlanar = planar_rgb14le_to_y;
16961702 break;
16971703 case AV_PIX_FMT_GBRAP16LE:
1698− c->readAlpPlanar = planar_rgb16le_to_a;
1704+ *readAlpPlanar = planar_rgb16le_to_a;
16991705 case AV_PIX_FMT_GBRP16LE:
1700− c->readLumPlanar = planar_rgb16le_to_y;
1706+ *readLumPlanar = planar_rgb16le_to_y;
17011707 break;
17021708 case AV_PIX_FMT_GBRAPF32LE:
1703− c->readAlpPlanar = planar_rgbf32le_to_a;
1709+ *readAlpPlanar = planar_rgbf32le_to_a;
17041710 case AV_PIX_FMT_GBRPF32LE:
1705− c->readLumPlanar = planar_rgbf32le_to_y;
1711+ *readLumPlanar = planar_rgbf32le_to_y;
17061712 break;
17071713 case AV_PIX_FMT_GBRP9BE:
1708− c->readLumPlanar = planar_rgb9be_to_y;
1714+ *readLumPlanar = planar_rgb9be_to_y;
17091715 break;
17101716 case AV_PIX_FMT_GBRAP10BE:
1711− c->readAlpPlanar = planar_rgb10be_to_a;
1717+ *readAlpPlanar = planar_rgb10be_to_a;
17121718 case AV_PIX_FMT_GBRP10BE:
1713− c->readLumPlanar = planar_rgb10be_to_y;
1719+ *readLumPlanar = planar_rgb10be_to_y;
17141720 break;
17151721 case AV_PIX_FMT_GBRAP12BE:
1716− c->readAlpPlanar = planar_rgb12be_to_a;
1722+ *readAlpPlanar = planar_rgb12be_to_a;
17171723 case AV_PIX_FMT_GBRP12BE:
1718− c->readLumPlanar = planar_rgb12be_to_y;
1724+ *readLumPlanar = planar_rgb12be_to_y;
17191725 break;
17201726 case AV_PIX_FMT_GBRAP14BE:
1721− c->readAlpPlanar = planar_rgb14be_to_a;
1727+ *readAlpPlanar = planar_rgb14be_to_a;
17221728 case AV_PIX_FMT_GBRP14BE:
1723− c->readLumPlanar = planar_rgb14be_to_y;
1729+ *readLumPlanar = planar_rgb14be_to_y;
17241730 break;
17251731 case AV_PIX_FMT_GBRAP16BE:
1726− c->readAlpPlanar = planar_rgb16be_to_a;
1732+ *readAlpPlanar = planar_rgb16be_to_a;
17271733 case AV_PIX_FMT_GBRP16BE:
1728− c->readLumPlanar = planar_rgb16be_to_y;
1734+ *readLumPlanar = planar_rgb16be_to_y;
17291735 break;
17301736 case AV_PIX_FMT_GBRAPF32BE:
1731− c->readAlpPlanar = planar_rgbf32be_to_a;
1737+ *readAlpPlanar = planar_rgbf32be_to_a;
17321738 case AV_PIX_FMT_GBRPF32BE:
1733− c->readLumPlanar = planar_rgbf32be_to_y;
1739+ *readLumPlanar = planar_rgbf32be_to_y;
17341740 break;
17351741 case AV_PIX_FMT_GBRAP:
1736− c->readAlpPlanar = planar_rgb_to_a;
1742+ *readAlpPlanar = planar_rgb_to_a;
17371743 case AV_PIX_FMT_GBRP:
1738− c->readLumPlanar = planar_rgb_to_y;
1744+ *readLumPlanar = planar_rgb_to_y;
17391745 break;
17401746 #if HAVE_BIGENDIAN
17411747 case AV_PIX_FMT_YUV420P9LE:
@@ -1765,7 +1771,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) · 23 unmodified lines
17651771 case AV_PIX_FMT_P016LE:
17661772 case AV_PIX_FMT_P216LE:
17671773 case AV_PIX_FMT_P416LE:
1768− c->lumToYV12 = bswap16Y_c;
1774+ *lumToYV12 = bswap16Y_c;
17691775 break;
17701776 case AV_PIX_FMT_YUVA420P9LE:
17711777 case AV_PIX_FMT_YUVA422P9LE:
@@ -1778,8 +1784,8 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) · 6 unmodified lines
17781784 case AV_PIX_FMT_YUVA420P16LE:
17791785 case AV_PIX_FMT_YUVA422P16LE:
17801786 case AV_PIX_FMT_YUVA444P16LE:
1781− c->lumToYV12 = bswap16Y_c;
1782− c->alpToYV12 = bswap16Y_c;
1787+ *lumToYV12 = bswap16Y_c;
1788+ *alpToYV12 = bswap16Y_c;
17831789 break;
17841790 #else
17851791 case AV_PIX_FMT_YUV420P9BE:
@@ -1809,7 +1815,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) · 23 unmodified lines
18091815 case AV_PIX_FMT_P016BE:
18101816 case AV_PIX_FMT_P216BE:
18111817 case AV_PIX_FMT_P416BE:
1812− c->lumToYV12 = bswap16Y_c;
1818+ *lumToYV12 = bswap16Y_c;
18131819 break;
18141820 case AV_PIX_FMT_YUVA420P9BE:
18151821 case AV_PIX_FMT_YUVA422P9BE:
@@ -1822,214 +1828,214 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) · 6 unmodified lines
18221828 case AV_PIX_FMT_YUVA420P16BE:
18231829 case AV_PIX_FMT_YUVA422P16BE:
18241830 case AV_PIX_FMT_YUVA444P16BE:
1825− c->lumToYV12 = bswap16Y_c;
1826− c->alpToYV12 = bswap16Y_c;
1831+ *lumToYV12 = bswap16Y_c;
1832+ *alpToYV12 = bswap16Y_c;
18271833 break;
18281834 #endif
18291835 case AV_PIX_FMT_YA16LE:
1830− c->lumToYV12 = read_ya16le_gray_c;
1836+ *lumToYV12 = read_ya16le_gray_c;
18311837 break;
18321838 case AV_PIX_FMT_YA16BE:
1833− c->lumToYV12 = read_ya16be_gray_c;
1839+ *lumToYV12 = read_ya16be_gray_c;
18341840 break;
18351841 case AV_PIX_FMT_VUYA:
18361842 case AV_PIX_FMT_VUYX:
1837− c->lumToYV12 = read_vuyx_Y_c;
1843+ *lumToYV12 = read_vuyx_Y_c;
18381844 break;
18391845 case AV_PIX_FMT_XV30LE:
1840− c->lumToYV12 = read_xv30le_Y_c;
1846+ *lumToYV12 = read_xv30le_Y_c;
18411847 break;
18421848 case AV_PIX_FMT_AYUV64LE:
1843− c->lumToYV12 = read_ayuv64le_Y_c;
1849+ *lumToYV12 = read_ayuv64le_Y_c;
18441850 break;
18451851 case AV_PIX_FMT_XV36LE:
1846− c->lumToYV12 = read_xv36le_Y_c;
1852+ *lumToYV12 = read_xv36le_Y_c;
18471853 break;
18481854 case AV_PIX_FMT_YUYV422:
18491855 case AV_PIX_FMT_YVYU422:
18501856 case AV_PIX_FMT_YA8:
1851− c->lumToYV12 = yuy2ToY_c;
1857+ *lumToYV12 = yuy2ToY_c;
18521858 break;
18531859 case AV_PIX_FMT_UYVY422:
1854− c->lumToYV12 = uyvyToY_c;
1860+ *lumToYV12 = uyvyToY_c;
18551861 break;
18561862 case AV_PIX_FMT_BGR24:
1857− c->lumToYV12 = bgr24ToY_c;
1863+ *lumToYV12 = bgr24ToY_c;
18581864 break;
18591865 case AV_PIX_FMT_BGR565LE:
1860− c->lumToYV12 = bgr16leToY_c;
1866+ *lumToYV12 = bgr16leToY_c;
18611867 break;
18621868 case AV_PIX_FMT_BGR565BE:
1863− c->lumToYV12 = bgr16beToY_c;
1869+ *lumToYV12 = bgr16beToY_c;
18641870 break;
18651871 case AV_PIX_FMT_BGR555LE:
1866− c->lumToYV12 = bgr15leToY_c;
1872+ *lumToYV12 = bgr15leToY_c;
18671873 break;
18681874 case AV_PIX_FMT_BGR555BE:
1869− c->lumToYV12 = bgr15beToY_c;
1875+ *lumToYV12 = bgr15beToY_c;
18701876 break;
18711877 case AV_PIX_FMT_BGR444LE:
1872− c->lumToYV12 = bgr12leToY_c;
1878+ *lumToYV12 = bgr12leToY_c;
18731879 break;
18741880 case AV_PIX_FMT_BGR444BE:
1875− c->lumToYV12 = bgr12beToY_c;
1881+ *lumToYV12 = bgr12beToY_c;
18761882 break;
18771883 case AV_PIX_FMT_RGB24:
1878− c->lumToYV12 = rgb24ToY_c;
1884+ *lumToYV12 = rgb24ToY_c;
18791885 break;
18801886 case AV_PIX_FMT_RGB565LE:
1881− c->lumToYV12 = rgb16leToY_c;
1887+ *lumToYV12 = rgb16leToY_c;
18821888 break;
18831889 case AV_PIX_FMT_RGB565BE:
1884− c->lumToYV12 = rgb16beToY_c;
1890+ *lumToYV12 = rgb16beToY_c;
18851891 break;
18861892 case AV_PIX_FMT_RGB555LE:
1887− c->lumToYV12 = rgb15leToY_c;
1893+ *lumToYV12 = rgb15leToY_c;
18881894 break;
18891895 case AV_PIX_FMT_RGB555BE:
1890− c->lumToYV12 = rgb15beToY_c;
1896+ *lumToYV12 = rgb15beToY_c;
18911897 break;
18921898 case AV_PIX_FMT_RGB444LE:
1893− c->lumToYV12 = rgb12leToY_c;
1899+ *lumToYV12 = rgb12leToY_c;
18941900 break;
18951901 case AV_PIX_FMT_RGB444BE:
1896− c->lumToYV12 = rgb12beToY_c;
1902+ *lumToYV12 = rgb12beToY_c;
18971903 break;
18981904 case AV_PIX_FMT_RGB8:
18991905 case AV_PIX_FMT_BGR8:
19001906 case AV_PIX_FMT_PAL8:
19011907 case AV_PIX_FMT_BGR4_BYTE:
19021908 case AV_PIX_FMT_RGB4_BYTE:
1903− c->lumToYV12 = palToY_c;
1909+ *lumToYV12 = palToY_c;
19041910 break;
19051911 case AV_PIX_FMT_MONOBLACK:
1906− c->lumToYV12 = monoblack2Y_c;
1912+ *lumToYV12 = monoblack2Y_c;
19071913 break;
19081914 case AV_PIX_FMT_MONOWHITE:
1909− c->lumToYV12 = monowhite2Y_c;
1915+ *lumToYV12 = monowhite2Y_c;
19101916 break;
19111917 case AV_PIX_FMT_RGB32:
1912− c->lumToYV12 = bgr32ToY_c;
1918+ *lumToYV12 = bgr32ToY_c;
19131919 break;
19141920 case AV_PIX_FMT_RGB32_1:
1915− c->lumToYV12 = bgr321ToY_c;
1921+ *lumToYV12 = bgr321ToY_c;
19161922 break;
19171923 case AV_PIX_FMT_BGR32:
1918− c->lumToYV12 = rgb32ToY_c;
1924+ *lumToYV12 = rgb32ToY_c;
19191925 break;
19201926 case AV_PIX_FMT_BGR32_1:
1921− c->lumToYV12 = rgb321ToY_c;
1927+ *lumToYV12 = rgb321ToY_c;
19221928 break;
19231929 case AV_PIX_FMT_RGB48BE:
1924− c->lumToYV12 = rgb48BEToY_c;
1930+ *lumToYV12 = rgb48BEToY_c;
19251931 break;
19261932 case AV_PIX_FMT_RGB48LE:
1927− c->lumToYV12 = rgb48LEToY_c;
1933+ *lumToYV12 = rgb48LEToY_c;
19281934 break;
19291935 case AV_PIX_FMT_BGR48BE:
1930− c->lumToYV12 = bgr48BEToY_c;
1936+ *lumToYV12 = bgr48BEToY_c;
19311937 break;
19321938 case AV_PIX_FMT_BGR48LE:
1933− c->lumToYV12 = bgr48LEToY_c;
1939+ *lumToYV12 = bgr48LEToY_c;
19341940 break;
19351941 case AV_PIX_FMT_RGBA64BE:
1936− c->lumToYV12 = rgb64BEToY_c;
1942+ *lumToYV12 = rgb64BEToY_c;
19371943 break;
19381944 case AV_PIX_FMT_RGBA64LE:
1939− c->lumToYV12 = rgb64LEToY_c;
1945+ *lumToYV12 = rgb64LEToY_c;
19401946 break;
19411947 case AV_PIX_FMT_BGRA64BE:
1942− c->lumToYV12 = bgr64BEToY_c;
1948+ *lumToYV12 = bgr64BEToY_c;
19431949 break;
19441950 case AV_PIX_FMT_BGRA64LE:
1945− c->lumToYV12 = bgr64LEToY_c;
1951+ *lumToYV12 = bgr64LEToY_c;
19461952 break;
19471953 case AV_PIX_FMT_P010LE:
19481954 case AV_PIX_FMT_P210LE:
19491955 case AV_PIX_FMT_P410LE:
1950− c->lumToYV12 = p010LEToY_c;
1956+ *lumToYV12 = p010LEToY_c;
19511957 break;
19521958 case AV_PIX_FMT_P010BE:
19531959 case AV_PIX_FMT_P210BE:
19541960 case AV_PIX_FMT_P410BE:
1955− c->lumToYV12 = p010BEToY_c;
1961+ *lumToYV12 = p010BEToY_c;
19561962 break;
19571963 case AV_PIX_FMT_P012LE:
19581964 case AV_PIX_FMT_P212LE:
19591965 case AV_PIX_FMT_P412LE:
1960− c->lumToYV12 = p012LEToY_c;
1966+ *lumToYV12 = p012LEToY_c;
19611967 break;
19621968 case AV_PIX_FMT_P012BE:
19631969 case AV_PIX_FMT_P212BE:
19641970 case AV_PIX_FMT_P412BE:
1965− c->lumToYV12 = p012BEToY_c;
1971+ *lumToYV12 = p012BEToY_c;
19661972 break;
19671973 case AV_PIX_FMT_GRAYF32LE:
1968− c->lumToYV12 = grayf32leToY16_c;
1974+ *lumToYV12 = grayf32leToY16_c;
19691975 break;
19701976 case AV_PIX_FMT_GRAYF32BE:
1971− c->lumToYV12 = grayf32beToY16_c;
1977+ *lumToYV12 = grayf32beToY16_c;
19721978 break;
19731979 case AV_PIX_FMT_Y210LE:
1974− c->lumToYV12 = y210le_Y_c;
1980+ *lumToYV12 = y210le_Y_c;
19751981 break;
19761982 case AV_PIX_FMT_Y212LE:
1977− c->lumToYV12 = y212le_Y_c;
1983+ *lumToYV12 = y212le_Y_c;
19781984 break;
19791985 case AV_PIX_FMT_X2RGB10LE:
1980− c->lumToYV12 = rgb30leToY_c;
1986+ *lumToYV12 = rgb30leToY_c;
19811987 break;
19821988 case AV_PIX_FMT_X2BGR10LE:
1983− c->lumToYV12 = bgr30leToY_c;
1989+ *lumToYV12 = bgr30leToY_c;
19841990 break;
19851991 case AV_PIX_FMT_RGBAF16BE:
1986− c->lumToYV12 = rgbaf16beToY_c;
1992+ *lumToYV12 = rgbaf16beToY_c;
19871993 break;
19881994 case AV_PIX_FMT_RGBAF16LE:
1989− c->lumToYV12 = rgbaf16leToY_c;
1995+ *lumToYV12 = rgbaf16leToY_c;
19901996 break;
19911997 }
19921998 if (c->needAlpha) {
19931999 if (is16BPS(srcFormat) || isNBPS(srcFormat)) {
1994− if (HAVE_BIGENDIAN == !isBE(srcFormat) && !c->readAlpPlanar)
1995− c->alpToYV12 = bswap16Y_c;
2000+ if (HAVE_BIGENDIAN == !isBE(srcFormat) && !*readAlpPlanar)
2001+ *alpToYV12 = bswap16Y_c;
19962002 }
19972003 switch (srcFormat) {
19982004 case AV_PIX_FMT_BGRA64LE:
1999− case AV_PIX_FMT_RGBA64LE: c->alpToYV12 = rgba64leToA_c; break;
2005+ case AV_PIX_FMT_RGBA64LE: *alpToYV12 = rgba64leToA_c; break;
20002006 case AV_PIX_FMT_BGRA64BE:
2001− case AV_PIX_FMT_RGBA64BE: c->alpToYV12 = rgba64beToA_c; break;
2007+ case AV_PIX_FMT_RGBA64BE: *alpToYV12 = rgba64beToA_c; break;
20022008 case AV_PIX_FMT_BGRA:
20032009 case AV_PIX_FMT_RGBA:
2004− c->alpToYV12 = rgbaToA_c;
2010+ *alpToYV12 = rgbaToA_c;
20052011 break;
20062012 case AV_PIX_FMT_ABGR:
20072013 case AV_PIX_FMT_ARGB:
2008− c->alpToYV12 = abgrToA_c;
2014+ *alpToYV12 = abgrToA_c;
20092015 break;
20102016 case AV_PIX_FMT_RGBAF16BE:
2011− c->alpToYV12 = rgbaf16beToA_c;
2017+ *alpToYV12 = rgbaf16beToA_c;
20122018 break;
20132019 case AV_PIX_FMT_RGBAF16LE:
2014− c->alpToYV12 = rgbaf16leToA_c;
2020+ *alpToYV12 = rgbaf16leToA_c;
20152021 break;
20162022 case AV_PIX_FMT_YA8:
2017− c->alpToYV12 = uyvyToY_c;
2023+ *alpToYV12 = uyvyToY_c;
20182024 break;
20192025 case AV_PIX_FMT_YA16LE:
2020− c->alpToYV12 = read_ya16le_alpha_c;
2026+ *alpToYV12 = read_ya16le_alpha_c;
20212027 break;
20222028 case AV_PIX_FMT_YA16BE:
2023− c->alpToYV12 = read_ya16be_alpha_c;
2029+ *alpToYV12 = read_ya16be_alpha_c;
20242030 break;
20252031 case AV_PIX_FMT_VUYA:
2026− c->alpToYV12 = read_vuya_A_c;
2032+ *alpToYV12 = read_vuya_A_c;
20272033 break;
20282034 case AV_PIX_FMT_AYUV64LE:
2029− c->alpToYV12 = read_ayuv64le_A_c;
2035+ *alpToYV12 = read_ayuv64le_A_c;
20302036 break;
20312037 case AV_PIX_FMT_PAL8 :
2032− c->alpToYV12 = palToA_c;
2038+ *alpToYV12 = palToA_c;
20332039 break;
20342040 }
20352041 }
libswscale/swscale.c+2−1
@@ -564,7 +564,8 @@ static av_cold void sws_init_swscale(SwsContext *c) · 563 unmodified lines
564564 &c->yuv2nv12cX, &c->yuv2packed1,
565565 &c->yuv2packed2, &c->yuv2packedX, &c->yuv2anyX);
566566
567− ff_sws_init_input_funcs(c);
567+ ff_sws_init_input_funcs(c, &c->lumToYV12, &c->alpToYV12, &c->chrToYV12,
568+ &c->readLumPlanar, &c->readAlpPlanar, &c->readChrPlanar);
568569
569570 if (c->srcBpc == 8) {
570571 if (c->dstBpc <= 14) {
libswscale/swscale_internal.h+7−1
@@ -988,7 +988,13 @@ void ff_get_unscaled_swscale_aarch64(SwsContext *c); · 987 unmodified lines
988988
989989 void ff_sws_init_scale(SwsContext *c);
990990
991−void ff_sws_init_input_funcs(SwsContext *c);
991+void ff_sws_init_input_funcs(SwsContext *c,
992+ planar1_YV12_fn *lumToYV12,
993+ planar1_YV12_fn *alpToYV12,
994+ planar2_YV12_fn *chrToYV12,
995+ planarX_YV12_fn *readLumPlanar,
996+ planarX_YV12_fn *readAlpPlanar,
997+ planarX2_YV12_fn *readChrPlanar);
992998 void ff_sws_init_output_funcs(SwsContext *c,
993999 yuv2planar1_fn *yuv2plane1,
9941000 yuv2planarX_fn *yuv2planeX,

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