mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
ext/mad/gstmad.c: Allow for mp3 rate/channels changes. However, only very conservatively. Reason that we *have* to en...
Original commit message from CVS: * ext/mad/gstmad.c: (gst_mad_check_caps_reset), (gst_mad_change_state): Allow for mp3 rate/channels changes. However, only very conservatively. Reason that we *have* to enable this is smiply because the mad find_sync() function is not good enough, it will regularly sync on random data as valid frames and therefore make us provide random caps as *final* caps of the stream. The best fix I could think of is to simply require several of the same stream changes in a row before we change caps. The actual testcase that works now is # * ext/ogg/Makefile.am: * ext/ogg/gstogg.c: (plugin_init): * ext/ogg/gstogmparse.c: OGM support (video only for now; I need an audio sample file). * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_base_init), (gst_asf_demux_process_stream), (gst_asf_demux_video_caps), (gst_asf_demux_add_video_stream): WMV extradata. * gst/playback/gstplaybasebin.c: (unknown_type): Don't error out on single unknown-types after all. It's wrong. If we found type of video and audio but not of a subtitle stream, it will still error out (which is unwanted). Will find a better fix later on. * gst/typefind/gsttypefindfunctions.c: (ogmvideo_type_find), (ogmaudio_type_find), (plugin_init): OGM support.
This commit is contained in:
parent
9f243e2ca0
commit
823ceafca7
6 changed files with 560 additions and 5 deletions
29
ChangeLog
29
ChangeLog
|
@ -1,3 +1,32 @@
|
|||
2004-09-20 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* ext/mad/gstmad.c: (gst_mad_check_caps_reset),
|
||||
(gst_mad_change_state):
|
||||
Allow for mp3 rate/channels changes. However, only very
|
||||
conservatively. Reason that we *have* to enable this is smiply
|
||||
because the mad find_sync() function is not good enough, it will
|
||||
regularly sync on random data as valid frames and therefore make
|
||||
us provide random caps as *final* caps of the stream. The best fix
|
||||
I could think of is to simply require several of the same stream
|
||||
changes in a row before we change caps.
|
||||
The actual testcase that works now is #
|
||||
* ext/ogg/Makefile.am:
|
||||
* ext/ogg/gstogg.c: (plugin_init):
|
||||
* ext/ogg/gstogmparse.c:
|
||||
OGM support (video only for now; I need an audio sample file).
|
||||
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_base_init),
|
||||
(gst_asf_demux_process_stream), (gst_asf_demux_video_caps),
|
||||
(gst_asf_demux_add_video_stream):
|
||||
WMV extradata.
|
||||
* gst/playback/gstplaybasebin.c: (unknown_type):
|
||||
Don't error out on single unknown-types after all. It's wrong.
|
||||
If we found type of video and audio but not of a subtitle stream,
|
||||
it will still error out (which is unwanted). Will find a better fix
|
||||
later on.
|
||||
* gst/typefind/gsttypefindfunctions.c: (ogmvideo_type_find),
|
||||
(ogmaudio_type_find), (plugin_init):
|
||||
OGM support.
|
||||
|
||||
2004-09-20 Johan Dahlin <johan@gnome.org>
|
||||
|
||||
* ext/jpeg/gstjpegdec.c (gst_jpegdec_chain): Allocate the buffer
|
||||
|
|
|
@ -2,8 +2,12 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
|
|||
|
||||
plugin_LTLIBRARIES = libgstogg.la
|
||||
|
||||
libgstogg_la_SOURCES = gstogg.c gstoggdemux.c gstoggmux.c
|
||||
libgstogg_la_SOURCES = \
|
||||
gstogg.c \
|
||||
gstoggdemux.c \
|
||||
gstoggmux.c \
|
||||
gstogmparse.c
|
||||
|
||||
libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS)
|
||||
libgstogg_la_LIBADD = $(OGG_LIBS)
|
||||
libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
extern gboolean gst_ogg_demux_plugin_init (GstPlugin * plugin);
|
||||
extern gboolean gst_ogg_mux_plugin_init (GstPlugin * plugin);
|
||||
extern gboolean gst_ogm_parse_plugin_init (GstPlugin * plugin);
|
||||
|
||||
GST_DEBUG_CATEGORY (vorbisdec_debug);
|
||||
|
||||
|
@ -36,6 +37,7 @@ plugin_init (GstPlugin * plugin)
|
|||
|
||||
gst_ogg_demux_plugin_init (plugin);
|
||||
gst_ogg_mux_plugin_init (plugin);
|
||||
gst_ogm_parse_plugin_init (plugin);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
485
ext/ogg/gstogmparse.c
Normal file
485
ext/ogg/gstogmparse.c
Normal file
|
@ -0,0 +1,485 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||
*
|
||||
* gstogmparse.c: OGM stream header parsing (and data passthrough)
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/riff/riff-media.h>
|
||||
|
||||
GST_DEBUG_CATEGORY_STATIC (gst_ogm_parse_debug);
|
||||
#define GST_CAT_DEFAULT gst_ogm_parse_debug
|
||||
|
||||
#define GST_TYPE_OGM_VIDEO_PARSE (gst_ogm_video_parse_get_type())
|
||||
#define GST_TYPE_OGM_AUDIO_PARSE (gst_ogm_audio_parse_get_type())
|
||||
|
||||
#define GST_TYPE_OGM_PARSE (gst_ogm_parse_get_type())
|
||||
#define GST_OGM_PARSE(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_OGM_PARSE, GstOgmParse))
|
||||
#define GST_OGM_PARSE_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_OGM_PARSE, GstOgmParse))
|
||||
#define GST_IS_OGM_PARSE(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_OGM_PARSE))
|
||||
#define GST_IS_OGM_PARSE_CLASS(obj) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_OGM_PARSE))
|
||||
|
||||
typedef struct _stream_header_video
|
||||
{
|
||||
gint32 width;
|
||||
gint32 height;
|
||||
} stream_header_video;
|
||||
|
||||
typedef struct _stream_header_audio
|
||||
{
|
||||
gint16 channels;
|
||||
gint16 blockalign;
|
||||
gint32 avgbytespersec;
|
||||
} stream_header_audio;
|
||||
|
||||
typedef struct _stream_header
|
||||
{
|
||||
gchar streamtype[8];
|
||||
gchar subtype[4];
|
||||
|
||||
/* size of the structure */
|
||||
gint32 size;
|
||||
|
||||
/* in reference time */
|
||||
gint64 time_unit;
|
||||
|
||||
gint64 samples_per_unit;
|
||||
|
||||
/* in media time */
|
||||
gint32 default_len;
|
||||
|
||||
gint32 buffersize;
|
||||
gint32 bits_per_sample;
|
||||
|
||||
union
|
||||
{
|
||||
stream_header_video video;
|
||||
stream_header_audio audio;
|
||||
} s;
|
||||
} stream_header;
|
||||
|
||||
typedef struct _GstOgmParse
|
||||
{
|
||||
GstElement element;
|
||||
|
||||
/* pads */
|
||||
GstPad *srcpad, *sinkpad;
|
||||
|
||||
/* audio or video */
|
||||
stream_header hdr;
|
||||
} GstOgmParse;
|
||||
|
||||
typedef struct _GstOgmParseClass
|
||||
{
|
||||
GstElementClass parent_class;
|
||||
} GstOgmParseClass;
|
||||
|
||||
static GstStaticPadTemplate ogm_video_parse_sink_template_factory =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-ogm-video"));
|
||||
static GstStaticPadTemplate ogm_audio_parse_sink_template_factory =
|
||||
GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
|
||||
GST_STATIC_CAPS ("application/x-ogm-audio"));
|
||||
static GstPadTemplate *video_src_templ, *audio_src_templ;
|
||||
|
||||
static GType gst_ogm_audio_parse_get_type (void);
|
||||
static GType gst_ogm_video_parse_get_type (void);
|
||||
static GType gst_ogm_parse_get_type (void);
|
||||
|
||||
static void gst_ogm_audio_parse_base_init (GstOgmParseClass * klass);
|
||||
static void gst_ogm_video_parse_base_init (GstOgmParseClass * klass);
|
||||
static void gst_ogm_parse_class_init (GstOgmParseClass * klass);
|
||||
static void gst_ogm_parse_init (GstOgmParse * ogm);
|
||||
|
||||
static const GstFormat *gst_ogm_parse_get_sink_formats (GstPad * pad);
|
||||
static gboolean gst_ogm_parse_sink_convert (GstPad * pad, GstFormat src_format,
|
||||
gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
|
||||
|
||||
static void gst_ogm_parse_chain (GstPad * pad, GstData * data);
|
||||
|
||||
static GstElementStateReturn gst_ogm_parse_change_state (GstElement * element);
|
||||
|
||||
GstElementClass *parent_class = NULL;
|
||||
|
||||
static GType
|
||||
gst_ogm_parse_get_type (void)
|
||||
{
|
||||
static GType ogm_parse_type = 0;
|
||||
|
||||
if (!ogm_parse_type) {
|
||||
static const GTypeInfo ogm_parse_info = {
|
||||
sizeof (GstOgmParseClass),
|
||||
NULL,
|
||||
NULL,
|
||||
(GClassInitFunc) gst_ogm_parse_class_init,
|
||||
NULL,
|
||||
NULL,
|
||||
sizeof (GstOgmParse),
|
||||
0,
|
||||
(GInstanceInitFunc) gst_ogm_parse_init,
|
||||
};
|
||||
|
||||
ogm_parse_type =
|
||||
g_type_register_static (GST_TYPE_ELEMENT,
|
||||
"GstOgmParse", &ogm_parse_info, 0);
|
||||
}
|
||||
|
||||
return ogm_parse_type;
|
||||
}
|
||||
|
||||
static GType
|
||||
gst_ogm_audio_parse_get_type (void)
|
||||
{
|
||||
static GType ogm_audio_parse_type = 0;
|
||||
|
||||
if (!ogm_audio_parse_type) {
|
||||
static const GTypeInfo ogm_audio_parse_info = {
|
||||
sizeof (GstOgmParseClass),
|
||||
(GBaseInitFunc) gst_ogm_audio_parse_base_init,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
sizeof (GstOgmParse),
|
||||
0,
|
||||
NULL,
|
||||
};
|
||||
|
||||
ogm_audio_parse_type =
|
||||
g_type_register_static (GST_TYPE_OGM_PARSE,
|
||||
"GstOgmAudioParse", &ogm_audio_parse_info, 0);
|
||||
}
|
||||
|
||||
return ogm_audio_parse_type;
|
||||
}
|
||||
|
||||
GType
|
||||
gst_ogm_video_parse_get_type (void)
|
||||
{
|
||||
static GType ogm_video_parse_type = 0;
|
||||
|
||||
if (!ogm_video_parse_type) {
|
||||
static const GTypeInfo ogm_video_parse_info = {
|
||||
sizeof (GstOgmParseClass),
|
||||
(GBaseInitFunc) gst_ogm_video_parse_base_init,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
sizeof (GstOgmParse),
|
||||
0,
|
||||
NULL,
|
||||
};
|
||||
|
||||
ogm_video_parse_type =
|
||||
g_type_register_static (GST_TYPE_OGM_PARSE,
|
||||
"GstOgmVideoParse", &ogm_video_parse_info, 0);
|
||||
}
|
||||
|
||||
return ogm_video_parse_type;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_ogm_audio_parse_base_init (GstOgmParseClass * klass)
|
||||
{
|
||||
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
|
||||
static GstElementDetails gst_ogm_audio_parse_details =
|
||||
GST_ELEMENT_DETAILS ("OGM audio stream parser",
|
||||
"Codec/Decoder/Audio",
|
||||
"parse an OGM audio header and stream",
|
||||
"Ronald Bultje <rbultje@ronald.bitfreak.net>");
|
||||
GstCaps *caps = gst_riff_create_audio_template_caps ();
|
||||
|
||||
gst_element_class_set_details (element_class, &gst_ogm_audio_parse_details);
|
||||
|
||||
gst_element_class_add_pad_template (element_class,
|
||||
gst_static_pad_template_get (&ogm_audio_parse_sink_template_factory));
|
||||
audio_src_templ = gst_pad_template_new ("src",
|
||||
GST_PAD_SRC, GST_PAD_ALWAYS, caps);
|
||||
gst_element_class_add_pad_template (element_class, audio_src_templ);
|
||||
}
|
||||
|
||||
static void
|
||||
gst_ogm_video_parse_base_init (GstOgmParseClass * klass)
|
||||
{
|
||||
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
|
||||
static GstElementDetails gst_ogm_video_parse_details =
|
||||
GST_ELEMENT_DETAILS ("OGM video stream parser",
|
||||
"Codec/Decoder/Video",
|
||||
"parse an OGM video header and stream",
|
||||
"Ronald Bultje <rbultje@ronald.bitfreak.net>");
|
||||
GstCaps *caps = gst_riff_create_video_template_caps ();
|
||||
|
||||
gst_element_class_set_details (element_class, &gst_ogm_video_parse_details);
|
||||
|
||||
gst_element_class_add_pad_template (element_class,
|
||||
gst_static_pad_template_get (&ogm_video_parse_sink_template_factory));
|
||||
video_src_templ = gst_pad_template_new ("src",
|
||||
GST_PAD_SRC, GST_PAD_ALWAYS, caps);
|
||||
gst_element_class_add_pad_template (element_class, video_src_templ);
|
||||
}
|
||||
|
||||
static void
|
||||
gst_ogm_parse_class_init (GstOgmParseClass * klass)
|
||||
{
|
||||
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
|
||||
|
||||
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
|
||||
|
||||
gstelement_class->change_state = gst_ogm_parse_change_state;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_ogm_parse_init (GstOgmParse * ogm)
|
||||
{
|
||||
GstPadTemplate *templ;
|
||||
|
||||
/* create the pads */
|
||||
templ = gst_static_pad_template_get (
|
||||
(G_OBJECT_TYPE (ogm) == GST_TYPE_OGM_AUDIO_PARSE) ?
|
||||
&ogm_audio_parse_sink_template_factory :
|
||||
&ogm_video_parse_sink_template_factory);
|
||||
ogm->sinkpad = gst_pad_new_from_template (templ, "sink");
|
||||
gst_pad_set_convert_function (ogm->sinkpad, gst_ogm_parse_sink_convert);
|
||||
gst_pad_set_formats_function (ogm->sinkpad, gst_ogm_parse_get_sink_formats);
|
||||
gst_pad_set_chain_function (ogm->sinkpad, gst_ogm_parse_chain);
|
||||
gst_element_add_pad (GST_ELEMENT (ogm), ogm->sinkpad);
|
||||
|
||||
templ = (G_OBJECT_TYPE (ogm) == GST_TYPE_OGM_AUDIO_PARSE) ?
|
||||
audio_src_templ : video_src_templ;
|
||||
ogm->srcpad = gst_pad_new_from_template (templ, "src");
|
||||
gst_pad_use_explicit_caps (ogm->srcpad);
|
||||
gst_element_add_pad (GST_ELEMENT (ogm), ogm->srcpad);
|
||||
|
||||
/* initalize */
|
||||
memset (&ogm->hdr, 0, sizeof (ogm->hdr));
|
||||
}
|
||||
|
||||
static const GstFormat *
|
||||
gst_ogm_parse_get_sink_formats (GstPad * pad)
|
||||
{
|
||||
static GstFormat formats[] = {
|
||||
GST_FORMAT_DEFAULT,
|
||||
GST_FORMAT_TIME,
|
||||
0
|
||||
};
|
||||
|
||||
return formats;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gst_ogm_parse_sink_convert (GstPad * pad,
|
||||
GstFormat src_format, gint64 src_value,
|
||||
GstFormat * dest_format, gint64 * dest_value)
|
||||
{
|
||||
gboolean res = FALSE;
|
||||
GstOgmParse *ogm = GST_OGM_PARSE (gst_pad_get_parent (pad));
|
||||
|
||||
switch (src_format) {
|
||||
case GST_FORMAT_DEFAULT:
|
||||
switch (*dest_format) {
|
||||
case GST_FORMAT_TIME:
|
||||
switch (ogm->hdr.streamtype[0]) {
|
||||
case 'a':
|
||||
//*dest_value = ..;
|
||||
//res = TRUE;
|
||||
break;
|
||||
case 'v':
|
||||
*dest_value = (GST_SECOND / 10000000) *
|
||||
ogm->hdr.time_unit * src_value;
|
||||
res = TRUE;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_ogm_parse_chain (GstPad * pad, GstData * dat)
|
||||
{
|
||||
GstOgmParse *ogm = GST_OGM_PARSE (gst_pad_get_parent (pad));
|
||||
GstBuffer *buf = GST_BUFFER (dat);
|
||||
guint8 *data = GST_BUFFER_DATA (buf);
|
||||
guint size = GST_BUFFER_SIZE (buf);
|
||||
|
||||
GST_DEBUG_OBJECT (ogm, "New packet with packet start code 0x%02x", data[0]);
|
||||
|
||||
switch (data[0]) {
|
||||
case 0x01:{
|
||||
GstCaps *caps = NULL;
|
||||
|
||||
/* stream header */
|
||||
if (size < sizeof (stream_header) + 1) {
|
||||
GST_ELEMENT_ERROR (ogm, STREAM, WRONG_TYPE,
|
||||
("Buffer too small"), (NULL));
|
||||
break;
|
||||
}
|
||||
|
||||
if (!memcmp (&data[1], "video\000\000\000", 8)) {
|
||||
ogm->hdr.s.video.width = GST_READ_UINT32_LE (&data[45]);
|
||||
ogm->hdr.s.video.height = GST_READ_UINT32_LE (&data[49]);
|
||||
} else if (!memcmp (&data[1], "audio\000\000\000", 8)) {
|
||||
ogm->hdr.s.audio.channels = GST_READ_UINT32_LE (&data[45]);
|
||||
ogm->hdr.s.audio.blockalign = GST_READ_UINT32_LE (&data[47]);
|
||||
ogm->hdr.s.audio.avgbytespersec = GST_READ_UINT32_LE (&data[49]);
|
||||
} else {
|
||||
GST_ELEMENT_ERROR (ogm, STREAM, WRONG_TYPE,
|
||||
("Unknown stream type"), (NULL));
|
||||
break;
|
||||
}
|
||||
memcpy (ogm->hdr.streamtype, &data[1], 8);
|
||||
memcpy (ogm->hdr.subtype, &data[9], 4);
|
||||
ogm->hdr.size = GST_READ_UINT32_LE (&data[13]);
|
||||
ogm->hdr.time_unit = GST_READ_UINT64_LE (&data[17]);
|
||||
ogm->hdr.samples_per_unit = GST_READ_UINT64_LE (&data[25]);
|
||||
ogm->hdr.default_len = GST_READ_UINT32_LE (&data[33]);
|
||||
ogm->hdr.buffersize = GST_READ_UINT32_LE (&data[37]);
|
||||
ogm->hdr.bits_per_sample = GST_READ_UINT32_LE (&data[41]);
|
||||
|
||||
switch (ogm->hdr.streamtype[0]) {
|
||||
case 'a':{
|
||||
caps = NULL;
|
||||
break;
|
||||
}
|
||||
case 'v':{
|
||||
guint32 fcc;
|
||||
|
||||
fcc = GST_MAKE_FOURCC (ogm->hdr.subtype[0],
|
||||
ogm->hdr.subtype[1], ogm->hdr.subtype[2], ogm->hdr.subtype[3]);
|
||||
GST_LOG_OBJECT (ogm, "Type: %s, subtype: %" GST_FOURCC_FORMAT
|
||||
", size: %dx%d, timeunit: %" G_GINT64_FORMAT
|
||||
" (fps: %lf), s/u: %" G_GINT64_FORMAT ", "
|
||||
"def.len: %d, bufsize: %d, bps: %d",
|
||||
ogm->hdr.streamtype, GST_FOURCC_ARGS (fcc),
|
||||
ogm->hdr.s.video.width, ogm->hdr.s.video.height,
|
||||
ogm->hdr.time_unit, 10000000. / ogm->hdr.time_unit,
|
||||
ogm->hdr.samples_per_unit, ogm->hdr.default_len,
|
||||
ogm->hdr.buffersize, ogm->hdr.bits_per_sample);
|
||||
caps = gst_riff_create_video_caps (fcc, NULL, NULL, NULL);
|
||||
gst_caps_set_simple (caps,
|
||||
"width", G_TYPE_INT, ogm->hdr.s.video.width,
|
||||
"height", G_TYPE_INT, ogm->hdr.s.video.height,
|
||||
"framerate", G_TYPE_DOUBLE, 10000000. / ogm->hdr.time_unit, NULL);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
if (!gst_pad_set_explicit_caps (ogm->srcpad, caps)) {
|
||||
GST_ELEMENT_ERROR (ogm, CORE, NEGOTIATION, (NULL), (NULL));
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 0x03:
|
||||
/* comment - unused */
|
||||
break;
|
||||
default:
|
||||
if ((data[0] & 0x01) == 0) {
|
||||
/* data - push on */
|
||||
guint len = ((data[0] & 0xc0) >> 6) | ((data[0] & 0x02) << 1);
|
||||
guint xsize = 0;
|
||||
GstBuffer *sbuf;
|
||||
gboolean keyframe = (data[0] & 0x08) >> 3;
|
||||
|
||||
if (size < len + 1) {
|
||||
GST_ELEMENT_ERROR (ogm, STREAM, WRONG_TYPE,
|
||||
("Buffer too small"), (NULL));
|
||||
break;
|
||||
}
|
||||
for (; len > 0; len--) {
|
||||
xsize = (xsize << 8) | data[len];
|
||||
}
|
||||
|
||||
GST_DEBUG_OBJECT (ogm,
|
||||
"[0x%02x] Size of frame: %d, size of buffer: %d\n",
|
||||
data[0], xsize, size);
|
||||
/* ? */
|
||||
sbuf = gst_buffer_create_sub (buf, 1, size - 1);
|
||||
switch (ogm->hdr.streamtype[0]) {
|
||||
case 'v':
|
||||
if (keyframe)
|
||||
GST_BUFFER_FLAG_SET (sbuf, GST_BUFFER_KEY_UNIT);
|
||||
GST_BUFFER_TIMESTAMP (sbuf) = GST_BUFFER_TIMESTAMP (buf);
|
||||
GST_BUFFER_DURATION (sbuf) = (GST_SECOND / 10000000) *
|
||||
ogm->hdr.time_unit;
|
||||
break;
|
||||
case 'a':
|
||||
/* ? */
|
||||
break;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
gst_pad_push (ogm->srcpad, GST_DATA (sbuf));
|
||||
} else {
|
||||
GST_ELEMENT_ERROR (ogm, STREAM, WRONG_TYPE,
|
||||
("Wrong packet startcode 0x%02x", data[0]), (NULL));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
gst_buffer_unref (buf);
|
||||
}
|
||||
|
||||
static GstElementStateReturn
|
||||
gst_ogm_parse_change_state (GstElement * element)
|
||||
{
|
||||
GstOgmParse *ogm = GST_OGM_PARSE (element);
|
||||
|
||||
switch (GST_STATE_TRANSITION (element)) {
|
||||
case GST_STATE_PAUSED_TO_READY:
|
||||
memset (&ogm->hdr, 0, sizeof (ogm->hdr));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return parent_class->change_state (element);
|
||||
}
|
||||
|
||||
gboolean
|
||||
gst_ogm_parse_plugin_init (GstPlugin * plugin)
|
||||
{
|
||||
GST_DEBUG_CATEGORY_INIT (gst_ogm_parse_debug, "ogmparse", 0, "ogm parser");
|
||||
|
||||
return gst_library_load ("riff") &&
|
||||
gst_element_register (plugin, "ogmaudioparse", GST_RANK_PRIMARY,
|
||||
GST_TYPE_OGM_AUDIO_PARSE) &&
|
||||
gst_element_register (plugin, "ogmvideoparse", GST_RANK_PRIMARY,
|
||||
GST_TYPE_OGM_VIDEO_PARSE);
|
||||
}
|
|
@ -254,8 +254,7 @@ unknown_type (GstElement * element, GstCaps * caps,
|
|||
gchar *capsstr = gst_caps_to_string (caps);
|
||||
|
||||
g_warning ("don't know how to handle %s", capsstr);
|
||||
GST_ELEMENT_ERROR (play_base_bin, STREAM, TYPE_NOT_FOUND,
|
||||
("Don't know how to handle %s", capsstr), (NULL));
|
||||
|
||||
g_free (capsstr);
|
||||
}
|
||||
|
||||
|
|
|
@ -1209,6 +1209,38 @@ theora_type_find (GstTypeFind * tf, gpointer private)
|
|||
}
|
||||
}
|
||||
|
||||
/*** application/x-ogm-video or audio*****************************************/
|
||||
|
||||
static GstStaticCaps ogmvideo_caps =
|
||||
GST_STATIC_CAPS ("application/x-ogm-video");
|
||||
#define OGMVIDEO_CAPS (gst_static_caps_get(&ogmvideo_caps))
|
||||
static void
|
||||
ogmvideo_type_find (GstTypeFind * tf, gpointer private)
|
||||
{
|
||||
guint8 *data = gst_type_find_peek (tf, 0, 9);
|
||||
|
||||
if (data) {
|
||||
if (memcmp (data, "\001video\000\000\000", 9) != 0)
|
||||
return;
|
||||
gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, OGMVIDEO_CAPS);
|
||||
}
|
||||
}
|
||||
|
||||
static GstStaticCaps ogmaudio_caps =
|
||||
GST_STATIC_CAPS ("application/x-ogm-audio");
|
||||
#define OGMAUDIO_CAPS (gst_static_caps_get(&ogmaudio_caps))
|
||||
static void
|
||||
ogmaudio_type_find (GstTypeFind * tf, gpointer private)
|
||||
{
|
||||
guint8 *data = gst_type_find_peek (tf, 0, 9);
|
||||
|
||||
if (data) {
|
||||
if (memcmp (data, "\001audio\000\000\000", 9) != 0)
|
||||
return;
|
||||
gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, OGMAUDIO_CAPS);
|
||||
}
|
||||
}
|
||||
|
||||
/*** audio/x-speex ***********************************************************/
|
||||
|
||||
static GstStaticCaps speex_caps = GST_STATIC_CAPS ("audio/x-speex");
|
||||
|
@ -1335,7 +1367,7 @@ plugin_init (GstPlugin * plugin)
|
|||
static gchar *mp3_exts[] = { "mp3", "mp2", "mp1", "mpga", NULL };
|
||||
static gchar *mpeg_sys_exts[] = { "mpe", "mpeg", "mpg", NULL };
|
||||
static gchar *mpeg_video_exts[] = { "mpv", "mpeg", "mpg", NULL };
|
||||
static gchar *ogg_exts[] = { "ogg", NULL };
|
||||
static gchar *ogg_exts[] = { "ogg", "ogm", NULL };
|
||||
static gchar *qt_exts[] = { "mov", NULL };
|
||||
static gchar *rm_exts[] = { "ra", "ram", "rm", NULL };
|
||||
static gchar *swf_exts[] = { "swf", "swfl", NULL };
|
||||
|
@ -1458,6 +1490,10 @@ plugin_init (GstPlugin * plugin)
|
|||
vorbis_type_find, NULL, VORBIS_CAPS, NULL);
|
||||
TYPE_FIND_REGISTER (plugin, "video/x-theora", GST_RANK_PRIMARY,
|
||||
theora_type_find, NULL, THEORA_CAPS, NULL);
|
||||
TYPE_FIND_REGISTER (plugin, "application/x-ogm-video", GST_RANK_PRIMARY,
|
||||
ogmvideo_type_find, NULL, OGMVIDEO_CAPS, NULL);
|
||||
TYPE_FIND_REGISTER (plugin, "application/x-ogm-audio", GST_RANK_PRIMARY,
|
||||
ogmaudio_type_find, NULL, OGMAUDIO_CAPS, NULL);
|
||||
TYPE_FIND_REGISTER (plugin, "audio/x-speex", GST_RANK_PRIMARY,
|
||||
speex_type_find, NULL, SPEEX_CAPS, NULL);
|
||||
TYPE_FIND_REGISTER (plugin, "audio/x-m4a", GST_RANK_PRIMARY, m4a_type_find,
|
||||
|
|
Loading…
Reference in a new issue