Imported Upstream version 0.6.3

[fdkaac.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6ffb7b197cc6228a6fbc5d18d2f9f5fd0433ac98..1eb9a0e827c6338c9dc1095ca8e988d2e0b0eaec 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -117,9 +117,6 @@ PROGNAME " %s\n"
 "                                29: MPEG-4 HE-AAC v2 (SBR+PS)\n"
 "                                23: MPEG-4 AAC LD\n"
 "                                39: MPEG-4 AAC ELD\n"
-"                               129: MPEG-2 AAC LC\n"
-"                               132: MPEG-2 HE-AAC (SBR)\n"
-"                               156: MPEG-2 HE-AAC v2 (SBR+PS)\n"
 " -b, --bitrate <n>             Bitrate in bits per seconds (for CBR)\n"
 " -m, --bitrate-mode <n>        Bitrate configuration\n"
 "                                 0: CBR (default)\n"
@@ -702,7 +699,6 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
 {
     pcm_io_context_t io = { 0 };
     pcm_reader_t *reader = 0;
-    struct stat stb = { 0 };
 
     if ((params->input_fp = aacenc_fopen(params->input_filename, "rb")) == 0) {
         aacenc_fprintf(stderr, "ERROR: %s: %s\n", params->input_filename,
@@ -710,8 +706,7 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params)
         goto FAIL;
     }
     io.cookie = params->input_fp;
-    if (fstat(fileno(params->input_fp), &stb) == 0
-            && (stb.st_mode & S_IFMT) == S_IFREG)
+    if (aacenc_seekable(params->input_fp))
         io.vtbl = &pcm_io_vtbl;
     else
         io.vtbl = &pcm_io_vtbl_noseek;
@@ -803,12 +798,14 @@ 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 :
-        (params.transport_format == TT_MP4_RAW)  ? 1 : 0;
-    if (sbr_mode && !scale_shift)
-        params.sbr_signaling = 2;
-
+    params.sbr_signaling = 0;
+    if (sbr_mode) {
+        if (params.transport_format == TT_MP4_LOAS || !scale_shift)
+            params.sbr_signaling = 2;
+        if (params.transport_format == TT_MP4_RAW &&
+            aacenc_is_explicit_bw_compatible_sbr_signaling_available())
+            params.sbr_signaling = 1;
+    }
     if (aacenc_init(&encoder, (aacenc_param_t*)&params, sample_format,
                     &aacinfo) < 0)
         goto END;
@@ -834,9 +831,17 @@ int main(int argc, char **argv)
                                 params.output_fp)) < 0)
             goto END;
         m4af_set_num_channels(m4af, 0, sample_format->channels_per_frame);
-        m4af_set_decoder_specific_info(m4af, 0,
-                                       aacinfo.confBuf, aacinfo.confSize);
         m4af_set_fixed_frame_duration(m4af, 0, framelen >> scale_shift);
+        if (aacenc_is_explicit_bw_compatible_sbr_signaling_available())
+            m4af_set_decoder_specific_info(m4af, 0,
+                                           aacinfo.confBuf, aacinfo.confSize);
+        else {
+            uint8_t mp4asc[32];
+            uint32_t ascsize = sizeof(mp4asc);
+            aacenc_mp4asc((aacenc_param_t*)&params, aacinfo.confBuf,
+                          aacinfo.confSize, mp4asc, &ascsize);
+            m4af_set_decoder_specific_info(m4af, 0, mp4asc, ascsize);
+        }
         m4af_set_vbr_mode(m4af, 0, params.bitrate_mode);
         m4af_set_priming_mode(m4af, params.gapless_mode + 1);
         m4af_begin_write(m4af);