Slightly more convenient to access from the new wrapping code.
Unified · Split
| @@ -837,26 +837,26 @@ static int scale_gamma(SwsContext *c, · 836 unmodified lines | |||
| 837 | { | 837 | { |
| 838 | int ret = scale_internal(c->cascaded_context[0], | 838 | int ret = scale_internal(c->cascaded_context[0], |
| 839 | srcSlice, srcStride, srcSliceY, srcSliceH, | 839 | srcSlice, srcStride, srcSliceY, srcSliceH, |
| 840 | c->cascaded_tmp, c->cascaded_tmpStride, 0, c->srcH); | 840 | c->cascaded_tmp[0], c->cascaded_tmpStride[0], 0, c->srcH); |
| 841 | 841 | ||
| 842 | if (ret < 0) | 842 | if (ret < 0) |
| 843 | return ret; | 843 | return ret; |
| 844 | 844 | ||
| 845 | if (c->cascaded_context[2]) | 845 | if (c->cascaded_context[2]) |
| 846 | ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp, | 846 | ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp[0], |
| 847 | c->cascaded_tmpStride, srcSliceY, srcSliceH, | 847 | c->cascaded_tmpStride[0], srcSliceY, srcSliceH, |
| 848 | c->cascaded1_tmp, c->cascaded1_tmpStride, 0, c->dstH); | 848 | c->cascaded_tmp[1], c->cascaded_tmpStride[1], 0, c->dstH); |
| 849 | else | 849 | else |
| 850 | ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp, | 850 | ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp[0], |
| 851 | c->cascaded_tmpStride, srcSliceY, srcSliceH, | 851 | c->cascaded_tmpStride[0], srcSliceY, srcSliceH, |
| 852 | dstSlice, dstStride, dstSliceY, dstSliceH); | 852 | dstSlice, dstStride, dstSliceY, dstSliceH); |
| 853 | 853 | ||
| 854 | if (ret < 0) | 854 | if (ret < 0) |
| 855 | return ret; | 855 | return ret; |
| 856 | 856 | ||
| 857 | if (c->cascaded_context[2]) { | 857 | if (c->cascaded_context[2]) { |
| 858 | ret = scale_internal(c->cascaded_context[2], (const uint8_t * const *)c->cascaded1_tmp, | 858 | ret = scale_internal(c->cascaded_context[2], (const uint8_t * const *)c->cascaded_tmp[1], |
| 859 | c->cascaded1_tmpStride, c->cascaded_context[1]->dstY - ret, | 859 | c->cascaded_tmpStride[1], c->cascaded_context[1]->dstY - ret, |
| 860 | c->cascaded_context[1]->dstY, | 860 | c->cascaded_context[1]->dstY, |
| 861 | dstSlice, dstStride, dstSliceY, dstSliceH); | 861 | dstSlice, dstStride, dstSliceY, dstSliceH); |
| 862 | } | 862 | } |
| @@ -871,12 +871,12 @@ static int scale_cascaded(SwsContext *c, · 8 unmodified lines | |||
| 871 | { | 871 | { |
| 872 | int ret = scale_internal(c->cascaded_context[0], | 872 | int ret = scale_internal(c->cascaded_context[0], |
| 873 | srcSlice, srcStride, srcSliceY, srcSliceH, | 873 | srcSlice, srcStride, srcSliceY, srcSliceH, |
| 874 | c->cascaded_tmp, c->cascaded_tmpStride, | 874 | c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 875 | 0, c->cascaded_context[0]->dstH); | 875 | 0, c->cascaded_context[0]->dstH); |
| 876 | if (ret < 0) | 876 | if (ret < 0) |
| 877 | return ret; | 877 | return ret; |
| 878 | ret = scale_internal(c->cascaded_context[1], | 878 | ret = scale_internal(c->cascaded_context[1], |
| 879 | (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, | 879 | (const uint8_t * const * )c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 880 | 0, c->cascaded_context[0]->dstH, | 880 | 0, c->cascaded_context[0]->dstH, |
| 881 | dstSlice, dstStride, dstSliceY, dstSliceH); | 881 | dstSlice, dstStride, dstSliceY, dstSliceH); |
| 882 | return ret; | 882 | return ret; |
| @@ -351,10 +351,8 @@ typedef struct SwsContext { · 350 unmodified lines | |||
| 351 | * downscaling factor that needs to be supported in one scaler. | 351 | * downscaling factor that needs to be supported in one scaler. |
| 352 | */ | 352 | */ |
| 353 | struct SwsContext *cascaded_context[3]; | 353 | struct SwsContext *cascaded_context[3]; |
| 354 | int cascaded_tmpStride[4]; | 354 | int cascaded_tmpStride[2][4]; |
| 355 | uint8_t *cascaded_tmp[4]; | 355 | uint8_t *cascaded_tmp[2][4]; |
| 356 | int cascaded1_tmpStride[4]; | ||
| 357 | uint8_t *cascaded1_tmp[4]; | ||
| 358 | int cascaded_mainindex; | 356 | int cascaded_mainindex; |
| 359 | 357 | ||
| 360 | double gamma_value; | 358 | double gamma_value; |
| @@ -1133,7 +1133,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], · 1132 unmodified lines | |||
| 1133 | tmp_height = srcH; | 1133 | tmp_height = srcH; |
| 1134 | } | 1134 | } |
| 1135 | 1135 | ||
| 1136 | ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, | 1136 | ret = av_image_alloc(c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 1137 | tmp_width, tmp_height, tmp_format, 64); | 1137 | tmp_width, tmp_height, tmp_format, 64); |
| 1138 | if (ret < 0) | 1138 | if (ret < 0) |
| 1139 | return ret; | 1139 | return ret; |
| @@ -1613,7 +1613,7 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, · 473 unmodified lines | |||
| 1613 | SwsContext *c2; | 1613 | SwsContext *c2; |
| 1614 | c->cascaded_context[0] = NULL; | 1614 | c->cascaded_context[0] = NULL; |
| 1615 | 1615 | ||
| 1616 | ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, | 1616 | ret = av_image_alloc(c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 1617 | srcW, srcH, tmpFmt, 64); | 1617 | srcW, srcH, tmpFmt, 64); |
| 1618 | if (ret < 0) | 1618 | if (ret < 0) |
| 1619 | return ret; | 1619 | return ret; |
| @@ -1651,7 +1651,7 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, · 31 unmodified lines | |||
| 1651 | 1651 | ||
| 1652 | c->cascaded_context[2] = NULL; | 1652 | c->cascaded_context[2] = NULL; |
| 1653 | if (dstFormat != tmpFmt) { | 1653 | if (dstFormat != tmpFmt) { |
| 1654 | ret = av_image_alloc(c->cascaded1_tmp, c->cascaded1_tmpStride, | 1654 | ret = av_image_alloc(c->cascaded_tmp[1], c->cascaded_tmpStride[1], |
| 1655 | dstW, dstH, tmpFmt, 64); | 1655 | dstW, dstH, tmpFmt, 64); |
| 1656 | if (ret < 0) | 1656 | if (ret < 0) |
| 1657 | return ret; | 1657 | return ret; |
| @@ -1671,7 +1671,7 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, · 13 unmodified lines | |||
| 1671 | dstFormat != AV_PIX_FMT_RGB48)) { | 1671 | dstFormat != AV_PIX_FMT_RGB48)) { |
| 1672 | enum AVPixelFormat tmpFormat = isBayer16BPS(srcFormat) ? AV_PIX_FMT_RGB48 : AV_PIX_FMT_RGB24; | 1672 | enum AVPixelFormat tmpFormat = isBayer16BPS(srcFormat) ? AV_PIX_FMT_RGB48 : AV_PIX_FMT_RGB24; |
| 1673 | 1673 | ||
| 1674 | ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, | 1674 | ret = av_image_alloc(c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 1675 | srcW, srcH, tmpFormat, 64); | 1675 | srcW, srcH, tmpFormat, 64); |
| 1676 | if (ret < 0) | 1676 | if (ret < 0) |
| 1677 | return ret; | 1677 | return ret; |
| @@ -1714,7 +1714,7 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, · 36 unmodified lines | |||
| 1714 | c->srcRange != c->dstRange | 1714 | c->srcRange != c->dstRange |
| 1715 | ) { | 1715 | ) { |
| 1716 | c->cascaded_mainindex = 1; | 1716 | c->cascaded_mainindex = 1; |
| 1717 | ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, | 1717 | ret = av_image_alloc(c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 1718 | srcW, srcH, tmpFormat, 64); | 1718 | srcW, srcH, tmpFormat, 64); |
| 1719 | if (ret < 0) | 1719 | if (ret < 0) |
| 1720 | return ret; | 1720 | return ret; |
| @@ -1996,7 +1996,7 @@ fail: // FIXME replace things by appropriate error codes · 275 unmodified lines | |||
| 1996 | if (srcW*(int64_t)srcH <= 4LL*dstW*dstH) | 1996 | if (srcW*(int64_t)srcH <= 4LL*dstW*dstH) |
| 1997 | return AVERROR(EINVAL); | 1997 | return AVERROR(EINVAL); |
| 1998 | 1998 | ||
| 1999 | ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, | 1999 | ret = av_image_alloc(c->cascaded_tmp[0], c->cascaded_tmpStride[0], |
| 2000 | tmpW, tmpH, tmpFormat, 64); | 2000 | tmpW, tmpH, tmpFormat, 64); |
| 2001 | if (ret < 0) | 2001 | if (ret < 0) |
| 2002 | return ret; | 2002 | return ret; |
| @@ -2490,8 +2490,8 @@ void sws_freeContext(SwsContext *c) · 487 unmodified lines | |||
| 2490 | sws_freeContext(c->cascaded_context[1]); | 2490 | sws_freeContext(c->cascaded_context[1]); |
| 2491 | sws_freeContext(c->cascaded_context[2]); | 2491 | sws_freeContext(c->cascaded_context[2]); |
| 2492 | memset(c->cascaded_context, 0, sizeof(c->cascaded_context)); | 2492 | memset(c->cascaded_context, 0, sizeof(c->cascaded_context)); |
| 2493 | av_freep(&c->cascaded_tmp[0]); | 2493 | av_freep(&c->cascaded_tmp[0][0]); |
| 2494 | av_freep(&c->cascaded1_tmp[0]); | 2494 | av_freep(&c->cascaded_tmp[1][0]); |
| 2495 | 2495 | ||
| 2496 | av_freep(&c->gamma); | 2496 | av_freep(&c->gamma); |
| 2497 | av_freep(&c->inv_gamma); | 2497 | av_freep(&c->inv_gamma); |