diff options
| author | Stefan Kost <ensonic@users.sourceforge.net> | 2008-08-06 13:12:07 +0000 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sourceforge.net> | 2008-08-06 13:12:07 +0000 |
| commit | dfd580b2075a15b0a7994d31287d9d8bfc13a954 (patch) | |
| tree | f276640627c227a671b73a9bed67959b92024e59 | |
| parent | 1a9699c487eae4a1c54dd8802fae3ec594d117be (diff) | |
gst/qtdemux/qtdemux.c: Use audio/x-qdm for caps. Collect some info - mplayer has a decoder for it but ffmpeg does not.
Original commit message from CVS:
* gst/qtdemux/qtdemux.c:
Use audio/x-qdm for caps. Collect some info - mplayer has a decoder
for it but ffmpeg does not.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 15 |
2 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2008-08-06 Stefan Kost <ensonic@users.sf.net> + + * gst/qtdemux/qtdemux.c: + Use audio/x-qdm for caps. Collect some info - mplayer has a decoder + for it but ffmpeg does not. + 2008-08-05 Stefan Kost <ensonic@users.sf.net> * gst/wavparse/gstwavparse.c: diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index ab25b290..921562d6 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3606,6 +3606,15 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) gst_qtdemux_handle_esds (qtdemux, stream, esds, list); } else { switch (fourcc) { +#if 0 + /* FIXME: what is in the chunk? */ + case FOURCC_QDMC: + { + gint len = QT_UINT32 (stsd_data); + /* seems to be always = 116 = 0x74 */ + break; + } +#endif case FOURCC_QDM2: { gint len = QT_UINT32 (stsd_data); @@ -4778,6 +4787,10 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, caps = gst_caps_new_simple ("audio/mpeg", "mpegversion", G_TYPE_INT, 4, "framed", G_TYPE_BOOLEAN, TRUE, NULL); break; + case GST_MAKE_FOURCC ('Q', 'D', 'M', 'C'): + _codec ("QDesign Music"); + caps = gst_caps_new_simple ("audio/x-qdm", NULL); + break; case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'): _codec ("QDesign Music v.2"); /* FIXME: QDesign music version 2 (no constant) */ @@ -4813,8 +4826,6 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, break; case GST_MAKE_FOURCC ('q', 't', 'v', 'r'): /* ? */ - case GST_MAKE_FOURCC ('Q', 'D', 'M', 'C'): - /* QDesign music */ case GST_MAKE_FOURCC ('Q', 'c', 'l', 'p'): /* QUALCOMM PureVoice */ default: |