[vorbis-tools] 02/02: Fix ogg123 speex playback: Initialize channel matrix

[Martin Steghöfer]

This is an automated email from the git hooks/post-receive script.

martin.steghoefer-guest pushed a commit to branch master
in repository vorbis-tools.

commit 47c432eb7e372fe8578181d82a4d28c0762d320a
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Wed Dec 10 22:31:19 2014 +0100

    Fix ogg123 speex playback: Initialize channel matrix
    
    Closes: #772766
---
 ...-speex-playback-Initialize-channel-matrix.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0012-Fix-ogg123-speex-playback-Initialize-channel-matrix.patch b/debian/patches/0012-Fix-ogg123-speex-playback-Initialize-channel-matrix.patch
new file mode 100644
index 0000000..ad354bd
--- /dev/null
+++ b/debian/patches/0012-Fix-ogg123-speex-playback-Initialize-channel-matrix.patch
@@ -0,0 +1,39 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
+Date: Wed, 10 Dec 2014 22:28:25 +0100
+Subject: Fix ogg123 speex playback: Initialize channel matrix
+
+The speex decoder didn't initialize the channel matrix,
+which caused libao to print the cryptic error message
+'" in channel matrix ""' and occasionally (depending on
+the output device) to abort audio output.
+
+Bug-Debian: https://bugs.debian.org/772766
+---
+ ogg123/speex_format.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/ogg123/speex_format.c b/ogg123/speex_format.c
+index c5a453d..c42e429 100644
+--- a/ogg123/speex_format.c
++++ b/ogg123/speex_format.c
+@@ -560,7 +560,19 @@ int read_speex_header (decoder_t *decoder)
+ 
+ 	  if (!priv->frames_per_packet)
+ 	    priv->frames_per_packet=1;
+-	
++
++      switch(decoder->actual_fmt.channels) {
++      case 1:
++        decoder->actual_fmt.matrix="M";
++        break;
++      case 2:
++        decoder->actual_fmt.matrix="L,R";
++        break;
++      default:
++        decoder->actual_fmt.matrix=NULL;
++        break;
++      }
++
+ 
+ 	  priv->output = calloc(priv->frame_size * 
+ 				decoder->actual_fmt.channels * 
diff --git a/debian/patches/series b/debian/patches/series
index 602973a..b31bf12 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-Fix-oggenc-crash-on-closing-raw-input-files.patch
 0010-Truncate-long-status-lines-on-small-terminals.patch
 0011-Fix-ogg123-speex-stereo-Initialize-stereo-info-data-.patch
+0012-Fix-ogg123-speex-playback-Initialize-channel-matrix.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/vorbis-tools.git