refactor pcm reader framework

[fdkaac.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index ef2fa87b8b60931c19d02930eacb972185b7447f..89af78e644bbb78566fc82cb08f8e9d9e6514897 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -33,8 +33,7 @@
 #include <windows.h>
 #endif
 #include "compat.h"
-#include "wav_reader.h"
-#include "caf_reader.h"
+#include "pcm_reader.h"
 #include "aacenc.h"
 #include "m4af.h"
 #include "progress.h"
@@ -749,8 +748,9 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
             goto END;
         }
     }
-    if ((reader = pcm_open_sint16_converter(reader)) != 0)
-        reader = extrapolater_open(reader);
+    if ((reader = pcm_open_native_converter(reader)) != 0)
+        if ((reader = pcm_open_sint16_converter(reader)) != 0)
+            reader = extrapolater_open(reader);
     return reader;
 END:
     return 0;
@@ -824,8 +824,7 @@ int main(int argc, char **argv)
             goto END;
         m4af_set_decoder_specific_info(m4af, 0,
                                        aacinfo.confBuf, aacinfo.confSize);
-        m4af_set_fixed_frame_duration(m4af, 0,
-                                      framelen >> scale_shift);
+        m4af_set_fixed_frame_duration(m4af, 0, framelen >> scale_shift);
         m4af_set_vbr_mode(m4af, 0, params.bitrate_mode);
         m4af_set_priming_mode(m4af, params.gapless_mode + 1);
         m4af_begin_write(m4af);