virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/cuvid: support a pre-initialized hw_frames_ctx

Browse Source
This commit is contained in:
Timo Rothenpieler 2016-09-29 18:58:49 +02:00
parent f0ea96d8a2
commit 49511501aa
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/cuvid.c
View File

@ -52,7 +52,6 @@ typedef struct CuvidContext
int64_t prev_pts; int64_t prev_pts;
int internal_error; int internal_error;
int ever_flushed;
int decoder_flushing; int decoder_flushing;
cudaVideoCodec codec_type; cudaVideoCodec codec_type;
@ -145,8 +144,12 @@ static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT* form
return 0; return 0;
} }
if (hwframe_ctx->pool && !ctx->ever_flushed) { if (hwframe_ctx->pool && (
av_log(avctx, AV_LOG_ERROR, "AVHWFramesContext is already initialized\n"); hwframe_ctx->width < avctx->width ||
hwframe_ctx->height < avctx->height ||
hwframe_ctx->format != AV_PIX_FMT_CUDA ||
hwframe_ctx->sw_format != AV_PIX_FMT_NV12)) {
av_log(avctx, AV_LOG_ERROR, "AVHWFramesContext is already initialized with incompatible parameters\n");
ctx->internal_error = AVERROR(EINVAL); ctx->internal_error = AVERROR(EINVAL);
return 0; return 0;
} }
@ -805,8 +808,6 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
if (ret < 0) if (ret < 0)
goto error; goto error;
ctx->ever_flushed = 0;
ctx->prev_pts = INT64_MIN; ctx->prev_pts = INT64_MIN;
if (!avctx->pkt_timebase.num || !avctx->pkt_timebase.den) if (!avctx->pkt_timebase.num || !avctx->pkt_timebase.den)
@ -828,8 +829,6 @@ static void cuvid_flush(AVCodecContext *avctx)
CUVIDSOURCEDATAPACKET seq_pkt = { 0 }; CUVIDSOURCEDATAPACKET seq_pkt = { 0 };
int ret; int ret;
ctx->ever_flushed = 1;
ret = CHECK_CU(cuCtxPushCurrent(cuda_ctx)); ret = CHECK_CU(cuCtxPushCurrent(cuda_ctx));
if (ret < 0) if (ret < 0)
goto error; goto error;