[FFmpeg-devel] [PATCH] libx265: Use x265_param_parse to set the SAR

[Michael Niedermayer]

On Tue, Apr 08, 2014 at 06:47:01PM +0100, Derek Buitenhuis wrote:
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
> ---
> This doesn't require an API requirement bump, and should be future proof.
> ---
>  libavcodec/libx265.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
> index 1788f65..48065f6 100644
> --- a/libavcodec/libx265.c
> +++ b/libavcodec/libx265.c
> @@ -77,6 +77,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
>  {
>      libx265Context *ctx = avctx->priv_data;
>      x265_nal *nal;
> +    char sar[10];
>      int sar_num, sar_den;
>      int nnal;
>  
> @@ -115,11 +116,11 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
>      av_reduce(&sar_num, &sar_den,
>                avctx->sample_aspect_ratio.num,
>                avctx->sample_aspect_ratio.den, 4096);
> -    ctx->params->vui.bEnableVuiParametersPresentFlag = 1;
> -    ctx->params->vui.bEnableAspectRatioIdc           = 1;
> -    ctx->params->vui.aspectRatioIdc                  = 255;
> -    ctx->params->vui.sarWidth                        = sar_num;
> -    ctx->params->vui.sarHeight                       = sar_den;
> +    snprintf(sar, 10, "%d:%d", sar_num, sar_den);

s/10/sizeof(sar)/

otherwise LGTM


> +    if (x265_param_parse(ctx->params, "sar", sar) == X265_PARAM_BAD_VALUE) {
> +        av_log(avctx, AV_LOG_ERROR, "Invalid SAR: %d:%d.\n", sar_num, sar_den);
> +        return AVERROR_INVALIDDATA;
> +    }
>  
>      if (x265_max_bit_depth == 8)
>          ctx->params->internalBitDepth = 8;
> -- 
> 1.9.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I am the wisest man alive, for I know one thing, and that is that I know
nothing. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140408/8343ad9b/attachment.asc>