disorder-decode now works for MP3s

diff --git a/.bzrignore b/.bzrignore
index c07af06fb3825aadfcb734e4b561e780359e5c1a..1bf7866bc8aa5e04b5e2722a5505711f3adab8fa 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -105,3 +105,4 @@ debian/disorder-playrtp
 debian/disobedience
 server/disorder-decode
 server/disorder-normalize
 debian/disobedience
 server/disorder-decode
 server/disorder-normalize

+doc/disorder-normalize.8.html

diff --git a/server/decode.c b/server/decode.c
index 434ad000949ed87b9fe24ec246c83d0e135b9012..c63ca2020738290b86cdda7070fdb8aa2a1c46e9 100644 (file)
--- a/server/decode.c
+++ b/server/decode.c
@@ -33,11 +33,11 @@
 #include <assert.h>
 #include <fnmatch.h>
 #include <mad.h>
 #include <assert.h>
 #include <fnmatch.h>
 #include <mad.h>

-#include <ao/ao.h>

 
 #include "log.h"
 #include "syscalls.h"
 #include "defs.h"
 
 #include "log.h"
 #include "syscalls.h"
 #include "defs.h"

+#include "speaker-protocol.h"

 
 /** @brief Encoding lookup table type */
 struct decoder {
 
 /** @brief Encoding lookup table type */
 struct decoder {


@@ -89,19 +89,17 @@ static inline void output_16(uint16_t n) {
  */
 static void output_header(int rate,
                          int channels,
  */
 static void output_header(int rate,
                          int channels,

-                         int bits) {
-  static int already_written_header;
-  struct ao_sample_format format;
-
-  if(!already_written_header) {
-     format.rate = rate;
-     format.bits = bits;
-     format.channels = channels;
-     format.byte_format = AO_FMT_BIG;
-     if(fwrite(&format, sizeof format, 1, outputfp) < 1)
-       fatal(errno, "decoding %s: writing format header", path);
-     already_written_header = 1;
-   }
+                         int bits,
+                          int nbytes) {
+  struct stream_header header;
+
+  header.rate = rate;
+  header.bits = bits;
+  header.channels = channels;
+  header.endian = ENDIAN_BIG;
+  header.nbytes = nbytes;
+  if(fwrite(&header, sizeof header, 1, outputfp) < 1)
+    fatal(errno, "decoding %s: writing format header", path);

 }
 
 /** @brief Dithering state
 }
 
 /** @brief Dithering state


@@ -184,7 +182,8 @@ static enum mad_flow mp3_output(void attribute((unused)) *data,
 
   output_header(header->samplerate,
                pcm->channels,
 
   output_header(header->samplerate,
                pcm->channels,

-               16);
+               16,
+                2 * pcm->channels * pcm->length);

   switch(pcm->channels) {
   case 1:
     while(n--)
   switch(pcm->channels) {
   case 1:
     while(n--)


@@ -218,17 +217,10 @@ static enum mad_flow mp3_input(void attribute((unused)) *data,
 static enum mad_flow mp3_error(void attribute((unused)) *data,
                               struct mad_stream *stream,
                               struct mad_frame attribute((unused)) *frame) {
 static enum mad_flow mp3_error(void attribute((unused)) *data,
                               struct mad_stream *stream,
                               struct mad_frame attribute((unused)) *frame) {

-  error(0, "decoding %s: %s (%#04x)",
-       path, mad_stream_errorstr(stream), stream->error);
-  return MAD_FLOW_CONTINUE;
-}
-
-/** @brief MP3 header callback */
-static enum mad_flow mp3_header(void attribute((unused)) *data,
-                               struct mad_header const *header) {
-  output_header(header->samplerate,
-               MAD_NCHANNELS(header),
-               16);
+  if(0)
+    /* Just generates pointless verbosity l-( */
+    error(0, "decoding %s: %s (%#04x)",
+          path, mad_stream_errorstr(stream), stream->error);

   return MAD_FLOW_CONTINUE;
 }
 
   return MAD_FLOW_CONTINUE;
 }
 


@@ -237,7 +229,7 @@ static void decode_mp3(void) {
   struct mad_decoder mad[1];
 
   open_input();
   struct mad_decoder mad[1];
 
   open_input();

-  mad_decoder_init(mad, 0/*data*/, mp3_input, mp3_header, 0/*filter*/,
+  mad_decoder_init(mad, 0/*data*/, mp3_input, 0/*header*/, 0/*filter*/,

                   mp3_output, mp3_error, 0/*message*/);
   if(mad_decoder_run(mad, MAD_DECODER_MODE_SYNC))
     exit(1);
                   mp3_output, mp3_error, 0/*message*/);
   if(mad_decoder_run(mad, MAD_DECODER_MODE_SYNC))
     exit(1);