output to current working directory by default

[fdkaac.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index fe4653e7d7f412f426e6b4f916d73c69e74259d4..5318fdbf41ce03cf473bca5c24d3b1ed864bc7ff 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -398,8 +398,7 @@ int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
 
         p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
 
-        lib_info = malloc(FDK_MODULE_LAST * sizeof(LIB_INFO));
-        /* XXX: aacEncGetLibInfo() seems buggy and sometimes fails */
+        lib_info = calloc(FDK_MODULE_LAST, sizeof(LIB_INFO));
         if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
             for (i = 0; i < FDK_MODULE_LAST; ++i)
                 if (lib_info[i].module_id == FDK_AACENC)
@@ -421,6 +420,37 @@ int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
     return 0;
 }
 
+static
+const char *basename(const char *filename)
+{
+    char *p = strrchr(filename, '/');
+#ifdef _WIN32
+    char *q = strrchr(filename, '\\');
+    if (p < q) p = q;
+#endif
+    return p ? p + 1 : filename;
+}
+
+static
+char *generate_output_filename(const char *filename, const char *ext)
+{
+    char *p = 0;
+    size_t ext_len = strlen(ext);
+
+    if (strcmp(filename, "-") == 0) {
+        p = malloc(ext_len + 6);
+        sprintf(p, "stdin%s", ext);
+    } else {
+        const char *base = basename(filename);
+        size_t ilen = strlen(base);
+        const char *ext_org = strrchr(base, '.');
+        if (ext_org) ilen = ext_org - base;
+        p = malloc(ilen + ext_len + 1);
+        sprintf(p, "%.*s%s", ilen, base, ext);
+    }
+    return p;
+}
+
 int main(int argc, char **argv)
 {
     wav_io_context_t wav_io = { read_callback, seek_callback };
@@ -466,12 +496,8 @@ int main(int argc, char **argv)
         goto END;
 
     if (!params.output_filename) {
-        size_t ilen = strlen(params.input_filename);
-        const char *ext = strrchr(params.input_filename, '.');
-        if (ext) ilen = ext - params.input_filename;
-        output_filename = malloc(ilen + 5);
-        sprintf(output_filename, "%.*s%s", ilen, params.input_filename,
-                params.transport_format ? ".aac" : ".m4a");
+        const char *ext = params.transport_format ? ".aac" : ".m4a";
+        output_filename = generate_output_filename(params.input_filename, ext);
         params.output_filename = output_filename;
     }