Skip to content

Commit a0b4b14

Browse files
author
Alexander Matveev
committed
8227473: Improve gstreamer media support
Reviewed-by: kcr, rhalade
1 parent 0ff02bb commit a0b4b14

File tree

1 file changed

+24
-0
lines changed
  • modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-bad/gst/aiff

1 file changed

+24
-0
lines changed

modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-bad/gst/aiff/aiffparse.c

+24
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,11 @@ gst_aiff_parse_calculate_duration (GstAiffParse * aiff)
643643
return FALSE;
644644
}
645645

646+
#ifdef GSTREAMER_LITE
647+
static gboolean
648+
#else
646649
static void
650+
#endif
647651
gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size)
648652
{
649653
#ifdef GSTREAMER_LITE
@@ -654,7 +658,11 @@ gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size)
654658

655659
if (aiff->streaming) {
656660
if (!gst_aiff_parse_peek_chunk (aiff, &tag, &size))
661+
#ifdef GSTREAMER_LITE
662+
return FALSE;
663+
#else
657664
return;
665+
#endif
658666
}
659667
GST_WARNING_OBJECT (aiff, "Ignoring tag %" GST_FOURCC_FORMAT,
660668
GST_FOURCC_ARGS (tag));
@@ -667,6 +675,10 @@ gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size)
667675
if (aiff->streaming) {
668676
gst_adapter_flush (aiff->adapter, flush);
669677
}
678+
679+
#ifdef GSTREAMER_LITE
680+
return TRUE;
681+
#endif
670682
}
671683

672684
static double
@@ -1124,11 +1136,23 @@ gst_aiff_parse_stream_headers (GstAiffParse * aiff)
11241136
}
11251137
case GST_MAKE_FOURCC ('C', 'H', 'A', 'N'):{
11261138
GST_FIXME_OBJECT (aiff, "Handle CHAN chunk with channel layouts");
1139+
#ifdef GSTREAMER_LITE
1140+
if (!gst_aiff_parse_ignore_chunk (aiff, tag, size)) {
1141+
return GST_FLOW_OK;
1142+
}
1143+
#else
11271144
gst_aiff_parse_ignore_chunk (aiff, tag, size);
1145+
#endif
11281146
break;
11291147
}
11301148
default:
1149+
#ifdef GSTREAMER_LITE
1150+
if (!gst_aiff_parse_ignore_chunk (aiff, tag, size)) {
1151+
return GST_FLOW_OK;
1152+
}
1153+
#else
11311154
gst_aiff_parse_ignore_chunk (aiff, tag, size);
1155+
#endif
11321156
}
11331157

11341158
buf = NULL;

0 commit comments

Comments
 (0)