mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-21 19:40:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parse, h265parse: Fix time code calculation

Browse source 
We need to multiply for the nuit_field_based_flag before scaling, or
we'll lose precision and end up only adding even timecodes.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7241>
This commit is contained in:
Jan Alexander Steffens (heftig) 2024-07-25 17:50:26 +02:00 committed by GStreamer Marge Bot
parent 1f21d4a892
commit 5ca52ea026
2 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
subprojects/gst-plugins-bad/gst/videoparsers/gsth264parse.c
View file

@ -3388,8 +3388,7 @@ gst_h264_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
GstH264ClockTimestamp *tim =
&h264parse->pic_timing_sei.clock_timestamp[i];
gint field_count = -1;
guint64 n_frames_tmp;
guint n_frames = G_MAXUINT32;
guint64 n_frames = G_MAXUINT64;
GstVideoTimeCodeFlags flags = 0;
guint64 scale_n, scale_d;
@ -3467,19 +3466,17 @@ gst_h264_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
scale_n = (guint64) h264parse->parsed_fps_n * vui->num_units_in_tick;
scale_d = (guint64) h264parse->parsed_fps_d * vui->time_scale;
n_frames_tmp = gst_util_uint64_scale (tim->n_frames, scale_n, scale_d);
if (n_frames_tmp <= G_MAXUINT32) {
if (tim->nuit_field_based_flag)
n_frames_tmp *= 2;
scale_n *= 2;
if (n_frames_tmp <= G_MAXUINT32)
n_frames = (guint) n_frames_tmp;
}
n_frames = gst_util_uint64_scale (tim->n_frames, scale_n, scale_d);
if (n_frames != G_MAXUINT32) {
if (n_frames <= G_MAXUINT32) {
GST_LOG_OBJECT (h264parse,
"Add time code meta %02u:%02u:%02u:%02u",
tim->hours_value, tim->minutes_value, tim->seconds_value, n_frames);
tim->hours_flag ? tim->hours_value : 0,
tim->minutes_flag ? tim->minutes_value : 0,
tim->seconds_flag ? tim->seconds_value : 0, (guint) n_frames);
gst_buffer_add_video_time_code_meta_full (parse_buffer,
h264parse->parsed_fps_n,
@ -3488,8 +3485,11 @@ gst_h264_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
flags,
tim->hours_flag ? tim->hours_value : 0,
tim->minutes_flag ? tim->minutes_value : 0,
tim->seconds_flag ? tim->seconds_value : 0, n_frames, field_count);
}
tim->seconds_flag ? tim->seconds_value : 0,
(guint) n_frames, field_count);
} else
GST_WARNING_OBJECT (h264parse,
"Skipping time code meta, n_frames calculation failed");
}
h264parse->num_clock_timestamp = 0;

42
subprojects/gst-plugins-bad/gst/videoparsers/gsth265parse.c
View file

@ -3069,8 +3069,7 @@ gst_h265_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
for (i = 0; i < h265parse->time_code.num_clock_ts; i++) {
gint field_count = -1;
guint64 n_frames_tmp;
guint n_frames = G_MAXUINT32;
guint64 n_frames = G_MAXUINT64;
GstVideoTimeCodeFlags flags = 0;
guint64 scale_n, scale_d;
@ -3146,30 +3145,37 @@ gst_h265_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame)
scale_n = (guint64) h265parse->parsed_fps_n * vui->num_units_in_tick;
scale_d = (guint64) h265parse->parsed_fps_d * vui->time_scale;
n_frames_tmp =
gst_util_uint64_scale_int (h265parse->time_code.n_frames[i], scale_n,
scale_d);
if (n_frames_tmp <= G_MAXUINT32) {
if (h265parse->time_code.units_field_based_flag[i])
n_frames_tmp *= 2;
scale_n *= 2;
if (n_frames_tmp <= G_MAXUINT32)
n_frames = (guint) n_frames_tmp;
}
n_frames = gst_util_uint64_scale (h265parse->time_code.n_frames[i],
scale_n, scale_d);
if (n_frames <= G_MAXUINT32) {
GST_LOG_OBJECT (h265parse,
"Add time code meta %02u:%02u:%02u:%02u",
h265parse->time_code.hours_flag[i] ?
h265parse->time_code.hours_value[i] : 0,
h265parse->time_code.minutes_flag[i] ?
h265parse->time_code.minutes_value[i] : 0,
h265parse->time_code.seconds_flag[i] ?
h265parse->time_code.seconds_value[i] : 0, (guint) n_frames);
if (n_frames != G_MAXUINT32) {
gst_buffer_add_video_time_code_meta_full (parse_buffer,
h265parse->parsed_fps_n,
h265parse->parsed_fps_d,
NULL,
flags,
h265parse->time_code.hours_flag[i] ? h265parse->time_code.
hours_value[i] : 0,
h265parse->time_code.minutes_flag[i] ? h265parse->time_code.
minutes_value[i] : 0,
h265parse->time_code.seconds_flag[i] ? h265parse->time_code.
seconds_value[i] : 0, n_frames, field_count);
}
h265parse->time_code.hours_flag[i] ?
h265parse->time_code.hours_value[i] : 0,
h265parse->time_code.minutes_flag[i] ?
h265parse->time_code.minutes_value[i] : 0,
h265parse->time_code.seconds_flag[i] ?
h265parse->time_code.seconds_value[i] : 0,
(guint) n_frames, field_count);
} else
GST_WARNING_OBJECT (h265parse,
"Skipping time code meta, n_frames calculation failed");
}
}