| @@ -139,10 +139,10 @@ void ff_copyPlane(const uint8_t *src, int srcStride, · 138 unmodified lines |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | | −static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[], |
| 143 | | − int srcStride[], int srcSliceY, |
| 144 | | − int srcSliceH, uint8_t *dstParam[], |
| 145 | | − int dstStride[]) |
| 142 | +static int planarToNv12Wrapper(SwsContext *c, const uint8_t *const src[], |
| 143 | + const int srcStride[], int srcSliceY, |
| 144 | + int srcSliceH, uint8_t *const dstParam[], |
| 145 | + const int dstStride[]) |
| 146 | 146 | { |
| 147 | 147 | uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY / 2; |
| 148 | 148 | |
| @@ -159,10 +159,10 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[], · 10 unmodified lines |
| 159 | 159 | return srcSliceH; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | | −static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[], |
| 163 | | − int srcStride[], int srcSliceY, |
| 164 | | − int srcSliceH, uint8_t *dstParam[], |
| 165 | | − int dstStride[]) |
| 162 | +static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *const src[], |
| 163 | + const int srcStride[], int srcSliceY, |
| 164 | + int srcSliceH, uint8_t *const dstParam[], |
| 165 | + const int dstStride[]) |
| 166 | 166 | { |
| 167 | 167 | uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2; |
| 168 | 168 | uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2; |
| @@ -180,10 +180,10 @@ static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[], · 11 unmodified lines |
| 180 | 180 | return srcSliceH; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | | −static int planarToNv24Wrapper(SwsContext *c, const uint8_t *src[], |
| 184 | | − int srcStride[], int srcSliceY, |
| 185 | | − int srcSliceH, uint8_t *dstParam[], |
| 186 | | − int dstStride[]) |
| 183 | +static int planarToNv24Wrapper(SwsContext *c, const uint8_t *const src[], |
| 184 | + const int srcStride[], int srcSliceY, |
| 185 | + int srcSliceH, uint8_t *const dstParam[], |
| 186 | + const int dstStride[]) |
| 187 | 187 | { |
| 188 | 188 | uint8_t *dst = dstParam[1] + dstStride[1] * srcSliceY; |
| 189 | 189 | |
| @@ -200,10 +200,10 @@ static int planarToNv24Wrapper(SwsContext *c, const uint8_t *src[], · 10 unmodified lines |
| 200 | 200 | return srcSliceH; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | | −static int nv24ToPlanarWrapper(SwsContext *c, const uint8_t *src[], |
| 204 | | − int srcStride[], int srcSliceY, |
| 205 | | − int srcSliceH, uint8_t *dstParam[], |
| 206 | | − int dstStride[]) |
| 203 | +static int nv24ToPlanarWrapper(SwsContext *c, const uint8_t *const src[], |
| 204 | + const int srcStride[], int srcSliceY, |
| 205 | + int srcSliceH, uint8_t *const dstParam[], |
| 206 | + const int dstStride[]) |
| 207 | 207 | { |
| 208 | 208 | uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY; |
| 209 | 209 | uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY; |
| @@ -243,9 +243,9 @@ static void nv24_to_yuv420p_chroma(uint8_t *dst1, int dstStride1, · 33 unmodified lines |
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | |
| 246 | | −static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *src[], |
| 247 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 248 | | − uint8_t *dstParam[], int dstStride[]) |
| 246 | +static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *const src[], |
| 247 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 248 | + uint8_t *const dstParam[], const int dstStride[]) |
| 249 | 249 | { |
| 250 | 250 | uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2; |
| 251 | 251 | uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2; |
| @@ -263,10 +263,10 @@ static int nv24ToYuv420Wrapper(SwsContext *c, const uint8_t *src[], · 11 unmodified lines |
| 263 | 263 | return srcSliceH; |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | | −static int planarToP01xWrapper(SwsContext *c, const uint8_t *src8[], |
| 267 | | − int srcStride[], int srcSliceY, |
| 268 | | − int srcSliceH, uint8_t *dstParam8[], |
| 269 | | − int dstStride[]) |
| 266 | +static int planarToP01xWrapper(SwsContext *c, const uint8_t *const src8[], |
| 267 | + const int srcStride[], int srcSliceY, |
| 268 | + int srcSliceH, uint8_t *const dstParam8[], |
| 269 | + const int dstStride[]) |
| 270 | 270 | { |
| 271 | 271 | const AVPixFmtDescriptor *src_format = av_pix_fmt_desc_get(c->srcFormat); |
| 272 | 272 | const AVPixFmtDescriptor *dst_format = av_pix_fmt_desc_get(c->dstFormat); |
| @@ -323,11 +323,12 @@ static int planarToP01xWrapper(SwsContext *c, const uint8_t *src8[], · 50 unmodified lines |
| 323 | 323 | #define output_pixel(p, v) (*p) = (v) |
| 324 | 324 | #endif |
| 325 | 325 | |
| 326 | | −static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[], |
| 327 | | − int srcStride[], int srcSliceY, |
| 328 | | − int srcSliceH, uint8_t *dstParam8[], |
| 329 | | − int dstStride[]) |
| 326 | +static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *const src[], |
| 327 | + const int srcStride[], int srcSliceY, |
| 328 | + int srcSliceH, uint8_t *const dstParam8[], |
| 329 | + const int dstStride[]) |
| 330 | 330 | { |
| 331 | + const uint8_t *src0 = src[0], *src1 = src[1], *src2 = src[2]; |
| 331 | 332 | uint16_t *dstY = (uint16_t*)(dstParam8[0] + dstStride[0] * srcSliceY); |
| 332 | 333 | uint16_t *dstUV = (uint16_t*)(dstParam8[1] + dstStride[1] * srcSliceY / 2); |
| 333 | 334 | int x, y, t; |
| @@ -336,26 +337,26 @@ static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[], · 2 unmodified lines |
| 336 | 337 | |
| 337 | 338 | for (y = 0; y < srcSliceH; y++) { |
| 338 | 339 | uint16_t *tdstY = dstY; |
| 339 | | − const uint8_t *tsrc0 = src[0]; |
| 340 | + const uint8_t *tsrc0 = src0; |
| 340 | 341 | for (x = c->srcW; x > 0; x--) { |
| 341 | 342 | t = *tsrc0++; |
| 342 | 343 | output_pixel(tdstY++, t | (t << 8)); |
| 343 | 344 | } |
| 344 | | − src[0] += srcStride[0]; |
| 345 | + src0 += srcStride[0]; |
| 345 | 346 | dstY += dstStride[0] / 2; |
| 346 | 347 | |
| 347 | 348 | if (!(y & 1)) { |
| 348 | 349 | uint16_t *tdstUV = dstUV; |
| 349 | | − const uint8_t *tsrc1 = src[1]; |
| 350 | | − const uint8_t *tsrc2 = src[2]; |
| 350 | + const uint8_t *tsrc1 = src1; |
| 351 | + const uint8_t *tsrc2 = src2; |
| 351 | 352 | for (x = c->srcW / 2; x > 0; x--) { |
| 352 | 353 | t = *tsrc1++; |
| 353 | 354 | output_pixel(tdstUV++, t | (t << 8)); |
| 354 | 355 | t = *tsrc2++; |
| 355 | 356 | output_pixel(tdstUV++, t | (t << 8)); |
| 356 | 357 | } |
| 357 | | − src[1] += srcStride[1]; |
| 358 | | − src[2] += srcStride[2]; |
| 358 | + src1 += srcStride[1]; |
| 359 | + src2 += srcStride[2]; |
| 359 | 360 | dstUV += dstStride[1] / 2; |
| 360 | 361 | } |
| 361 | 362 | } |
| @@ -365,9 +366,9 @@ static int planar8ToP01xleWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines |
| 365 | 366 | |
| 366 | 367 | #undef output_pixel |
| 367 | 368 | |
| 368 | | −static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[], |
| 369 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 370 | | − uint8_t *dstParam[], int dstStride[]) |
| 369 | +static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *const src[], |
| 370 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 371 | + uint8_t *const dstParam[], const int dstStride[]) |
| 371 | 372 | { |
| 372 | 373 | uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; |
| 373 | 374 | |
| @@ -377,9 +378,9 @@ static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines |
| 377 | 378 | return srcSliceH; |
| 378 | 379 | } |
| 379 | 380 | |
| 380 | | −static int planarToUyvyWrapper(SwsContext *c, const uint8_t *src[], |
| 381 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 382 | | − uint8_t *dstParam[], int dstStride[]) |
| 381 | +static int planarToUyvyWrapper(SwsContext *c, const uint8_t *const src[], |
| 382 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 383 | + uint8_t *const dstParam[], const int dstStride[]) |
| 383 | 384 | { |
| 384 | 385 | uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; |
| 385 | 386 | |
| @@ -389,9 +390,9 @@ static int planarToUyvyWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines |
| 389 | 390 | return srcSliceH; |
| 390 | 391 | } |
| 391 | 392 | |
| 392 | | −static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *src[], |
| 393 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 394 | | − uint8_t *dstParam[], int dstStride[]) |
| 393 | +static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *const src[], |
| 394 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 395 | + uint8_t *const dstParam[], const int dstStride[]) |
| 395 | 396 | { |
| 396 | 397 | uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; |
| 397 | 398 | |
| @@ -401,9 +402,9 @@ static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines |
| 401 | 402 | return srcSliceH; |
| 402 | 403 | } |
| 403 | 404 | |
| 404 | | −static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *src[], |
| 405 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 406 | | − uint8_t *dstParam[], int dstStride[]) |
| 405 | +static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *const src[], |
| 406 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 407 | + uint8_t *const dstParam[], const int dstStride[]) |
| 407 | 408 | { |
| 408 | 409 | uint8_t *dst = dstParam[0] + dstStride[0] * srcSliceY; |
| 409 | 410 | |
| @@ -413,9 +414,9 @@ static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines |
| 413 | 414 | return srcSliceH; |
| 414 | 415 | } |
| 415 | 416 | |
| 416 | | −static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *src[], |
| 417 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 418 | | − uint8_t *dstParam[], int dstStride[]) |
| 417 | +static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *const src[], |
| 418 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 419 | + uint8_t *const dstParam[], const int dstStride[]) |
| 419 | 420 | { |
| 420 | 421 | uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; |
| 421 | 422 | uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2; |
| @@ -430,9 +431,9 @@ static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t *src[], · 8 unmodified lines |
| 430 | 431 | return srcSliceH; |
| 431 | 432 | } |
| 432 | 433 | |
| 433 | | −static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *src[], |
| 434 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 435 | | − uint8_t *dstParam[], int dstStride[]) |
| 434 | +static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *const src[], |
| 435 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 436 | + uint8_t *const dstParam[], const int dstStride[]) |
| 436 | 437 | { |
| 437 | 438 | uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; |
| 438 | 439 | uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY; |
| @@ -444,9 +445,9 @@ static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t *src[], · 5 unmodified lines |
| 444 | 445 | return srcSliceH; |
| 445 | 446 | } |
| 446 | 447 | |
| 447 | | −static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *src[], |
| 448 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 449 | | − uint8_t *dstParam[], int dstStride[]) |
| 448 | +static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *const src[], |
| 449 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 450 | + uint8_t *const dstParam[], const int dstStride[]) |
| 450 | 451 | { |
| 451 | 452 | uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; |
| 452 | 453 | uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY / 2; |
| @@ -461,9 +462,9 @@ static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t *src[], · 8 unmodified lines |
| 461 | 462 | return srcSliceH; |
| 462 | 463 | } |
| 463 | 464 | |
| 464 | | −static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t *src[], |
| 465 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 466 | | − uint8_t *dstParam[], int dstStride[]) |
| 465 | +static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t *const src[], |
| 466 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 467 | + uint8_t *const dstParam[], const int dstStride[]) |
| 467 | 468 | { |
| 468 | 469 | uint8_t *ydst = dstParam[0] + dstStride[0] * srcSliceY; |
| 469 | 470 | uint8_t *udst = dstParam[1] + dstStride[1] * srcSliceY; |
| @@ -506,9 +507,9 @@ static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, · 36 unmodified lines |
| 506 | 507 | } |
| 507 | 508 | } |
| 508 | 509 | |
| 509 | | −static int bswap_16bpc(SwsContext *c, const uint8_t *src[], |
| 510 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 511 | | − uint8_t *dst[], int dstStride[]) |
| 510 | +static int bswap_16bpc(SwsContext *c, const uint8_t *const src[], |
| 511 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 512 | + uint8_t *const dst[], const int dstStride[]) |
| 512 | 513 | { |
| 513 | 514 | int i, j, p; |
| 514 | 515 | |
| @@ -533,9 +534,9 @@ static int bswap_16bpc(SwsContext *c, const uint8_t *src[], · 18 unmodified lines |
| 533 | 534 | return srcSliceH; |
| 534 | 535 | } |
| 535 | 536 | |
| 536 | | −static int bswap_32bpc(SwsContext *c, const uint8_t *src[], |
| 537 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 538 | | − uint8_t *dst[], int dstStride[]) |
| 537 | +static int bswap_32bpc(SwsContext *c, const uint8_t *const src[], |
| 538 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 539 | + uint8_t *const dst[], const int dstStride[]) |
| 539 | 540 | { |
| 540 | 541 | int i, j, p; |
| 541 | 542 | |
| @@ -561,9 +562,9 @@ static int bswap_32bpc(SwsContext *c, const uint8_t *src[], · 19 unmodified lines |
| 561 | 562 | } |
| 562 | 563 | |
| 563 | 564 | |
| 564 | | −static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], |
| 565 | | − int srcSliceY, int srcSliceH, uint8_t *dst[], |
| 566 | | − int dstStride[]) |
| 565 | +static int palToRgbWrapper(SwsContext *c, const uint8_t *const src[], const int srcStride[], |
| 566 | + int srcSliceY, int srcSliceH, uint8_t *const dst[], |
| 567 | + const int dstStride[]) |
| 567 | 568 | { |
| 568 | 569 | const enum AVPixelFormat srcFormat = c->srcFormat; |
| 569 | 570 | const enum AVPixelFormat dstFormat = c->dstFormat; |
| @@ -608,7 +609,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], · 38 unmodified lines |
| 608 | 609 | } |
| 609 | 610 | |
| 610 | 611 | static void packed16togbra16(const uint8_t *src, int srcStride, |
| 611 | | − uint16_t *dst[], int dstStride[], int srcSliceH, |
| 612 | + uint16_t *dst[], const int dstStride[], int srcSliceH, |
| 612 | 613 | int src_alpha, int swap, int shift, int width) |
| 613 | 614 | { |
| 614 | 615 | int x, h, i; |
| @@ -741,9 +742,9 @@ static void packed16togbra16(const uint8_t *src, int srcStride, · 126 unmodified lines |
| 741 | 742 | } |
| 742 | 743 | } |
| 743 | 744 | |
| 744 | | −static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[], |
| 745 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 746 | | − uint8_t *dst[], int dstStride[]) |
| 745 | +static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *const src[], |
| 746 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 747 | + uint8_t *const dst[], const int dstStride[]) |
| 747 | 748 | { |
| 748 | 749 | uint16_t *dst2013[] = { (uint16_t *)dst[2], (uint16_t *)dst[0], (uint16_t *)dst[1], (uint16_t *)dst[3] }; |
| 749 | 750 | uint16_t *dst1023[] = { (uint16_t *)dst[1], (uint16_t *)dst[0], (uint16_t *)dst[2], (uint16_t *)dst[3] }; |
| @@ -801,7 +802,7 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[], · 51 unmodified lines |
| 801 | 802 | return srcSliceH; |
| 802 | 803 | } |
| 803 | 804 | |
| 804 | | −static void gbr16ptopacked16(const uint16_t *src[], int srcStride[], |
| 805 | +static void gbr16ptopacked16(const uint16_t *src[], const int srcStride[], |
| 805 | 806 | uint8_t *dst, int dstStride, int srcSliceH, |
| 806 | 807 | int alpha, int swap, int bpp, int width) |
| 807 | 808 | { |
| @@ -920,9 +921,9 @@ static void gbr16ptopacked16(const uint16_t *src[], int srcStride[], · 112 unmodified lines |
| 920 | 921 | } |
| 921 | 922 | } |
| 922 | 923 | |
| 923 | | −static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *src[], |
| 924 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 925 | | − uint8_t *dst[], int dstStride[]) |
| 924 | +static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *const src[], |
| 925 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 926 | + uint8_t *const dst[], const int dstStride[]) |
| 926 | 927 | { |
| 927 | 928 | const uint16_t *src102[] = { (uint16_t *)src[1], (uint16_t *)src[0], (uint16_t *)src[2], (uint16_t *)src[3] }; |
| 928 | 929 | const uint16_t *src201[] = { (uint16_t *)src[2], (uint16_t *)src[0], (uint16_t *)src[1], (uint16_t *)src[3] }; |
| @@ -980,7 +981,7 @@ static int planarRgb16ToRgb16Wrapper(SwsContext *c, const uint8_t *src[], · 51 unmodified lines |
| 980 | 981 | return srcSliceH; |
| 981 | 982 | } |
| 982 | 983 | |
| 983 | | −static void gbr24ptopacked24(const uint8_t *src[], int srcStride[], |
| 984 | +static void gbr24ptopacked24(const uint8_t *src[], const int srcStride[], |
| 984 | 985 | uint8_t *dst, int dstStride, int srcSliceH, |
| 985 | 986 | int width) |
| 986 | 987 | { |
| @@ -998,7 +999,7 @@ static void gbr24ptopacked24(const uint8_t *src[], int srcStride[], · 11 unmodified lines |
| 998 | 999 | } |
| 999 | 1000 | } |
| 1000 | 1001 | |
| 1001 | | −static void gbr24ptopacked32(const uint8_t *src[], int srcStride[], |
| 1002 | +static void gbr24ptopacked32(const uint8_t *src[], const int srcStride[], |
| 1002 | 1003 | uint8_t *dst, int dstStride, int srcSliceH, |
| 1003 | 1004 | int alpha_first, int width) |
| 1004 | 1005 | { |
| @@ -1027,7 +1028,7 @@ static void gbr24ptopacked32(const uint8_t *src[], int srcStride[], · 22 unmodified lines |
| 1027 | 1028 | } |
| 1028 | 1029 | } |
| 1029 | 1030 | |
| 1030 | | −static void gbraptopacked32(const uint8_t *src[], int srcStride[], |
| 1031 | +static void gbraptopacked32(const uint8_t *src[], const int srcStride[], |
| 1031 | 1032 | uint8_t *dst, int dstStride, int srcSliceH, |
| 1032 | 1033 | int alpha_first, int width) |
| 1033 | 1034 | { |
| @@ -1056,9 +1057,9 @@ static void gbraptopacked32(const uint8_t *src[], int srcStride[], · 22 unmodified lines |
| 1056 | 1057 | } |
| 1057 | 1058 | } |
| 1058 | 1059 | |
| 1059 | | −static int planarRgbaToRgbWrapper(SwsContext *c, const uint8_t *src[], |
| 1060 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1061 | | − uint8_t *dst[], int dstStride[]) |
| 1060 | +static int planarRgbaToRgbWrapper(SwsContext *c, const uint8_t *const src[], |
| 1061 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1062 | + uint8_t *const dst[], const int dstStride[]) |
| 1062 | 1063 | { |
| 1063 | 1064 | int alpha_first = 0; |
| 1064 | 1065 | const uint8_t *src102[] = { src[1], src[0], src[2], src[3] }; |
| @@ -1112,9 +1113,9 @@ static int planarRgbaToRgbWrapper(SwsContext *c, const uint8_t *src[], · 47 unmodified lines |
| 1112 | 1113 | return srcSliceH; |
| 1113 | 1114 | } |
| 1114 | 1115 | |
| 1115 | | −static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *src[], |
| 1116 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1117 | | − uint8_t *dst[], int dstStride[]) |
| 1116 | +static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *const src[], |
| 1117 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1118 | + uint8_t *const dst[], const int dstStride[]) |
| 1118 | 1119 | { |
| 1119 | 1120 | int alpha_first = 0; |
| 1120 | 1121 | const uint8_t *src102[] = { src[1], src[0], src[2] }; |
| @@ -1169,9 +1170,9 @@ static int planarRgbToRgbWrapper(SwsContext *c, const uint8_t *src[], · 48 unmodified lines |
| 1169 | 1170 | } |
| 1170 | 1171 | |
| 1171 | 1172 | static int planarRgbToplanarRgbWrapper(SwsContext *c, |
| 1172 | | − const uint8_t *src[], int srcStride[], |
| 1173 | + const uint8_t *const src[], const int srcStride[], |
| 1173 | 1174 | int srcSliceY, int srcSliceH, |
| 1174 | | − uint8_t *dst[], int dstStride[]) |
| 1175 | + uint8_t *const dst[], const int dstStride[]) |
| 1175 | 1176 | { |
| 1176 | 1177 | ff_copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW, |
| 1177 | 1178 | dst[0], dstStride[0]); |
| @@ -1186,7 +1187,7 @@ static int planarRgbToplanarRgbWrapper(SwsContext *c, · 8 unmodified lines |
| 1186 | 1187 | } |
| 1187 | 1188 | |
| 1188 | 1189 | static void packedtogbr24p(const uint8_t *src, int srcStride, |
| 1189 | | − uint8_t *dst[], int dstStride[], int srcSliceH, |
| 1190 | + uint8_t *const dst[], const int dstStride[], int srcSliceH, |
| 1190 | 1191 | int alpha_first, int inc_size, int width) |
| 1191 | 1192 | { |
| 1192 | 1193 | uint8_t *dest[3]; |
| @@ -1214,9 +1215,9 @@ static void packedtogbr24p(const uint8_t *src, int srcStride, · 21 unmodified lines |
| 1214 | 1215 | } |
| 1215 | 1216 | } |
| 1216 | 1217 | |
| 1217 | | −static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[], |
| 1218 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1219 | | − uint8_t *dst[], int dstStride[]) |
| 1218 | +static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *const src[], |
| 1219 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1220 | + uint8_t *const dst[], const int dstStride[]) |
| 1220 | 1221 | { |
| 1221 | 1222 | int alpha_first = 0; |
| 1222 | 1223 | int stride102[] = { dstStride[1], dstStride[0], dstStride[2] }; |
| @@ -1319,8 +1320,9 @@ static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[], · 96 unmodified lines |
| 1319 | 1320 | #define BAYER_RENAME(x) bayer_rggb16be_to_##x |
| 1320 | 1321 | #include "bayer_template.c" |
| 1321 | 1322 | |
| 1322 | | −static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, |
| 1323 | | − int srcSliceH, uint8_t* dst[], int dstStride[]) |
| 1323 | +static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t *const src[], |
| 1324 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1325 | + uint8_t *const dst[], const int dstStride[]) |
| 1324 | 1326 | { |
| 1325 | 1327 | uint8_t *dstPtr= dst[0] + srcSliceY * dstStride[0]; |
| 1326 | 1328 | const uint8_t *srcPtr= src[0]; |
| @@ -1368,8 +1370,9 @@ static int bayer_to_rgb24_wrapper(SwsContext *c, const uint8_t* src[], int srcSt · 41 unmodified lines |
| 1368 | 1370 | return srcSliceH; |
| 1369 | 1371 | } |
| 1370 | 1372 | |
| 1371 | | −static int bayer_to_rgb48_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, |
| 1372 | | − int srcSliceH, uint8_t* dst[], int dstStride[]) |
| 1373 | +static int bayer_to_rgb48_wrapper(SwsContext *c, const uint8_t *const src[], |
| 1374 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1375 | + uint8_t *const dst[], const int dstStride[]) |
| 1373 | 1376 | { |
| 1374 | 1377 | uint8_t *dstPtr= dst[0] + srcSliceY * dstStride[0]; |
| 1375 | 1378 | const uint8_t *srcPtr= src[0]; |
| @@ -1417,16 +1420,17 @@ static int bayer_to_rgb48_wrapper(SwsContext *c, const uint8_t* src[], int srcSt · 41 unmodified lines |
| 1417 | 1420 | return srcSliceH; |
| 1418 | 1421 | } |
| 1419 | 1422 | |
| 1420 | | −static int bayer_to_yv12_wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, |
| 1421 | | − int srcSliceH, uint8_t* dst[], int dstStride[]) |
| 1423 | +static int bayer_to_yv12_wrapper(SwsContext *c, const uint8_t *const src[], |
| 1424 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1425 | + uint8_t *const dst[], const int dstStride[]) |
| 1422 | 1426 | { |
| 1423 | 1427 | const uint8_t *srcPtr= src[0]; |
| 1424 | 1428 | uint8_t *dstY= dst[0] + srcSliceY * dstStride[0]; |
| 1425 | 1429 | uint8_t *dstU= dst[1] + srcSliceY * dstStride[1] / 2; |
| 1426 | 1430 | uint8_t *dstV= dst[2] + srcSliceY * dstStride[2] / 2; |
| 1427 | 1431 | int i; |
| 1428 | | − void (*copy) (const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv); |
| 1429 | | − void (*interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, int32_t *rgb2yuv); |
| 1432 | + void (*copy) (const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, const int32_t *rgb2yuv); |
| 1433 | + void (*interpolate)(const uint8_t *src, int src_stride, uint8_t *dstY, uint8_t *dstU, uint8_t *dstV, int luma_stride, int width, const int32_t *rgb2yuv); |
| 1430 | 1434 | |
| 1431 | 1435 | switch(c->srcFormat) { |
| 1432 | 1436 | #define CASE(pixfmt, prefix) \ |
| @@ -1618,9 +1622,9 @@ static rgbConvFn findRgbConvFn(SwsContext *c) · 185 unmodified lines |
| 1618 | 1622 | } |
| 1619 | 1623 | |
| 1620 | 1624 | /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ |
| 1621 | | −static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], |
| 1622 | | − int srcSliceY, int srcSliceH, uint8_t *dst[], |
| 1623 | | − int dstStride[]) |
| 1625 | +static int rgbToRgbWrapper(SwsContext *c, const uint8_t *const src[], const int srcStride[], |
| 1626 | + int srcSliceY, int srcSliceH, uint8_t *const dst[], |
| 1627 | + const int dstStride[]) |
| 1624 | 1628 | |
| 1625 | 1629 | { |
| 1626 | 1630 | const enum AVPixelFormat srcFormat = c->srcFormat; |
| @@ -1679,9 +1683,9 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[], · 52 unmodified lines |
| 1679 | 1683 | return srcSliceH; |
| 1680 | 1684 | } |
| 1681 | 1685 | |
| 1682 | | −static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *src[], |
| 1683 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1684 | | − uint8_t *dst[], int dstStride[]) |
| 1686 | +static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *const src[], |
| 1687 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1688 | + uint8_t *const dst[], const int dstStride[]) |
| 1685 | 1689 | { |
| 1686 | 1690 | ff_rgb24toyv12( |
| 1687 | 1691 | src[0], |
| @@ -1696,9 +1700,9 @@ static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t *src[], · 8 unmodified lines |
| 1696 | 1700 | return srcSliceH; |
| 1697 | 1701 | } |
| 1698 | 1702 | |
| 1699 | | −static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *src[], |
| 1700 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1701 | | − uint8_t *dst[], int dstStride[]) |
| 1703 | +static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *const src[], |
| 1704 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1705 | + uint8_t *const dst[], const int dstStride[]) |
| 1702 | 1706 | { |
| 1703 | 1707 | ff_copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW, |
| 1704 | 1708 | dst[0], dstStride[0]); |
| @@ -1712,9 +1716,9 @@ static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t *src[], · 7 unmodified lines |
| 1712 | 1716 | return srcSliceH; |
| 1713 | 1717 | } |
| 1714 | 1718 | |
| 1715 | | −static int uint_y_to_float_y_wrapper(SwsContext *c, const uint8_t *src[], |
| 1716 | | − int srcStride[], int srcSliceY, |
| 1717 | | − int srcSliceH, uint8_t *dst[], int dstStride[]) |
| 1719 | +static int uint_y_to_float_y_wrapper(SwsContext *c, const uint8_t *const src[], |
| 1720 | + const int srcStride[], int srcSliceY, |
| 1721 | + int srcSliceH, uint8_t *const dst[], const int dstStride[]) |
| 1718 | 1722 | { |
| 1719 | 1723 | int y, x; |
| 1720 | 1724 | ptrdiff_t dstStrideFloat = dstStride[0] >> 2; |
| @@ -1732,9 +1736,11 @@ static int uint_y_to_float_y_wrapper(SwsContext *c, const uint8_t *src[], · 11 unmodified lines |
| 1732 | 1736 | return srcSliceH; |
| 1733 | 1737 | } |
| 1734 | 1738 | |
| 1735 | | −static int float_y_to_uint_y_wrapper(SwsContext *c, const uint8_t* src[], |
| 1736 | | − int srcStride[], int srcSliceY, |
| 1737 | | − int srcSliceH, uint8_t* dst[], int dstStride[]) |
| 1739 | +static int float_y_to_uint_y_wrapper(SwsContext *c, |
| 1740 | + const uint8_t *const src[], |
| 1741 | + const int srcStride[], int srcSliceY, |
| 1742 | + int srcSliceH, uint8_t *const dst[], |
| 1743 | + const int dstStride[]) |
| 1738 | 1744 | { |
| 1739 | 1745 | int y, x; |
| 1740 | 1746 | ptrdiff_t srcStrideFloat = srcStride[0] >> 2; |
| @@ -1753,9 +1759,9 @@ static int float_y_to_uint_y_wrapper(SwsContext *c, const uint8_t* src[], · 12 unmodified lines |
| 1753 | 1759 | } |
| 1754 | 1760 | |
| 1755 | 1761 | /* unscaled copy like stuff (assumes nearly identical formats) */ |
| 1756 | | −static int packedCopyWrapper(SwsContext *c, const uint8_t *src[], |
| 1757 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1758 | | − uint8_t *dst[], int dstStride[]) |
| 1762 | +static int packedCopyWrapper(SwsContext *c, const uint8_t *const src[], |
| 1763 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1764 | + uint8_t *const dst[], const int dstStride[]) |
| 1759 | 1765 | { |
| 1760 | 1766 | if (dstStride[0] == srcStride[0] && srcStride[0] > 0) |
| 1761 | 1767 | memcpy(dst[0] + dstStride[0] * srcSliceY, src[0], srcSliceH * dstStride[0]); |
| @@ -1840,9 +1846,9 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t *src[], · 78 unmodified lines |
| 1840 | 1846 | }\ |
| 1841 | 1847 | } |
| 1842 | 1848 | |
| 1843 | | −static int planarCopyWrapper(SwsContext *c, const uint8_t *src[], |
| 1844 | | − int srcStride[], int srcSliceY, int srcSliceH, |
| 1845 | | − uint8_t *dst[], int dstStride[]) |
| 1849 | +static int planarCopyWrapper(SwsContext *c, const uint8_t *const src[], |
| 1850 | + const int srcStride[], int srcSliceY, int srcSliceH, |
| 1851 | + uint8_t *const dst[], const int dstStride[]) |
| 1846 | 1852 | { |
| 1847 | 1853 | const AVPixFmtDescriptor *desc_src = av_pix_fmt_desc_get(c->srcFormat); |
| 1848 | 1854 | const AVPixFmtDescriptor *desc_dst = av_pix_fmt_desc_get(c->dstFormat); |