dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-10 17:14:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

swscale/format: add source format info to ff_sws_encode_colors()

Browse Source 
Specifically, I need access to this for generating a better dither matrix.
This commit is contained in:
Niklas Haas
2025-12-08 13:04:23 +01:00
committed by Niklas Haas
parent 3f7e3cedb5
commit d5174f9e5b
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libswscale/format.c
View File

@@ -1157,15 +1157,16 @@ static bool trc_is_hdr(enum AVColorTransferCharacteristic trc)
}
static int fmt_dither(SwsContext *ctx, SwsOpList *ops,
const SwsPixelType type, const SwsFormat fmt)
const SwsPixelType type,
const SwsFormat src, const SwsFormat dst)
{
SwsDither mode = ctx->dither;
SwsDitherOp dither;
if (mode == SWS_DITHER_AUTO) {
/* Visual threshold of perception: 12 bits for SDR, 14 bits for HDR */
const int jnd_bits = trc_is_hdr(fmt.color.trc) ? 14 : 12;
const int bpc = fmt.desc->comp[0].depth;
const int jnd_bits = trc_is_hdr(dst.color.trc) ? 14 : 12;
const int bpc = dst.desc->comp[0].depth;
mode = bpc >= jnd_bits ? SWS_DITHER_NONE : SWS_DITHER_BAYER;
}
@@ -1319,11 +1320,12 @@ int ff_sws_decode_colors(SwsContext *ctx, SwsPixelType type,
}
int ff_sws_encode_colors(SwsContext *ctx, SwsPixelType type,
SwsOpList *ops, const SwsFormat fmt, bool *incomplete)
SwsOpList *ops, const SwsFormat src,
const SwsFormat dst, bool *incomplete)
{
const AVLumaCoefficients *c = av_csp_luma_coeffs_from_avcsp(fmt.csp);
const AVLumaCoefficients *c = av_csp_luma_coeffs_from_avcsp(dst.csp);
switch (fmt.csp) {
switch (dst.csp) {
case AVCOL_SPC_RGB:
break;
case AVCOL_SPC_UNSPECIFIED:
@@ -1386,20 +1388,20 @@ int ff_sws_encode_colors(SwsContext *ctx, SwsPixelType type,
RET(ff_sws_op_list_append(ops, &(SwsOp) {
.type = type,
.op = SWS_OP_LINEAR,
.lin = fmt_encode_range(fmt, incomplete),
.lin = fmt_encode_range(dst, incomplete),
}));
if (!(fmt.desc->flags & AV_PIX_FMT_FLAG_FLOAT)) {
if (!(dst.desc->flags & AV_PIX_FMT_FLAG_FLOAT)) {
SwsConst range = {0};
const bool is_ya = fmt.desc->nb_components == 2;
for (int i = 0; i < fmt.desc->nb_components; i++) {
const bool is_ya = dst.desc->nb_components == 2;
for (int i = 0; i < dst.desc->nb_components; i++) {
/* Clamp to legal pixel range */
const int idx = i * (is_ya ? 3 : 1);
range.q4[idx] = Q((1 << fmt.desc->comp[i].depth) - 1);
range.q4[idx] = Q((1 << dst.desc->comp[i].depth) - 1);
}
RET(fmt_dither(ctx, ops, type, fmt));
RET(fmt_dither(ctx, ops, type, src, dst));
RET(ff_sws_op_list_append(ops, &(SwsOp) {
.op = SWS_OP_MAX,
.type = type,
@@ -1416,7 +1418,7 @@ int ff_sws_encode_colors(SwsContext *ctx, SwsPixelType type,
return ff_sws_op_list_append(ops, &(SwsOp) {
.type = type,
.op = SWS_OP_CONVERT,
.convert.to = fmt_pixel_type(fmt.format),
.convert.to = fmt_pixel_type(dst.format),
});
}

3
libswscale/format.h
View File

@@ -169,6 +169,7 @@ int ff_sws_encode_pixfmt(SwsOpList *ops, enum AVPixelFormat fmt);
int ff_sws_decode_colors(SwsContext *ctx, SwsPixelType type, SwsOpList *ops,
const SwsFormat fmt, bool *incomplete);
int ff_sws_encode_colors(SwsContext *ctx, SwsPixelType type, SwsOpList *ops,
const SwsFormat fmt, bool *incomplete);
const SwsFormat src, const SwsFormat dst,
bool *incomplete);
#endif /* SWSCALE_FORMAT_H */

2
libswscale/graph.c
View File

@@ -502,7 +502,7 @@ static int add_convert_pass(SwsGraph *graph, SwsFormat src, SwsFormat dst,
ret = ff_sws_decode_colors(ctx, type, ops, src, &graph->incomplete);
if (ret < 0)
goto fail;
ret = ff_sws_encode_colors(ctx, type, ops, dst, &graph->incomplete);
ret = ff_sws_encode_colors(ctx, type, ops, src, dst, &graph->incomplete);
if (ret < 0)
goto fail;
ret = ff_sws_encode_pixfmt(ops, dst.format);

2
libswscale/tests/sws_ops.c
View File

@@ -48,7 +48,7 @@ static int run_test(SwsContext *const ctx, AVFrame *frame,
goto fail;
if (ff_sws_decode_colors(ctx, SWS_PIXEL_F32, ops, src, &incomplete) < 0)
goto fail;
if (ff_sws_encode_colors(ctx, SWS_PIXEL_F32, ops, dst, &incomplete) < 0)
if (ff_sws_encode_colors(ctx, SWS_PIXEL_F32, ops, src, dst, &incomplete) < 0)
goto fail;
if (ff_sws_encode_pixfmt(ops, dst.format) < 0)
goto fail;