diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2016-09-07 19:15:22 +0300 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2016-09-07 19:44:10 +0300 |
| commit | fa3ecad071aadec810fe7fc8e74865778e477c5e (patch) | |
| tree | e114efa33dac7b83f67c989846bb70f4b8406fc7 /libavcodec | |
| parent | 96cba1c5524eb0cc1395aa7586e4c3b25092a7ec (diff) | |
avcodec/nvenc: correctly set inputPitch
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nvenc.c | 3 | ||||
| -rw-r--r-- | libavcodec/nvenc.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index c53341dae4..b335116007 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1403,6 +1403,7 @@ static int nvenc_upload_frame(AVCodecContext *avctx, const AVFrame *frame, ctx->registered_frames[reg_idx].mapped = 1; nvenc_frame->reg_idx = reg_idx; nvenc_frame->input_surface = nvenc_frame->in_map.mappedResource; + nvenc_frame->pitch = frame->linesize[0]; return 0; } else { NV_ENC_LOCK_INPUT_BUFFER lockBufferParams = { 0 }; @@ -1415,6 +1416,7 @@ static int nvenc_upload_frame(AVCodecContext *avctx, const AVFrame *frame, return nvenc_print_error(avctx, nv_status, "Failed locking nvenc input buffer"); } + nvenc_frame->pitch = lockBufferParams.pitch; res = nvenc_copy_frame(avctx, nvenc_frame, &lockBufferParams, frame); nv_status = p_nvenc->nvEncUnlockInputBuffer(ctx->nvencoder, nvenc_frame->input_surface); @@ -1655,6 +1657,7 @@ int ff_nvenc_encode_frame(AVCodecContext *avctx, AVPacket *pkt, pic_params.bufferFmt = inSurf->format; pic_params.inputWidth = avctx->width; pic_params.inputHeight = avctx->height; + pic_params.inputPitch = inSurf->pitch; pic_params.outputBitstream = inSurf->output_surface; if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index c57f1ae524..521902c77d 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -56,6 +56,7 @@ typedef struct NvencSurface int reg_idx; int width; int height; + int pitch; NV_ENC_OUTPUT_PTR output_surface; NV_ENC_BUFFER_FORMAT format; |