X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fmain.c;h=9e104a493cc671eefdc3debc2f949c0479bfab04;hb=b54538f79e8180499baa7d88325733102e061bc5;hp=9e8948824868479d60e13deac2de793f6acc10d9;hpb=ed646ccf797335bd186ad5084973a575a8f0501c;p=fdkaac.git

diff --git a/src/main.c b/src/main.c
index 9e89488..9e104a4 100644
--- 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"
@@ -699,7 +698,7 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
     if ((params->input_fp = aacenc_fopen(params->input_filename, "rb")) == 0) {
         aacenc_fprintf(stderr, "ERROR: %s: %s\n", params->input_filename,
                        strerror(errno));
-        goto END;
+        goto FAIL;
     }
     io.cookie = params->input_fp;
     if (fstat(fileno(params->input_fp), &stb) == 0
@@ -713,7 +712,7 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
         pcm_sample_description_t desc = { 0 };
         if (parse_raw_spec(params->raw_format, &desc) < 0) {
             fprintf(stderr, "ERROR: invalid raw-format spec\n");
-            goto END;
+            goto FAIL;
         }
         desc.sample_rate = params->raw_rate;
         desc.channels_per_frame = params->raw_channels;
@@ -721,7 +720,7 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
         desc.bytes_per_frame = params->raw_channels * bytes_per_channel;
         if ((reader = raw_open(&io, &desc)) == 0) {
             fprintf(stderr, "ERROR: failed to open raw input\n");
-            goto END;
+            goto FAIL;
         }
     } else {
         int c;
@@ -731,7 +730,7 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
         case 'R':
             if ((reader = wav_open(&io, params->ignore_length)) == 0) {
                 fprintf(stderr, "ERROR: broken / unsupported input file\n");
-                goto END;
+                goto FAIL;
             }
             break;
         case 'c':
@@ -741,18 +740,21 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
                                    aacenc_translate_generic_text_tag,
                                    &params->source_tag_ctx)) == 0) {
                 fprintf(stderr, "ERROR: broken / unsupported input file\n");
-                goto END;
+                goto FAIL;
             }
             break;
         default:
             fprintf(stderr, "ERROR: unsupported input file\n");
-            goto END;
+            goto FAIL;
         }
     }
-    if ((reader = pcm_open_sint16_converter(reader)) != 0)
+    reader = pcm_open_native_converter(reader);
+    if (reader && PCM_IS_FLOAT(pcm_get_format(reader)))
+        reader = limiter_open(reader);
+    if (reader && (reader = pcm_open_sint16_converter(reader)) != 0)
         reader = extrapolater_open(reader);
     return reader;
-END:
+FAIL:
     return 0;
 }
 
@@ -785,15 +787,6 @@ int main(int argc, char **argv)
 
     sample_format = pcm_get_format(reader);
 
-    /*
-     * We use explicit/hierarchical signaling for LOAS.
-     * Other than that, we request implicit signaling to FDK library, then 
-     * append explicit/backward-compatible signaling to ASC in case of MP4FF.
-     *
-     * Explicit/backward-compatible signaling of SBR is the most recommended
-     * way in MPEG4 part3 spec, and seems the only way supported by iTunes.
-     * Since FDK library does not support it, we have to do it on our side.
-     */
     sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)&params);
     if (sbr_mode && !aacenc_is_sbr_ratio_available()) {
         fprintf(stderr, "WARNING: Only dual-rate SBR is available "
@@ -801,7 +794,9 @@ int main(int argc, char **argv)
         params.sbr_ratio = 2;
     }
     scale_shift = aacenc_is_dual_rate_sbr((aacenc_param_t*)&params);
-    params.sbr_signaling = (params.transport_format == TT_MP4_LOAS) ? 2 : 0;
+    params.sbr_signaling =
+        (params.transport_format == TT_MP4_LOAS) ? 2 :
+        (params.transport_format == TT_MP4_RAW)  ? 1 : 0;
     if (sbr_mode && !scale_shift)
         params.sbr_signaling = 2;
 
@@ -824,18 +819,14 @@ int main(int argc, char **argv)
 
     if (!params.transport_format) {
         uint32_t scale;
-        uint8_t mp4asc[32];
-        uint32_t ascsize = sizeof(mp4asc);
         unsigned framelen = aacinfo.frameLength;
         scale = sample_format->sample_rate >> scale_shift;
         if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io,
                                 params.output_fp)) < 0)
             goto END;
-        aacenc_mp4asc((aacenc_param_t*)&params, aacinfo.confBuf,
-                      aacinfo.confSize, mp4asc, &ascsize);
-        m4af_set_decoder_specific_info(m4af, 0, mp4asc, ascsize);
-        m4af_set_fixed_frame_duration(m4af, 0,
-                                      framelen >> scale_shift);
+        m4af_set_decoder_specific_info(m4af, 0,
+                                       aacinfo.confBuf, aacinfo.confSize);
+        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);