mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-11 06:11:27 +00:00
configure.ac: Add autoconfery for theoradec.
Original commit message from CVS: * configure.ac: Add autoconfery for theoradec. * ext/Makefile.am: Add theora directory. * ext/theora/Makefile.am: * ext/theora/theoradec.c: (gst_theoradec_base_init), (gst_theoradec_class_init), (gst_theoradec_init), (gst_theoradec_reset), (inc_granulepos), (theora_get_query_types), (gst_theoradec_granule_clocktime), (theora_dec_src_convert), (theora_dec_sink_convert), (theora_dec_src_query), (theora_dec_sink_query), (theora_dec_src_event), (theora_dec_sink_event), (theora_handle_comment_packet), (theora_handle_type_packet), (theora_handle_header_packet), (theora_dec_push), (theora_handle_data_packet), (theora_dec_chain), (theora_dec_change_state), (plugin_init): * ext/theora/theoradec.h: Add theora plugin for theora-exp decoder. Very heavily based on the existing theora decoder plugin.
This commit is contained in:
Michael Smith
parent
de433bfdcb
commit
15d5008ffc
7 changed files with 1251 additions and 1 deletions
21
ChangeLog
21
ChangeLog
|
|
@ -1,3 +1,24 @@
|
|||
2006-03-31 Michael Smith <msmith@fluendo.com>
|
||||
|
||||
* configure.ac:
|
||||
Add autoconfery for theoradec.
|
||||
* ext/Makefile.am:
|
||||
Add theora directory.
|
||||
* ext/theora/Makefile.am:
|
||||
* ext/theora/theoradec.c: (gst_theoradec_base_init),
|
||||
(gst_theoradec_class_init), (gst_theoradec_init),
|
||||
(gst_theoradec_reset), (inc_granulepos), (theora_get_query_types),
|
||||
(gst_theoradec_granule_clocktime), (theora_dec_src_convert),
|
||||
(theora_dec_sink_convert), (theora_dec_src_query),
|
||||
(theora_dec_sink_query), (theora_dec_src_event),
|
||||
(theora_dec_sink_event), (theora_handle_comment_packet),
|
||||
(theora_handle_type_packet), (theora_handle_header_packet),
|
||||
(theora_dec_push), (theora_handle_data_packet), (theora_dec_chain),
|
||||
(theora_dec_change_state), (plugin_init):
|
||||
* ext/theora/theoradec.h:
|
||||
Add theora plugin for theora-exp decoder. Very heavily based on the
|
||||
existing theora decoder plugin.
|
||||
|
||||
2006-03-29 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* ext/gsm/gstgsmdec.c: (gst_gsmdec_class_init), (gst_gsmdec_init),
|
||||
|
|
|
|||
2
common
2
common
|
|
@ -1 +1 @@
|
|||
Subproject commit 45cc64e522d61410eb8d1a3e7ef67569851cd77a
|
||||
Subproject commit c18b429f2a3698b6fc5e849a637aa0c8b91e82b9
|
||||
|
|
@ -706,6 +706,14 @@ GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions],
|
|||
fi
|
||||
])
|
||||
|
||||
dnl *** theora ***
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_THEORADEC, true)
|
||||
GST_CHECK_FEATURE(THEORADEC, [ogg theora codec], theoradec, [
|
||||
PKG_CHECK_MODULES(THEORADEC, theoradec, HAVE_THEORADEC="yes", HAVE_THEORADEC="no")
|
||||
AC_SUBST(THEORADEC_LIBS)
|
||||
AC_SUBST(THEORADEC_CFLAGS)
|
||||
])
|
||||
|
||||
dnl *** Video 4 Linux 2 ***
|
||||
dnl for information about the header/define, see sys/v4l2/gstv4l2element.h
|
||||
dnl renamed to GST_V4L2 because of some conflict with kernel headers
|
||||
|
|
@ -853,6 +861,7 @@ ext/musepack/Makefile
|
|||
ext/sdl/Makefile
|
||||
ext/swfdec/Makefile
|
||||
ext/taglib/Makefile
|
||||
ext/theora/Makefile
|
||||
ext/xvid/Makefile
|
||||
docs/Makefile
|
||||
docs/plugins/Makefile
|
||||
|
|
|
|||
|
|
@ -209,6 +209,13 @@ else
|
|||
TAGLIB_DIR =
|
||||
endif
|
||||
|
||||
if USE_THEORADEC
|
||||
THEORA_DIR = theora
|
||||
else
|
||||
THEORA_DIR =
|
||||
endif
|
||||
|
||||
|
||||
# if USE_TARKIN
|
||||
# TARKIN_DIR=tarkin
|
||||
# else
|
||||
|
|
@ -263,6 +270,7 @@ SUBDIRS=\
|
|||
$(SWFDEC_DIR) \
|
||||
$(TAGLIB_DIR) \
|
||||
$(TARKIN_DIR) \
|
||||
$(THEORA_DIR) \
|
||||
$(WAVPACK_DIR) \
|
||||
$(XINE_DIR) \
|
||||
$(XVID_DIR)
|
||||
|
|
|
|||
12
ext/theora/Makefile.am
Normal file
12
ext/theora/Makefile.am
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
plugin_LTLIBRARIES = libgsttheoraexp.la
|
||||
|
||||
noinst_HEADERS = theoradec.h
|
||||
|
||||
libgsttheoraexp_la_SOURCES = theoradec.c
|
||||
libgsttheoraexp_la_CFLAGS = $(GST_CFLAGS) $(THEORADEC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
|
||||
libgsttheoraexp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgsttheoraexp_la_LIBADD = \
|
||||
-lgsttag-@GST_MAJORMINOR@ \
|
||||
$(GST_LIBS) \
|
||||
$(THEORADEC_LIBS) \
|
||||
$(GST_PLUGINS_BASE_LIBS)
|
||||
1104
ext/theora/theoradec.c
Normal file
1104
ext/theora/theoradec.c
Normal file
File diff suppressed because it is too large
Load diff
96
ext/theora/theoradec.h
Normal file
96
ext/theora/theoradec.h
Normal file
|
|
@ -0,0 +1,96 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) 2004 Benjamin Otte <in7y118@public.uni-hamburg.de>
|
||||
* 2006 Michael Smith <msmith@fluendo.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_THEORADEC_H__
|
||||
#define __GST_THEORADEC_H__
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <gst/gst.h>
|
||||
#include <theora/theoradec.h>
|
||||
#include <string.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define GST_TYPE_THEORA_DEC \
|
||||
(gst_theoradec_get_type())
|
||||
#define GST_THEORA_DEC(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_THEORA_DEC,GstTheoraExpDec))
|
||||
#define GST_THEORA_DEC_CLASS(klass) \
|
||||
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_THEORA_DEC,GstTheoraExpDec))
|
||||
#define GST_IS_THEORA_DEC(obj) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_THEORA_DEC))
|
||||
#define GST_IS_THEORA_DEC_CLASS(obj) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_THEORA_DEC))
|
||||
|
||||
typedef struct _GstTheoraExpDec GstTheoraExpDec;
|
||||
typedef struct _GstTheoraExpDecClass GstTheoraExpDecClass;
|
||||
|
||||
/**
|
||||
* GstTheoraExpDec:
|
||||
*
|
||||
* Decoder using theora-exp
|
||||
*/
|
||||
struct _GstTheoraExpDec
|
||||
{
|
||||
GstElement element;
|
||||
|
||||
/* Pads */
|
||||
GstPad *sinkpad;
|
||||
GstPad *srcpad;
|
||||
|
||||
/* theora decoder state */
|
||||
th_dec_ctx *dec;
|
||||
th_setup_info *setup;
|
||||
|
||||
theora_info info;
|
||||
th_comment comment;
|
||||
|
||||
gboolean have_header;
|
||||
guint64 granulepos;
|
||||
guint64 granule_shift;
|
||||
|
||||
GstClockTime last_timestamp;
|
||||
gboolean need_keyframe;
|
||||
gint width, height;
|
||||
gint offset_x, offset_y;
|
||||
|
||||
int frame_nr;
|
||||
|
||||
GList *queued;
|
||||
|
||||
/* segment info */ /* with STREAM_LOCK */
|
||||
GstSegment segment;
|
||||
|
||||
/* QoS stuff */ /* with LOCK*/
|
||||
gboolean proportion;
|
||||
GstClockTime earliest_time;
|
||||
};
|
||||
|
||||
struct _GstTheoraExpDecClass
|
||||
{
|
||||
GstElementClass parent_class;
|
||||
};
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GST_THEORADEC_H__ */
|
||||
Loading…
Reference in a new issue