sws: Check for unsupported combination of ED/FULL_CHR flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-19 21:43:54 +01:00
parent f94220ac7a
commit aef5c0b68f

View File

@ -1000,17 +1000,24 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
} }
} }
if (flags & SWS_ERROR_DIFFUSION && !(flags & SWS_FULL_CHR_H_INT)) { if(dstFormat == AV_PIX_FMT_BGR4_BYTE ||
if(dstFormat == AV_PIX_FMT_BGR4_BYTE || dstFormat == AV_PIX_FMT_RGB4_BYTE ||
dstFormat == AV_PIX_FMT_RGB4_BYTE || dstFormat == AV_PIX_FMT_BGR8 ||
dstFormat == AV_PIX_FMT_BGR8 || dstFormat == AV_PIX_FMT_RGB8) {
dstFormat == AV_PIX_FMT_RGB8) { if (flags & SWS_ERROR_DIFFUSION && !(flags & SWS_FULL_CHR_H_INT)) {
av_log(c, AV_LOG_DEBUG, av_log(c, AV_LOG_DEBUG,
"Error diffusion dither is only supported in full chroma interpolation for destination format '%s'\n", "Error diffusion dither is only supported in full chroma interpolation for destination format '%s'\n",
av_get_pix_fmt_name(dstFormat)); av_get_pix_fmt_name(dstFormat));
flags |= SWS_FULL_CHR_H_INT; flags |= SWS_FULL_CHR_H_INT;
c->flags = flags; c->flags = flags;
} }
if (!(flags & SWS_ERROR_DIFFUSION) && (flags & SWS_FULL_CHR_H_INT)) {
av_log(c, AV_LOG_DEBUG,
"Ordered dither is not supported in full chroma interpolation for destination format '%s'\n",
av_get_pix_fmt_name(dstFormat));
flags |= SWS_ERROR_DIFFUSION;
c->flags = flags;
}
} }
/* reuse chroma for 2 pixels RGB/BGR unless user wants full /* reuse chroma for 2 pixels RGB/BGR unless user wants full