diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-18 05:59:27 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-18 05:59:27 +0800 |
| commit | c08fdb2fee234bd6d4f5e74e9a4c41b99908694f (patch) | |
| tree | eea85fef5ccfae4f04d6981234f587cb2d9b4a65 /multimedia/gstreamer-plugins/files | |
| parent | 2cd0805e70202c831d8983142bc9efb47c2d931c (diff) | |
| download | marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.tar marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.tar.gz marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.tar.bz2 marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.tar.lz marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.tar.xz marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.tar.zst marcuscom-ports-c08fdb2fee234bd6d4f5e74e9a4c41b99908694f.zip | |
Sync with recent commit.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3260 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia/gstreamer-plugins/files')
| -rw-r--r-- | multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp b/multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp new file mode 100644 index 000000000..1b1799ca9 --- /dev/null +++ b/multimedia/gstreamer-plugins/files/patch-ext_musepack_gstmusepackdec.cpp @@ -0,0 +1,61 @@ +--- ext/musepack/gstmusepackdec.cpp.orig Sun Nov 7 19:30:06 2004 ++++ ext/musepack/gstmusepackdec.cpp Thu Dec 16 16:31:42 2004 +@@ -30,14 +30,24 @@ + GST_STATIC_CAPS ("audio/x-musepack") + ); + ++#ifdef MPC_FIXED_POINT ++#define BASE_CAPS \ ++ "audio/x-raw-int, " \ ++ "signed = (bool) TRUE, " \ ++ "width = (int) 32, " \ ++ "depth = (int) 32" ++#else ++#define BASE_CAPS \ ++ "audio/x-raw-float, " \ ++ "width = (int) 32, " \ ++ "buffer-frames = (int) 0" ++#endif ++ + static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, +- GST_STATIC_CAPS ("audio/x-raw-int, " ++ GST_STATIC_CAPS (BASE_CAPS ", " + "endianness = (int) BYTE_ORDER, " +- "signed = (bool) TRUE, " +- "width = (int) 32, " +- "depth = (int) 32, " + "rate = (int) [ 8000, 96000 ], " + "channels = (int) [ 1, 2 ]") + ); +@@ -352,6 +362,7 @@ + gst_musepack_stream_init (GstMusepackDec * musepackdec) + { + StreamInfo si = StreamInfo (); ++ GstCaps *caps; + + if (musepackdec->dec) + delete musepackdec->dec; +@@ -379,15 +390,12 @@ + return FALSE; + } + +- if (!gst_pad_set_explicit_caps (musepackdec->srcpad, +- gst_caps_new_simple ("audio/x-raw-int", +- "width", G_TYPE_INT, 32, +- "depth", G_TYPE_INT, 32, +- "endianness", G_TYPE_INT, G_BYTE_ORDER, +- "channels", G_TYPE_INT, si.simple.Channels, +- "rate", G_TYPE_INT, si.simple.SampleFreq, +- "signed", G_TYPE_BOOLEAN, TRUE, +- NULL))) { ++ caps = gst_caps_from_string (BASE_CAPS); ++ gst_caps_set_simple (caps, ++ "endianness", G_TYPE_INT, G_BYTE_ORDER, ++ "channels", G_TYPE_INT, si.simple.Channels, ++ "rate", G_TYPE_INT, si.simple.SampleFreq, NULL); ++ if (!gst_pad_set_explicit_caps (musepackdec->srcpad, caps)) { + GST_ELEMENT_ERROR (musepackdec, CORE, NEGOTIATION, (NULL), (NULL)); + delete musepackdec->dec; + musepackdec->dec = NULL; |