mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

nvdec: Use upstream framerate if possible

Browse source 
Encoded bitstream might not have valid framerate. If upstream
provided non-variable-framerate (i.e., fps_n > 0 and fps_d > 0)
use upstream framerate instead of parsed one.
This commit is contained in:
Seungha Yang 2019-07-31 00:02:59 +09:00 committed by Sebastian Dröge
parent 158b4d8649
commit c99b160b50
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/nvcodec/gstnvdec.c
View file

@ -208,6 +208,7 @@ parser_sequence_callback (GstNvDec * nvdec, CUVIDEOFORMAT * format)
guint width, height, fps_n, fps_d; guint width, height, fps_n, fps_d;
CUVIDDECODECREATEINFO create_info = { 0, }; CUVIDDECODECREATEINFO create_info = { 0, };
GstVideoFormat out_format = GST_VIDEO_FORMAT_NV12; GstVideoFormat out_format = GST_VIDEO_FORMAT_NV12;
GstVideoInfo *info = &nvdec->input_state->info;
width = format->display_area.right - format->display_area.left; width = format->display_area.right - format->display_area.left;
height = format->display_area.bottom - format->display_area.top; height = format->display_area.bottom - format->display_area.top;
@ -273,8 +274,13 @@ parser_sequence_callback (GstNvDec * nvdec, CUVIDEOFORMAT * format)
} }
} }
fps_n = format->frame_rate.numerator; fps_n = GST_VIDEO_INFO_FPS_N (info);
fps_d = MAX (1, format->frame_rate.denominator); fps_d = GST_VIDEO_INFO_FPS_D (info);
if (fps_n < 1 || fps_d < 1) {
fps_n = format->frame_rate.numerator;
fps_d = MAX (1, format->frame_rate.denominator);
}
if (!gst_pad_has_current_caps (GST_VIDEO_DECODER_SRC_PAD (nvdec)) if (!gst_pad_has_current_caps (GST_VIDEO_DECODER_SRC_PAD (nvdec))
|| width != nvdec->width || height != nvdec->height || width != nvdec->width || height != nvdec->height