mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-01 04:13:57 +00:00
swscale: use Nbit code to handle !is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
42c9bd313f
commit
53789a27f8
@ -1898,7 +1898,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
|
||||
fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
|
||||
} else {
|
||||
if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat)
|
||||
|| (is16BPS(c->srcFormat) && !is16BPS(c->dstFormat))
|
||||
|| (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))
|
||||
) {
|
||||
const int src_depth = av_pix_fmt_descriptors[c->srcFormat].comp[plane].depth_minus1+1;
|
||||
const int dst_depth = av_pix_fmt_descriptors[c->dstFormat].comp[plane].depth_minus1+1;
|
||||
@ -1940,15 +1940,6 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
|
||||
DITHER_COPY(dstPtr2, dstStride[plane]/2, srcPtr2, srcStride[plane]/2, av_bswap16)
|
||||
}
|
||||
}
|
||||
} else if(!is16BPS(c->srcFormat) && is16BPS(c->dstFormat)) {
|
||||
for (i=0; i<height; i++) {
|
||||
for (j=0; j<length; j++) {
|
||||
dstPtr[ j<<1 ] = srcPtr[j];
|
||||
dstPtr[(j<<1)+1] = srcPtr[j];
|
||||
}
|
||||
srcPtr+= srcStride[plane];
|
||||
dstPtr+= dstStride[plane];
|
||||
}
|
||||
} else if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
|
||||
&& isBE(c->srcFormat) != isBE(c->dstFormat)) {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user