diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-09-23 14:59:22 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-09-23 14:59:22 +0000 |
commit | 0771c17fede0ac6ae1a531a4d4d7d68fc72b24ea (patch) | |
tree | 6f0b0703d63c693bfdb2dcde29fc378bba12b561 /gst | |
parent | 18c8223577d50dcee845b5920b3b8dbaee45a1bb (diff) | |
download | gst-plugins-bad-0771c17fede0ac6ae1a531a4d4d7d68fc72b24ea.tar.gz gst-plugins-bad-0771c17fede0ac6ae1a531a4d4d7d68fc72b24ea.tar.bz2 gst-plugins-bad-0771c17fede0ac6ae1a531a4d4d7d68fc72b24ea.zip |
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.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/qtdemux/qtdemux.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 415a3d43..b6ee29be 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -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: |