From c838dd54c45bb410bebf050b25892cf86fd9f22a Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Loeuillet?= Date: Fri, 7 Jan 2005 23:46:23 +0000 Subject: [PATCH] ext/dv/gstdvdec.c: Fix audio caps i just broke (missing ',') Original commit message from CVS: * ext/dv/gstdvdec.c: Fix audio caps i just broke (missing ',') * gst/matroska/matroska-mux.c: (gst_matroska_mux_get_type), (gst_matroska_mux_reset): Fix typo + add FIXME about old "x-gst-metadata" crap --- ChangeLog | 8 ++++++++ ext/dv/gstdvdec.c | 15 +++++++++++++-- gst/matroska/matroska-mux.c | 4 +++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd7ec73..72fd386 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-08 Stephane LOEUILLET + + * ext/dv/gstdvdec.c: + Fix audio caps i just broke (missing ',') + * gst/matroska/matroska-mux.c: (gst_matroska_mux_get_type), + (gst_matroska_mux_reset): + Fix typo + add FIXME about old "x-gst-metadata" crap + 2005-01-07 Stephane LOEUILLET * ext/dv/demo-play.c: (main): diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index fe5c101..8a0b6f2 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -17,6 +17,17 @@ * Boston, MA 02111-1307, USA. */ + +/* + +Some data gathered from the net, specificaly for DV in riff/AVI : http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directshow/htm/dvdataintheavifileformat.asp + +The 'dvsd' stream handler FOURCC specifies that the DV data is as defined in Part 2 of the Specification of Consumer-use Digital VCRs. Video is in the format of 525 lines at 29.97 Hz (525-60) or 625 lines at 25.00 Hz (625-50). +The 'dvhd' stream handler FOURCC specifies that the DV data is as defined in Part 3 of the Specification of Consumer-use Digital VCRs. Video is in the format of 1125 lines at 30.00 Hz (1125-60) or 1250 lines at 25.00 Hz (1250-50). +The 'dvsl' stream handler FOURCC specifies that the DV data is as defined in Part 6 of Specification of Consumer-use Digital VCRs. Video is in the format of high-compression SD (SDL). + +*/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -169,9 +180,9 @@ static GstStaticPadTemplate audio_src_temp = GST_STATIC_PAD_TEMPLATE ("audio", "depth = (int) 16, " "width = (int) 16, " "signed = (boolean) TRUE, " - "channels = (int) {2, 4}" + "channels = (int) {2, 4}, " "endianness = (int) " G_STRINGIFY (G_LITTLE_ENDIAN) ", " - "rate = (int) { 32000, 44100, 48000}") + "rate = (int) { 32000, 44100, 48000 }") ); #define GST_TYPE_DVDEC_QUALITY (gst_dvdec_quality_get_type()) diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 0a9ff29..d126706 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -168,7 +168,7 @@ gst_matroska_mux_get_type (void) gst_matroska_mux_type = g_type_register_static (GST_TYPE_EBML_WRITE, - "GstMatroskaMmux", &gst_matroska_mux_info, 0); + "GstMatroskaMux", &gst_matroska_mux_info, 0); } return gst_matroska_mux_type; @@ -303,6 +303,8 @@ gst_matroska_mux_reset (GstElement * element) mux->num_t_streams = 0; mux->num_v_streams = 0; +/* FIXME x-gst-metadata : prehistoric way to do metadata in caps. is done via signals actually */ + /* reset media info (to default) */ gst_caps_replace (&mux->metadata, gst_caps_new_simple ("application/x-gst-metadata", -- 2.7.4