mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 10:11:08 +00:00
Add patch from Bug 357055 from Chris Lord, adding support for Vorbis streams
Original commit message from CVS: Add patch from Bug 357055 from Chris Lord, adding support for Vorbis streams
This commit is contained in:
Christian Schaller
parent
59a7603e1e
commit
3bdee19bad
6 changed files with 1328 additions and 3 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2007-03-01 Chris Lord <chris@openedhand.com>
|
||||
|
||||
Reviewed by Christian Schaller <christian@fluendo.com>
|
||||
|
||||
Fixes Bug 357055
|
||||
* ext/ivorbis/Makefile.am:
|
||||
* ext/ivorbis/vorbisdec.c: Add support for Vorbis streams
|
||||
* ext/ivorbis/vorbisdec.h
|
||||
* ext/ivorbis/vorbis.c :
|
||||
|
||||
2007-03-01 Jan Schmidt <thaytan@mad.scientist.com>
|
||||
|
||||
* tests/check/Makefile.am:
|
||||
|
|
|
|||
|
|
@ -615,7 +615,12 @@ AG_GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [
|
|||
IVORBIS_CFLAGS=
|
||||
AC_CHECK_LIB(vorbisidec, vorbis_block_init,
|
||||
[IVORBIS_LIBS=-lvorbisidec
|
||||
HAVE_IVORBIS=yes],
|
||||
HAVE_IVORBIS=yes
|
||||
case $host in
|
||||
arm-*-*)
|
||||
IVORBIS_CFLAGS="-D_ARM_ASSEM_ $IVORBIS_CFLAGS"
|
||||
esac
|
||||
],
|
||||
HAVE_IVORBIS=no)
|
||||
AC_SUBST(IVORBIS_LIBS)
|
||||
AC_SUBST(IVORBIS_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
plugin_LTLIBRARIES = libgstivorbis.la
|
||||
|
||||
libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c
|
||||
libgstivorbis_la_SOURCES = vorbis.c vorbisfile.c vorbisdec.c
|
||||
libgstivorbis_la_CFLAGS = $(GST_CFLAGS) $(IVORBIS_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
|
||||
libgstivorbis_la_LIBADD = $(IVORBIS_LIBS) \
|
||||
$(IVORBISFILE_LIBS) \
|
||||
|
|
|
|||
|
|
@ -23,10 +23,12 @@
|
|||
|
||||
#include <gst/gst.h>
|
||||
#include <tremor/ivorbiscodec.h>
|
||||
#include "vorbisdec.h"
|
||||
|
||||
GST_DEBUG_CATEGORY (vorbisdec_debug);
|
||||
|
||||
extern GType ivorbisfile_get_type (void);
|
||||
|
||||
|
||||
static gboolean
|
||||
plugin_init (GstPlugin * plugin)
|
||||
{
|
||||
|
|
@ -34,6 +36,13 @@ plugin_init (GstPlugin * plugin)
|
|||
ivorbisfile_get_type ()))
|
||||
return FALSE;
|
||||
|
||||
if (!gst_element_register (plugin, "ivorbisdec", GST_RANK_SECONDARY,
|
||||
gst_ivorbis_dec_get_type ()))
|
||||
return FALSE;
|
||||
|
||||
GST_DEBUG_CATEGORY_INIT (vorbisdec_debug, "ivorbisdec", 0,
|
||||
"vorbis decoding element (integer decoder)");
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
|||
1214
ext/ivorbis/vorbisdec.c
Normal file
1214
ext/ivorbis/vorbisdec.c
Normal file
File diff suppressed because it is too large
Load diff
87
ext/ivorbis/vorbisdec.h
Normal file
87
ext/ivorbis/vorbisdec.h
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
/* -*- c-basic-offset: 2 -*-
|
||||
* GStreamer
|
||||
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
||||
*
|
||||
* Tremor modifications <2006>:
|
||||
* Chris Lord, OpenedHand Ltd. <chris@openedhand.com>, http://www.o-hand.com/
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef __GST_IVORBIS_DEC_H__
|
||||
#define __GST_IVORBIS_DEC_H__
|
||||
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <tremor/ivorbiscodec.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GST_TYPE_IVORBIS_DEC \
|
||||
(gst_ivorbis_dec_get_type())
|
||||
#define GST_IVORBIS_DEC(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_IVORBIS_DEC,GstIVorbisDec))
|
||||
#define GST_IVORBIS_DEC_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_IVORBIS_DEC,GstIVorbisDecClass))
|
||||
#define GST_IS_IVORBIS_DEC(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_IVORBIS_DEC))
|
||||
#define GST_IS_IVORBIS_DEC_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_IVORBIS_DEC))
|
||||
|
||||
typedef struct _GstIVorbisDec GstIVorbisDec;
|
||||
typedef struct _GstIVorbisDecClass GstIVorbisDecClass;
|
||||
|
||||
/**
|
||||
* GstIVorbisDec:
|
||||
*
|
||||
* Opaque data structure.
|
||||
*/
|
||||
struct _GstIVorbisDec {
|
||||
GstElement element;
|
||||
|
||||
GstPad * sinkpad;
|
||||
GstPad * srcpad;
|
||||
|
||||
vorbis_dsp_state vd;
|
||||
vorbis_info vi;
|
||||
vorbis_comment vc;
|
||||
vorbis_block vb;
|
||||
guint64 granulepos;
|
||||
|
||||
gboolean initialized;
|
||||
|
||||
GList *queued;
|
||||
|
||||
GstSegment segment;
|
||||
gboolean discont;
|
||||
|
||||
GstClockTime cur_timestamp; /* only used with non-ogg container formats */
|
||||
GstClockTime prev_timestamp; /* only used with non-ogg container formats */
|
||||
|
||||
GList *pendingevents;
|
||||
GstTagList *taglist;
|
||||
};
|
||||
|
||||
struct _GstIVorbisDecClass {
|
||||
GstElementClass parent_class;
|
||||
};
|
||||
|
||||
GType gst_ivorbis_dec_get_type(void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_IVORBIS_DEC_H__ */
|
||||
Loading…
Reference in a new issue