mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 23:36:38 +00:00
gst/qtdemux/qtdemux.c: Clean up one piece of logic slightly and remove a dead code block.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): Clean up one piece of logic slightly and remove a dead code block.
This commit is contained in:
parent
1228d439e3
commit
e73a19cb48
1 changed files with 7 additions and 17 deletions
|
@ -3229,27 +3229,17 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
|
||||||
|
|
||||||
mp4a = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4a);
|
mp4a = qtdemux_tree_get_child_by_type (stsd, FOURCC_mp4a);
|
||||||
wave = NULL;
|
wave = NULL;
|
||||||
if (mp4a)
|
|
||||||
wave = qtdemux_tree_get_child_by_type (mp4a, FOURCC_wave);
|
|
||||||
|
|
||||||
esds = NULL;
|
esds = NULL;
|
||||||
if (wave)
|
if (mp4a) {
|
||||||
esds = qtdemux_tree_get_child_by_type (wave, FOURCC_esds);
|
wave = qtdemux_tree_get_child_by_type (mp4a, FOURCC_wave);
|
||||||
else if (mp4a)
|
if (wave)
|
||||||
esds = qtdemux_tree_get_child_by_type (mp4a, FOURCC_esds);
|
esds = qtdemux_tree_get_child_by_type (wave, FOURCC_esds);
|
||||||
|
if (!esds)
|
||||||
|
esds = qtdemux_tree_get_child_by_type (mp4a, FOURCC_esds);
|
||||||
|
}
|
||||||
|
|
||||||
if (esds) {
|
if (esds) {
|
||||||
gst_qtdemux_handle_esds (qtdemux, stream, esds);
|
gst_qtdemux_handle_esds (qtdemux, stream, esds);
|
||||||
#if 0
|
|
||||||
GstBuffer *buffer;
|
|
||||||
int len = QTDEMUX_GUINT32_GET (esds->data);
|
|
||||||
|
|
||||||
buffer = gst_buffer_new_and_alloc (len - 8);
|
|
||||||
memcpy (GST_BUFFER_DATA (buffer), esds->data + 8, len - 8);
|
|
||||||
|
|
||||||
gst_caps_set_simple (stream->caps, "codec_data",
|
|
||||||
GST_TYPE_BUFFER, buffer, NULL);
|
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
if (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4) ==
|
if (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4) ==
|
||||||
GST_MAKE_FOURCC ('Q', 'D', 'M', '2')) {
|
GST_MAKE_FOURCC ('Q', 'D', 'M', '2')) {
|
||||||
|
|
Loading…
Reference in a new issue