From bb98769e321aac9787cece5896eaf8d24bf13d7a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 27 Sep 2011 18:19:50 +0200 Subject: [PATCH] lame: fix raw audio caps too --- ext/lame/gstlame.c | 9 +++------ ext/lame/gstlamemp3enc.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index 490bfd5..df33f58 100644 --- a/ext/lame/gstlame.c +++ b/ext/lame/gstlame.c @@ -66,7 +66,7 @@ * gst-launch -v cdda://5 ! audioconvert ! lame bitrate=192 ! filesink location=track5.mp3 * ]| Encode Audio CD track 5 to MP3 * |[ - * gst-launch -v audiotestsrc num-buffers=10 ! audio/x-raw-int,rate=44100,channels=1 ! lame bitrate=48 mode=3 ! filesink location=test.mp3 + * gst-launch -v audiotestsrc num-buffers=10 ! audio/x-raw,rate=44100,channels=1 ! lame bitrate=48 mode=3 ! filesink location=test.mp3 * ]| Encode to a fixed sample rate * * @@ -98,11 +98,8 @@ static GstStaticPadTemplate gst_lame_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " - "signed = (boolean) true, " - "width = (int) 16, " - "depth = (int) 16, " + GST_STATIC_CAPS ("audio/x-raw, " + "format = (string) " GST_AUDIO_NE (S16) ", " "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, " "channels = (int) [ 1, 2 ]") ); diff --git a/ext/lame/gstlamemp3enc.c b/ext/lame/gstlamemp3enc.c index c9b8796..f2269fe 100644 --- a/ext/lame/gstlamemp3enc.c +++ b/ext/lame/gstlamemp3enc.c @@ -53,7 +53,7 @@ * gst-launch -v cdda://5 ! audioconvert ! lamemp3enc target=bitrate cbr=true bitrate=192 ! filesink location=track5.mp3 * ]| Encode Audio CD track 5 to MP3 with a constant bitrate of 192kbps * |[ - * gst-launch -v audiotestsrc num-buffers=10 ! audio/x-raw-int,rate=44100,channels=1 ! lamemp3enc target=bitrate cbr=true bitrate=48 ! filesink location=test.mp3 + * gst-launch -v audiotestsrc num-buffers=10 ! audio/x-raw,rate=44100,channels=1 ! lamemp3enc target=bitrate cbr=true bitrate=48 ! filesink location=test.mp3 * ]| Encode to a fixed sample rate * * @@ -84,11 +84,8 @@ static GstStaticPadTemplate gst_lamemp3enc_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-raw-int, " - "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", " - "signed = (boolean) true, " - "width = (int) 16, " - "depth = (int) 16, " + GST_STATIC_CAPS ("audio/x-raw, " + "format = (string) " GST_AUDIO_NE (S16) ", " "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, " "channels = (int) [ 1, 2 ]") ); -- 2.7.4