diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/faad/gstfaad.c | 3 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 5 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-03-14 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * ext/faad/gstfaad.c: (gst_faad_sinkconnect): + * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps): + * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak), + (qtdemux_audio_caps): + Implement 'framed' property, independent of 'codec_data'. + 2005-03-12 Richard Hult <richard@imendio.com> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c index e08ebcda..cb2c6611 100644 --- a/ext/faad/gstfaad.c +++ b/ext/faad/gstfaad.c @@ -321,6 +321,9 @@ gst_faad_sinkconnect (GstPad * pad, const GstCaps * caps) gst_buffer_unref (faad->tempbuf); faad->tempbuf = NULL; } + } else if ((value = gst_structure_get_value (str, "framed")) && + g_value_get_boolean (value) == TRUE) { + faad->packetised = TRUE; } else { faad->init = FALSE; } diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 72949962..4f8cd416 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -2001,7 +2001,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) * some of those trailers, nowadays, have prologue images that are * themselves vide tracks as well. I haven't really found a way to * identify those yet, except for just looking at their duration. */ - if ((guint64) QTDEMUX_GUINT32_GET (mdhd->data + 24) * + if (stream->timescale * qtdemux->duration != 0 && + (guint64) QTDEMUX_GUINT32_GET (mdhd->data + 24) * qtdemux->timescale * 10 / (stream->timescale * qtdemux->duration) < 2) { GST_WARNING ("Track shorter than 20%% (%d/%d vs. %d/%d) of the stream " "found, assuming preview image or something; skipping track", @@ -2807,7 +2808,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data, case GST_MAKE_FOURCC ('m', 'p', '4', 'a'): /* MPEG-4 AAC */ return gst_caps_new_simple ("audio/mpeg", - "mpegversion", G_TYPE_INT, 4, NULL); + "mpegversion", G_TYPE_INT, 4, "framed", G_TYPE_BOOLEAN, TRUE, NULL); case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'): /* FIXME: QDesign music version 2 (no constant) */ if (data) { |