RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sws_unscaled: drop fill_plane9or10() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-30 18:25:05 +01:00
parent a44c3ae3b0
commit 89d2f014bc
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libswscale/swscale_unscaled.c
View File

@ -159,27 +159,6 @@ static void fillPlane16(uint8_t *plane, int stride, int width, int height, int y
} }
} }
static void fill_plane9or10(uint8_t *plane, int stride, int width,
int height, int y, uint8_t val,
const int dst_depth, const int big_endian)
{
int i, j;
uint16_t *dst = (uint16_t *) (plane + stride * y);
#define FILL8TO9_OR_10(wfunc) \
for (i = 0; i < height; i++) { \
for (j = 0; j < width; j++) { \
wfunc(&dst[j], (val << (dst_depth - 8)) | \
(val >> (16 - dst_depth))); \
} \
dst += stride / 2; \
}
if (big_endian) {
FILL8TO9_OR_10(AV_WB16);
} else {
FILL8TO9_OR_10(AV_WL16);
}
}
static void copyPlane(const uint8_t *src, int srcStride, static void copyPlane(const uint8_t *src, int srcStride,
int srcSliceY, int srcSliceH, int width, int srcSliceY, int srcSliceH, int width,
uint8_t *dst, int dstStride) uint8_t *dst, int dstStride)
@ -807,7 +786,6 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
// ignore palette for GRAY8 // ignore palette for GRAY8
if (plane == 1 && !dst[2]) continue; if (plane == 1 && !dst[2]) continue;
if (!src[plane] || (plane == 1 && !src[2])) { if (!src[plane] || (plane == 1 && !src[2])) {
#if 1
if (is16BPS(c->dstFormat) || isNBPS(c->dstFormat)) { if (is16BPS(c->dstFormat) || isNBPS(c->dstFormat)) {
fillPlane16(dst[plane], dstStride[plane], length, height, y, fillPlane16(dst[plane], dstStride[plane], length, height, y,
plane == 3, desc_dst->comp[plane].depth_minus1, plane == 3, desc_dst->comp[plane].depth_minus1,
@ -816,19 +794,6 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
fillPlane(dst[plane], dstStride[plane], length, height, y, fillPlane(dst[plane], dstStride[plane], length, height, y,
(plane == 3) ? 255 : 128); (plane == 3) ? 255 : 128);
} }
#else
int val = (plane == 3) ? 255 : 128;
if (is16BPS(c->dstFormat))
length *= 2;
if (is9_OR_10BPS(c->dstFormat)) {
fill_plane9or10(dst[plane], dstStride[plane],
length, height, y, val,
desc_dst->comp[plane].depth_minus1 + 1,
isBE(c->dstFormat));
} else
fillPlane(dst[plane], dstStride[plane], length, height, y,
val);
#endif
} else { } else {
if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat) if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat)
|| (is16BPS(c->srcFormat) != is16BPS(c->dstFormat)) || (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))