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

h2652json: Fix mix-up of different enum types

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5873>
This commit is contained in:
Sebastian Dröge 2023-12-29 10:23:16 +02:00 committed by GStreamer Marge Bot
parent 1b86c9d370
commit 3cd00da0bc
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/ext/codec2json/gsth2652json.c
View file

@ -1500,8 +1500,8 @@ gst_h265_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
for (i = 0; i < self->split_nalu->len; i++) { for (i = 0; i < self->split_nalu->len; i++) {
GstH265NalUnit *nl = GstH265NalUnit *nl =
&g_array_index (self->split_nalu, GstH265NalUnit, i); &g_array_index (self->split_nalu, GstH265NalUnit, i);
pres = gst_h265_2_json_decode_nal (self, nl); ret = gst_h265_2_json_decode_nal (self, nl);
if (pres != GST_H265_PARSER_OK) if (ret != GST_FLOW_OK)
break; break;
} }
@ -1518,8 +1518,8 @@ gst_h265_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
pres = GST_H265_PARSER_OK; pres = GST_H265_PARSER_OK;
while (pres == GST_H265_PARSER_OK) { while (pres == GST_H265_PARSER_OK) {
pres = gst_h265_2_json_decode_nal (self, &nalu); ret = gst_h265_2_json_decode_nal (self, &nalu);
if (pres != GST_H265_PARSER_OK) if (ret != GST_FLOW_OK)
break; break;
pres = gst_h265_parser_identify_nalu (self->parser, pres = gst_h265_parser_identify_nalu (self->parser,
@ -1529,6 +1529,9 @@ gst_h265_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
} }
} }
if (ret != GST_FLOW_OK)
goto err;
json_string = get_string_from_json_object (json); json_string = get_string_from_json_object (json);
length = strlen (json_string); length = strlen (json_string);
out_buf = gst_buffer_new_allocate (NULL, length, NULL); out_buf = gst_buffer_new_allocate (NULL, length, NULL);
@ -1544,6 +1547,7 @@ gst_h265_2_json_chain (GstPad * sinkpad, GstObject * object, GstBuffer * in_buf)
GST_BUFFER_COPY_METADATA, 0, -1); GST_BUFFER_COPY_METADATA, 0, -1);
ret = gst_pad_push (self->srcpad, out_buf); ret = gst_pad_push (self->srcpad, out_buf);
err:
gst_buffer_unmap (in_buf, &in_map); gst_buffer_unmap (in_buf, &in_map);
gst_buffer_unref (in_buf); gst_buffer_unref (in_buf);