mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-03-25 04:19:05 +00:00
libx265: Use x265_param_parse to set the SAR
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
parent
e1c48e3593
commit
8945dcbb52
@ -77,6 +77,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
|
|||||||
{
|
{
|
||||||
libx265Context *ctx = avctx->priv_data;
|
libx265Context *ctx = avctx->priv_data;
|
||||||
x265_nal *nal;
|
x265_nal *nal;
|
||||||
|
char sar[10];
|
||||||
int sar_num, sar_den;
|
int sar_num, sar_den;
|
||||||
int nnal;
|
int nnal;
|
||||||
|
|
||||||
@ -115,11 +116,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
|
|||||||
av_reduce(&sar_num, &sar_den,
|
av_reduce(&sar_num, &sar_den,
|
||||||
avctx->sample_aspect_ratio.num,
|
avctx->sample_aspect_ratio.num,
|
||||||
avctx->sample_aspect_ratio.den, 4096);
|
avctx->sample_aspect_ratio.den, 4096);
|
||||||
ctx->params->vui.bEnableVuiParametersPresentFlag = 1;
|
snprintf(sar, sizeof(sar), "%d:%d", sar_num, sar_den);
|
||||||
ctx->params->vui.bEnableAspectRatioIdc = 1;
|
if (x265_param_parse(ctx->params, "sar", sar) == X265_PARAM_BAD_VALUE) {
|
||||||
ctx->params->vui.aspectRatioIdc = 255;
|
av_log(avctx, AV_LOG_ERROR, "Invalid SAR: %d:%d.\n", sar_num, sar_den);
|
||||||
ctx->params->vui.sarWidth = sar_num;
|
return AVERROR_INVALIDDATA;
|
||||||
ctx->params->vui.sarHeight = sar_den;
|
}
|
||||||
|
|
||||||
if (x265_max_bit_depth == 8)
|
if (x265_max_bit_depth == 8)
|
||||||
ctx->params->internalBitDepth = 8;
|
ctx->params->internalBitDepth = 8;
|
||||||
|
Loading…
Reference in New Issue
Block a user