I want to pull options out of SwsInternal, so we need to make this field a dedicated int that gets updated as appropriate in ff_swscale().
Unified · Split
| @@ -488,6 +488,7 @@ int ff_swscale(SwsContext *c, const uint8_t *const src[], const int srcStride[], · 487 unmodified lines | |||
| 488 | 488 | ||
| 489 | #if HAVE_MMX_INLINE | 489 | #if HAVE_MMX_INLINE |
| 490 | ff_updateMMXDitherTables(c, dstY); | 490 | ff_updateMMXDitherTables(c, dstY); |
| 491 | c->dstW_mmx = c->dstW; | ||
| 491 | #endif | 492 | #endif |
| 492 | if (should_dither) { | 493 | if (should_dither) { |
| 493 | c->chrDither8 = ff_dither_8x8_128[chrDstY & 7]; | 494 | c->chrDither8 = ff_dither_8x8_128[chrDstY & 7]; |
| @@ -345,6 +345,7 @@ struct SwsContext { · 344 unmodified lines | |||
| 345 | SwsFunc convert_unscaled; | 345 | SwsFunc convert_unscaled; |
| 346 | int srcW; ///< Width of source luma/alpha planes. | 346 | int srcW; ///< Width of source luma/alpha planes. |
| 347 | int srcH; ///< Height of source luma/alpha planes. | 347 | int srcH; ///< Height of source luma/alpha planes. |
| 348 | int dstW; ///< Width of destination luma/alpha planes. | ||
| 348 | int dstH; ///< Height of destination luma/alpha planes. | 349 | int dstH; ///< Height of destination luma/alpha planes. |
| 349 | int chrSrcW; ///< Width of source chroma planes. | 350 | int chrSrcW; ///< Width of source chroma planes. |
| 350 | int chrSrcH; ///< Height of source chroma planes. | 351 | int chrSrcH; ///< Height of source chroma planes. |
| @@ -534,7 +535,7 @@ struct SwsContext { · 183 unmodified lines | |||
| 534 | DECLARE_ALIGNED(8, uint64_t, vOffset); | 535 | DECLARE_ALIGNED(8, uint64_t, vOffset); |
| 535 | int32_t lumMmxFilter[4 * MAX_FILTER_SIZE]; | 536 | int32_t lumMmxFilter[4 * MAX_FILTER_SIZE]; |
| 536 | int32_t chrMmxFilter[4 * MAX_FILTER_SIZE]; | 537 | int32_t chrMmxFilter[4 * MAX_FILTER_SIZE]; |
| 537 | int dstW; ///< Width of destination luma/alpha planes. | 538 | int dstW_mmx; |
| 538 | DECLARE_ALIGNED(8, uint64_t, esp); | 539 | DECLARE_ALIGNED(8, uint64_t, esp); |
| 539 | DECLARE_ALIGNED(8, uint64_t, vRounder); | 540 | DECLARE_ALIGNED(8, uint64_t, vRounder); |
| 540 | DECLARE_ALIGNED(8, uint64_t, u_temp); | 541 | DECLARE_ALIGNED(8, uint64_t, u_temp); |