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

isomp4: Redefine gst_isoff_ symbols to gst_isoff_qt_

Browse source 
We need different symbol names, because these symbols are also present
in the fragmented plugin ... which will cause conflicts when doing
static linking
This commit is contained in:
Edward Hervey 2015-02-17 12:31:06 +01:00
parent ea1d67abe3
commit 6798dc7912
3 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gst/isomp4/gstisoff.c
View file

@ -26,23 +26,23 @@
#include <gst/base/gstbytereader.h>
void
gst_isoff_sidx_parser_init (GstSidxParser * parser)
gst_isoff_qt_sidx_parser_init (GstSidxParser * parser)
{
parser->status = GST_ISOFF_SIDX_PARSER_INIT;
parser->status = GST_ISOFF_QT_SIDX_PARSER_INIT;
parser->cumulative_entry_size = 0;
parser->sidx.entries = NULL;
parser->sidx.entries_count = 0;
}
void
gst_isoff_sidx_parser_clear (GstSidxParser * parser)
gst_isoff_qt_sidx_parser_clear (GstSidxParser * parser)
{
g_free (parser->sidx.entries);
parser->sidx.entries = NULL;
}
static void
gst_isoff_parse_sidx_entry (GstSidxBoxEntry * entry, GstByteReader * reader)
gst_isoff_qt_parse_sidx_entry (GstSidxBoxEntry * entry, GstByteReader * reader)
{
guint32 aux;
@ -57,10 +57,10 @@ gst_isoff_parse_sidx_entry (GstSidxBoxEntry * entry, GstByteReader * reader)
}
GstIsoffParserResult
gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
gint length, guint * consumed)
gst_isoff_qt_sidx_parser_add_data (GstSidxParser * parser,
const guint8 * buffer, gint length, guint * consumed)
{
GstIsoffParserResult res = GST_ISOFF_PARSER_OK;
GstIsoffParserResult res = GST_ISOFF_QT_PARSER_OK;
GstByteReader reader;
gsize remaining;
guint32 fourcc;
@ -68,15 +68,15 @@ gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
gst_byte_reader_init (&reader, buffer, length);
switch (parser->status) {
case GST_ISOFF_SIDX_PARSER_INIT:
if (gst_byte_reader_get_remaining (&reader) < GST_ISOFF_FULL_BOX_SIZE) {
case GST_ISOFF_QT_SIDX_PARSER_INIT:
if (gst_byte_reader_get_remaining (&reader) < GST_ISOFF_QT_FULL_BOX_SIZE) {
break;
}
parser->size = gst_byte_reader_get_uint32_be_unchecked (&reader);
fourcc = gst_byte_reader_get_uint32_le_unchecked (&reader);
if (fourcc != GST_ISOFF_FOURCC_SIDX) {
res = GST_ISOFF_PARSER_UNEXPECTED;
if (fourcc != GST_ISOFF_QT_FOURCC_SIDX) {
res = GST_ISOFF_QT_PARSER_UNEXPECTED;
gst_byte_reader_set_pos (&reader, 0);
break;
}
@ -89,16 +89,16 @@ gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
parser->size = gst_byte_reader_get_uint64_be_unchecked (&reader);
}
if (parser->size == 0) {
res = GST_ISOFF_PARSER_ERROR;
res = GST_ISOFF_QT_PARSER_ERROR;
gst_byte_reader_set_pos (&reader, 0);
break;
}
parser->sidx.version = gst_byte_reader_get_uint8_unchecked (&reader);
parser->sidx.flags = gst_byte_reader_get_uint24_le_unchecked (&reader);
parser->status = GST_ISOFF_SIDX_PARSER_HEADER;
parser->status = GST_ISOFF_QT_SIDX_PARSER_HEADER;
case GST_ISOFF_SIDX_PARSER_HEADER:
case GST_ISOFF_QT_SIDX_PARSER_HEADER:
remaining = gst_byte_reader_get_remaining (&reader);
if (remaining < 12 + (parser->sidx.version == 0 ? 8 : 16)) {
break;
@ -137,9 +137,9 @@ gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
}
parser->sidx.entry_index = 0;
parser->status = GST_ISOFF_SIDX_PARSER_DATA;
parser->status = GST_ISOFF_QT_SIDX_PARSER_DATA;
case GST_ISOFF_SIDX_PARSER_DATA:
case GST_ISOFF_QT_SIDX_PARSER_DATA:
while (parser->sidx.entry_index < parser->sidx.entries_count) {
GstSidxBoxEntry *entry =
&parser->sidx.entries[parser->sidx.entry_index];
@ -150,7 +150,7 @@ gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
entry->offset = parser->cumulative_entry_size;
entry->pts = parser->cumulative_pts;
gst_isoff_parse_sidx_entry (entry, &reader);
gst_isoff_qt_parse_sidx_entry (entry, &reader);
entry->duration = gst_util_uint64_scale_int_round (entry->duration,
GST_SECOND, parser->sidx.timescale);
parser->cumulative_entry_size += entry->size;
@ -166,12 +166,12 @@ gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
}
if (parser->sidx.entry_index == parser->sidx.entries_count)
parser->status = GST_ISOFF_SIDX_PARSER_FINISHED;
parser->status = GST_ISOFF_QT_SIDX_PARSER_FINISHED;
else
break;
case GST_ISOFF_SIDX_PARSER_FINISHED:
case GST_ISOFF_QT_SIDX_PARSER_FINISHED:
parser->sidx.entry_index = 0;
res = GST_ISOFF_PARSER_DONE;
res = GST_ISOFF_QT_PARSER_DONE;
break;
}
@ -180,18 +180,20 @@ gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer,
}
GstIsoffParserResult
gst_isoff_sidx_parser_add_buffer (GstSidxParser * parser, GstBuffer * buffer,
gst_isoff_qt_sidx_parser_add_buffer (GstSidxParser * parser, GstBuffer * buffer,
guint * consumed)
{
GstIsoffParserResult res = GST_ISOFF_PARSER_OK;
GstIsoffParserResult res = GST_ISOFF_QT_PARSER_OK;
GstMapInfo info;
if (!gst_buffer_map (buffer, &info, GST_MAP_READ)) {
*consumed = 0;
return GST_ISOFF_PARSER_ERROR;
return GST_ISOFF_QT_PARSER_ERROR;
}
res = gst_isoff_sidx_parser_add_data (parser, info.data, info.size, consumed);
res =
gst_isoff_qt_sidx_parser_add_data (parser, info.data, info.size,
consumed);
gst_buffer_unmap (buffer, &info);
return res;

34
gst/isomp4/gstisoff.h
View file

@ -22,25 +22,25 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_ISOFF_H__
#define __GST_ISOFF_H__
#ifndef __GST_ISOFF_QT_H__
#define __GST_ISOFF_QT_H__
#include <gst/gst.h>
G_BEGIN_DECLS
typedef enum {
GST_ISOFF_PARSER_OK,
GST_ISOFF_PARSER_DONE,
GST_ISOFF_PARSER_UNEXPECTED,
GST_ISOFF_PARSER_ERROR
GST_ISOFF_QT_PARSER_OK,
GST_ISOFF_QT_PARSER_DONE,
GST_ISOFF_QT_PARSER_UNEXPECTED,
GST_ISOFF_QT_PARSER_ERROR
} GstIsoffParserResult;
/* this is the minimum size, it can be larger if it
* uses extended size or type */
#define GST_ISOFF_FULL_BOX_SIZE 12
#define GST_ISOFF_QT_FULL_BOX_SIZE 12
#define GST_ISOFF_FOURCC_SIDX GST_MAKE_FOURCC('s','i','d','x')
#define GST_ISOFF_QT_FOURCC_SIDX GST_MAKE_FOURCC('s','i','d','x')
typedef struct _GstSidxBoxEntry
{
gboolean ref_type;
@ -72,10 +72,10 @@ typedef struct _GstSidxBox
typedef enum _GstSidxParserStatus
{
GST_ISOFF_SIDX_PARSER_INIT,
GST_ISOFF_SIDX_PARSER_HEADER,
GST_ISOFF_SIDX_PARSER_DATA,
GST_ISOFF_SIDX_PARSER_FINISHED
GST_ISOFF_QT_SIDX_PARSER_INIT,
GST_ISOFF_QT_SIDX_PARSER_HEADER,
GST_ISOFF_QT_SIDX_PARSER_DATA,
GST_ISOFF_QT_SIDX_PARSER_FINISHED
} GstSidxParserStatus;
typedef struct _GstSidxParser
@ -89,12 +89,12 @@ typedef struct _GstSidxParser
GstSidxBox sidx;
} GstSidxParser;
void gst_isoff_sidx_parser_init (GstSidxParser * parser);
void gst_isoff_sidx_parser_clear (GstSidxParser * parser);
GstIsoffParserResult gst_isoff_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer, gint length, guint * consumed);
GstIsoffParserResult gst_isoff_sidx_parser_add_buffer (GstSidxParser * parser, GstBuffer * buf, guint * consumed);
void gst_isoff_qt_sidx_parser_init (GstSidxParser * parser);
void gst_isoff_qt_sidx_parser_clear (GstSidxParser * parser);
GstIsoffParserResult gst_isoff_qt_sidx_parser_add_data (GstSidxParser * parser, const guint8 * buffer, gint length, guint * consumed);
GstIsoffParserResult gst_isoff_qt_sidx_parser_add_buffer (GstSidxParser * parser, GstBuffer * buf, guint * consumed);
G_END_DECLS
#endif /* __GST_ISOFF_H__ */
#endif /* __GST_ISOFF_QT_H__ */

9
gst/isomp4/qtdemux.c
View file

@ -2339,15 +2339,16 @@ qtdemux_parse_sidx (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
GstIsoffParserResult res;
guint consumed;
gst_isoff_sidx_parser_init (&sidx_parser);
gst_isoff_qt_sidx_parser_init (&sidx_parser);
res =
gst_isoff_sidx_parser_add_data (&sidx_parser, buffer, length, &consumed);
gst_isoff_qt_sidx_parser_add_data (&sidx_parser, buffer, length,
&consumed);
GST_DEBUG_OBJECT (qtdemux, "sidx parse result: %d", res);
if (res == GST_ISOFF_PARSER_DONE) {
if (res == GST_ISOFF_QT_PARSER_DONE) {
check_update_duration (qtdemux, sidx_parser.cumulative_pts);
}
gst_isoff_sidx_parser_clear (&sidx_parser);
gst_isoff_qt_sidx_parser_clear (&sidx_parser);
}
/* caller verifies at least 8 bytes in buf */