Commit b91e0e59 authored by Timo Rothenpieler's avatar Timo Rothenpieler

avcodec/cuvid: check for and warn about invalid pkt_timebase

parent 132adf73
...@@ -258,7 +258,10 @@ static int cuvid_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -258,7 +258,10 @@ static int cuvid_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (avpkt->pts != AV_NOPTS_VALUE) { if (avpkt->pts != AV_NOPTS_VALUE) {
cupkt.flags = CUVID_PKT_TIMESTAMP; cupkt.flags = CUVID_PKT_TIMESTAMP;
cupkt.timestamp = av_rescale_q(avpkt->pts, avctx->pkt_timebase, (AVRational){1, 10000000}); if (avctx->pkt_timebase.num && avctx->pkt_timebase.den)
cupkt.timestamp = av_rescale_q(avpkt->pts, avctx->pkt_timebase, (AVRational){1, 10000000});
else
cupkt.timestamp = avpkt->pts;
} }
} else { } else {
cupkt.flags = CUVID_PKT_ENDOFSTREAM; cupkt.flags = CUVID_PKT_ENDOFSTREAM;
...@@ -363,7 +366,10 @@ static int cuvid_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -363,7 +366,10 @@ static int cuvid_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
frame->width = avctx->width; frame->width = avctx->width;
frame->height = avctx->height; frame->height = avctx->height;
frame->pts = av_rescale_q(dispinfo.timestamp, (AVRational){1, 10000000}, avctx->pkt_timebase); if (avctx->pkt_timebase.num && avctx->pkt_timebase.den)
frame->pts = av_rescale_q(dispinfo.timestamp, (AVRational){1, 10000000}, avctx->pkt_timebase);
else
frame->pts = dispinfo.timestamp;
/* CUVIDs opaque reordering breaks the internal pkt logic. /* CUVIDs opaque reordering breaks the internal pkt logic.
* So set pkt_pts and clear all the other pkt_ fields. * So set pkt_pts and clear all the other pkt_ fields.
...@@ -679,6 +685,9 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) ...@@ -679,6 +685,9 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx)
ctx->ever_flushed = 0; ctx->ever_flushed = 0;
if (!avctx->pkt_timebase.num || !avctx->pkt_timebase.den)
av_log(avctx, AV_LOG_WARNING, "Invalid pkt_timebase, passing timestamps as-is.\n");
return 0; return 0;
error: error:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment