We are currently experiencing downtime impacting viewing & cloning the Mesa repo, and some GitLab pages returning 503. Please see #freedesktop on IRC for more updates.

Commit 0771c17f authored by Ronald S. Bultje's avatar Ronald S. Bultje

ext/dirac/: Do something. Don't actually know if this works because I don't have a demuxer yet.

Original commit message from CVS:
* ext/dirac/Makefile.am:
* ext/dirac/gstdirac.cc:
* ext/dirac/gstdiracdec.cc:
* ext/dirac/gstdiracdec.h:
Do something. Don't actually know if this works because I don't
have a demuxer yet.
* ext/gsm/gstgsmdec.c: (gst_gsmdec_getcaps):
Add channels=1 to caps returned from _getcaps().
* ext/ogg/gstogmparse.c: (gst_ogm_audio_parse_get_type),
(gst_ogm_video_parse_get_type), (gst_ogm_audio_parse_base_init),
(gst_ogm_video_parse_base_init), (gst_ogm_parse_init),
(gst_ogm_audio_parse_init), (gst_ogm_video_parse_init),
(gst_ogm_parse_sink_convert), (gst_ogm_parse_chain),
(gst_ogm_parse_change_state):
Separate between audio/video so ogmaudioparse actually uses the
audio pad templates. Both audio and video work now, including
autoplugging. Also use sometimes-srcpad hack.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_seek):
Handle events better. Don't hang on infinite loops.
* gst/avi/gstavidemux.c: (gst_avi_demux_class_init),
(gst_avi_demux_init), (gst_avi_demux_reset),
(gst_avi_demux_src_convert), (gst_avi_demux_handle_src_query),
(gst_avi_demux_stream_header), (gst_avi_demux_stream_data),
(gst_avi_demux_change_state):
* gst/avi/gstavidemux.h:
Improve A/V sync. Still not perfect.
* gst/matroska/ebml-read.c: (gst_ebml_read_seek),
(gst_ebml_read_skip):
Handle events better.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_sink_event),
(gst_qtdemux_loop_header), (qtdemux_parse_trak),
(qtdemux_audio_caps):
Add IMA4. Improve event handling. Save offset after a seek when
the headers are at the end of the file so that we don't end up in
an infinite loop.
* gst/typefind/gsttypefindfunctions.c: (qt_type_find):
Add low-priority typefind support for files with no length.
parent 18c82235
2004-09-23 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/dirac/Makefile.am:
* ext/dirac/gstdirac.cc:
* ext/dirac/gstdiracdec.cc:
* ext/dirac/gstdiracdec.h:
Do something. Don't actually know if this works because I don't
have a demuxer yet.
* ext/gsm/gstgsmdec.c: (gst_gsmdec_getcaps):
Add channels=1 to caps returned from _getcaps().
* ext/ogg/gstogmparse.c: (gst_ogm_audio_parse_get_type),
(gst_ogm_video_parse_get_type), (gst_ogm_audio_parse_base_init),
(gst_ogm_video_parse_base_init), (gst_ogm_parse_init),
(gst_ogm_audio_parse_init), (gst_ogm_video_parse_init),
(gst_ogm_parse_sink_convert), (gst_ogm_parse_chain),
(gst_ogm_parse_change_state):
Separate between audio/video so ogmaudioparse actually uses the
audio pad templates. Both audio and video work now, including
autoplugging. Also use sometimes-srcpad hack.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_seek):
Handle events better. Don't hang on infinite loops.
* gst/avi/gstavidemux.c: (gst_avi_demux_class_init),
(gst_avi_demux_init), (gst_avi_demux_reset),
(gst_avi_demux_src_convert), (gst_avi_demux_handle_src_query),
(gst_avi_demux_stream_header), (gst_avi_demux_stream_data),
(gst_avi_demux_change_state):
* gst/avi/gstavidemux.h:
Improve A/V sync. Still not perfect.
* gst/matroska/ebml-read.c: (gst_ebml_read_seek),
(gst_ebml_read_skip):
Handle events better.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_handle_sink_event),
(gst_qtdemux_loop_header), (qtdemux_parse_trak),
(qtdemux_audio_caps):
Add IMA4. Improve event handling. Save offset after a seek when
the headers are at the end of the file so that we don't end up in
an infinite loop.
* gst/typefind/gsttypefindfunctions.c: (qt_type_find):
Add low-priority typefind support for files with no length.
2004-09-23 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* testsuite/multifilesink/Makefile.am:
......
plugin_LTLIBRARIES = libgstdirac.la
libgstdirac_la_SOURCES = gstdirac.cc gstdiracdec.cc
#gstdiracenc.c
libgstdirac_la_SOURCES = \
gstdirac.cc \
gstdiracdec.cc
libgstdirac_la_CXXFLAGS = $(GST_CFLAGS) $(DIRAC_CFLAGS)
libgstdirac_la_LIBADD = $(DIRAC_LIBS)
libgstdirac_la_LIBADD = $(DIRAC_LIBS) -lz -lm
libgstdirac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = \
gstdiracdec.h
......@@ -16,16 +16,14 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif
#include <gst/gst.h>
extern GType gst_diracdec_get_type (void);
//extern GType gst_diracenc_get_type (void);
#include <gst/gst.h>
#include "gstdiracdec.h"
static gboolean
plugin_init (GstPlugin * plugin)
......@@ -38,7 +36,7 @@ plugin_init (GstPlugin * plugin)
#endif
if (!gst_element_register (plugin, "diracdec", GST_RANK_PRIMARY,
gst_diracdec_get_type ())) {
GST_TYPE_DIRACDEC)) {
return FALSE;
}
......
This diff is collapsed.
/* GStreamer
* Copyright (C) 2004 David A. Schleef <ds@schleef.org>
* Copyright (C) 2004 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
*
* 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_DIRACDEC_H__
#define __GST_DIRACDEC_H__
#include <gst/gst.h>
#include <libdirac_decoder/decoder_types.h>
#include <libdirac_decoder/dirac_parser.h>
G_BEGIN_DECLS
#define GST_TYPE_DIRACDEC \
(gst_diracdec_get_type())
#define GST_DIRACDEC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_DIRACDEC,GstDiracDec))
#define GST_DIRACDEC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_DIRACDEC,GstDiracDec))
#define GST_IS_DIRACDEC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DIRACDEC))
#define GST_IS_DIRACDEC_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DIRACDEC))
typedef struct _GstDiracDec GstDiracDec;
typedef struct _GstDiracDecClass GstDiracDecClass;
struct _GstDiracDec
{
GstElement element;
/* pads */
GstPad *sinkpad, *srcpad;
dirac_decoder_t *decoder;
/* size is size of buf */
gint width, height, size;
gdouble fps;
guint32 fcc;
};
struct _GstDiracDecClass
{
GstElementClass parent_class;
};
GType gst_diracdec_get_type (void);
G_END_DECLS
#endif /* __GST_DIRACDEC_H__ */
......@@ -173,6 +173,7 @@ gst_gsmdec_getcaps (GstPad * pad)
0), "rate");
gst_structure_set_value (gst_caps_get_structure (basecaps, 0), "rate",
rate_value);
gst_caps_set_simple (basecaps, "channels", G_TYPE_INT, 1, NULL);
return basecaps;
}
......
......@@ -304,7 +304,7 @@ gst_riff_read_seek (GstRiffRead * riff, guint64 offset)
GstEventType type = GST_EVENT_TYPE (event);
gst_pad_event_default (riff->sinkpad, event);
if (type == GST_EVENT_EOS)
if (type == GST_EVENT_EOS || type == GST_EVENT_INTERRUPT)
return NULL;
event = NULL;
}
......@@ -890,8 +890,7 @@ gst_riff_read_info (GstRiffRead * riff)
if (name && name[0] != '\0') {
GValue src = { 0 }
, dest =
{
, dest = {
0};
GType dest_type = gst_tag_get_type (type);
......
......@@ -474,6 +474,7 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
static gboolean
gst_qtdemux_handle_sink_event (GstQTDemux * qtdemux)
{
gboolean res = TRUE;
guint32 remaining;
GstEvent *event;
GstEventType type;
......@@ -495,12 +496,13 @@ gst_qtdemux_handle_sink_event (GstQTDemux * qtdemux)
//gst_bytestream_flush_fast(qtdemux->bs, remaining);
break;
default:
res = FALSE;
g_warning ("unhandled event %d", type);
break;
}
gst_event_unref (event);
return TRUE;
return res;
}
static GstElementStateReturn
......@@ -713,6 +715,7 @@ gst_qtdemux_loop_header (GstElement * element)
if (!ret) {
g_warning ("seek failed");
}
qtdemux->offset = offset;
GST_DEBUG ("seek returned %d", ret);
return;
}
......@@ -780,7 +783,6 @@ gst_qtdemux_loop_header (GstElement * element)
/* unreached */
g_assert (0);
}
}
void
......@@ -2024,7 +2026,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4)),
stream->caps);
} else {
GST_INFO ("unknown subtype");
GST_INFO ("unknown subtype " GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (stream->subtype));
return;
}
......@@ -2156,7 +2159,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
samples_per_chunk * stream->bytes_per_frame /
stream->samples_per_packet / stream->compression;
else
samples[j].size = 0;
samples[j].size = stream->bytes_per_frame;
samples[j].duration =
samples_per_chunk * GST_SECOND / (stream->rate / 2);
samples[j].timestamp = timestamp;
......@@ -2208,7 +2211,6 @@ done2:
break;
}
#endif
gst_qtdemux_add_stream (qtdemux, stream);
}
......@@ -2573,12 +2575,14 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data,
case GST_MAKE_FOURCC ('a', 'g', 's', 'm'):
/* GSM */
return gst_caps_new_simple ("audio/x-gsm", NULL);
case GST_MAKE_FOURCC ('i', 'm', 'a', '4'):
/* IMA 4:1 */
return gst_caps_new_simple ("audio/x-adpcm",
"layout", G_TYPE_STRING, "quicktime", NULL);
case GST_MAKE_FOURCC ('q', 't', 'v', 'r'):
/* ? */
case GST_MAKE_FOURCC ('Q', 'D', 'M', 'C'):
/* QDesign music */
case GST_MAKE_FOURCC ('i', 'm', 'a', '4'):
/* IMA 4:1 */
case GST_MAKE_FOURCC ('Q', 'c', 'l', 'p'):
/* QUALCOMM PureVoice */
default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment