mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
avcodec/dnxhddec: Do not overwrite colorspace if the container has set it.
The existing logic overrides container metadata even in cases where the container metadata must be trusted (e.g. HDR). The original spec had no provision for specifying color volume, so many files rely on the assumption of Rec. 709. An update to the spec included a 'clv' field for explicitly signaling that the container should be trusted in an existing bitfield in the frame header, but the default of 0 from old encoders forces Rec. 709, which would break any HDR stream. Because there is no place in DNxHR for specifying a transfer function, DNxHR HDR files must include container-level color information. This patch maintains the existing behavior of choosing the 709 over the 601 matrix when container-level information is missing, and allows container-level information to win if present. Signed-off-by: Steven Robertson <steven@strobe.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
d268094f88
commit
c6a905b91d
@ -93,7 +93,9 @@ static av_cold int dnxhd_decode_init(AVCodecContext *avctx)
|
|||||||
|
|
||||||
ctx->avctx = avctx;
|
ctx->avctx = avctx;
|
||||||
ctx->cid = -1;
|
ctx->cid = -1;
|
||||||
avctx->colorspace = AVCOL_SPC_BT709;
|
if (avctx->colorspace == AVCOL_SPC_UNSPECIFIED) {
|
||||||
|
avctx->colorspace = AVCOL_SPC_BT709;
|
||||||
|
}
|
||||||
|
|
||||||
avctx->coded_width = FFALIGN(avctx->width, 16);
|
avctx->coded_width = FFALIGN(avctx->width, 16);
|
||||||
avctx->coded_height = FFALIGN(avctx->height, 16);
|
avctx->coded_height = FFALIGN(avctx->height, 16);
|
||||||
|
Loading…
Reference in New Issue
Block a user