virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

avcodec/nvenc: Handle non-square pixel aspect ratios

Browse Source 
Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Timo Rothenpieler 2015-01-26 13:28:22 +01:00 committed by Michael Niedermayer
parent a181169868
commit fb34c580bb
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/nvenc.c
View File

@ -472,6 +472,7 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
int i, num_mbs; int i, num_mbs;
int isLL = 0; int isLL = 0;
int res = 0; int res = 0;
int dw, dh;
#if NVENCAPI_MAJOR_VERSION < 5 #if NVENCAPI_MAJOR_VERSION < 5
GUID license = dummy_license; GUID license = dummy_license;
@ -572,8 +573,20 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx)
ctx->init_encode_params.encodeGUID = NV_ENC_CODEC_H264_GUID; ctx->init_encode_params.encodeGUID = NV_ENC_CODEC_H264_GUID;
ctx->init_encode_params.encodeHeight = avctx->height; ctx->init_encode_params.encodeHeight = avctx->height;
ctx->init_encode_params.encodeWidth = avctx->width; ctx->init_encode_params.encodeWidth = avctx->width;
ctx->init_encode_params.darHeight = avctx->height;
ctx->init_encode_params.darWidth = avctx->width; if (avctx->sample_aspect_ratio.num && avctx->sample_aspect_ratio.den &&
(avctx->sample_aspect_ratio.num != 1 || avctx->sample_aspect_ratio.num != 1)) {
av_reduce(&dw, &dh,
avctx->width * avctx->sample_aspect_ratio.num,
avctx->height * avctx->sample_aspect_ratio.den,
1024 * 1024);
ctx->init_encode_params.darHeight = dh;
ctx->init_encode_params.darWidth = dw;
} else {
ctx->init_encode_params.darHeight = avctx->height;
ctx->init_encode_params.darWidth = avctx->width;
}
ctx->init_encode_params.frameRateNum = avctx->time_base.den; ctx->init_encode_params.frameRateNum = avctx->time_base.den;
ctx->init_encode_params.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame; ctx->init_encode_params.frameRateDen = avctx->time_base.num * avctx->ticks_per_frame;