X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fmain.c;h=8521a33ebd9791b174356c8cf24386f43c6205ea;hb=e1adc1783585421fdbd32d9a1d3edf5337e9af4f;hp=e12e8fb170bd4e371d9e56f7ddffcb56c1eb9233;hpb=7222b0b5ac62421a9f2b7514e519a9a691300a0d;p=fdkaac.git diff --git a/src/main.c b/src/main.c index e12e8fb..8521a33 100644 --- a/src/main.c +++ b/src/main.c @@ -8,9 +8,15 @@ #if HAVE_STDINT_H # include #endif +#if HAVE_INTTYPES_H +# include +#elif defined(_MSC_VER) +# define SCNd64 "I64d" +#endif #include #include #include +#include #include #include #include @@ -18,28 +24,71 @@ #if HAVE_UNISTD_H #include #endif +#if HAVE_SIGACTION +#include +#endif #ifdef _WIN32 #include +#define WIN32_LEAN_AND_MEAN +#include #endif #include "compat.h" #include "wav_reader.h" +#include "caf_reader.h" #include "aacenc.h" #include "m4af.h" #include "progress.h" #include "version.h" +#include "metadata.h" #define PROGNAME "fdkaac" +static volatile int g_interrupted = 0; + +#if HAVE_SIGACTION +static void signal_handler(int signum) +{ + g_interrupted = 1; +} +static void handle_signals(void) +{ + int i, sigs[] = { SIGINT, SIGHUP, SIGTERM }; + for (i = 0; i < sizeof(sigs)/sizeof(sigs[0]); ++i) { + struct sigaction sa = { 0 }; + sa.sa_handler = signal_handler; + sa.sa_flags |= SA_RESTART; + sigaction(sigs[i], &sa, 0); + } +} +#elif defined(_WIN32) +static BOOL WINAPI signal_handler(DWORD type) +{ + g_interrupted = 1; + return TRUE; +} + +static void handle_signals(void) +{ + SetConsoleCtrlHandler(signal_handler, TRUE); +} +#else +static void handle_signals(void) +{ +} +#endif + static int read_callback(void *cookie, void *data, uint32_t size) { - return fread(data, 1, size, (FILE*)cookie); + size_t rc = fread(data, 1, size, (FILE*)cookie); + return ferror((FILE*)cookie) ? -1 : (int)rc; } static int write_callback(void *cookie, const void *data, uint32_t size) { - return fwrite(data, 1, size, (FILE*)cookie); + size_t rc = fwrite(data, 1, size, (FILE*)cookie); + return ferror((FILE*)cookie) ? -1 : (int)rc; } static @@ -80,14 +129,17 @@ PROGNAME " %s\n" " parameter settings, sample rate, and\n" " channel configuration)\n" " -w, --bandwidth Frequency bandwidth in Hz (AAC LC only)\n" -" -a, --afterurner Afterburner\n" +" -a, --afterburner Afterburner\n" " 0: Off\n" " 1: On(default)\n" -" -L, --lowdelay-sbr Enable ELD-SBR (AAC ELD only)\n" -" -s, --sbr-signaling SBR signaling mode\n" -" 0: Implicit, backward compatible(default)\n" -" 1: Explicit SBR and implicit PS\n" -" 2: Explicit hierarchical signaling\n" +" -L, --lowdelay-sbr <-1|0|1> Configure SBR activity on AAC ELD\n" +" -1: Use ELD SBR auto configurator\n" +" 0: Disable SBR on ELD (default)\n" +" 1: Enable SBR on ELD\n" +" -s, --sbr-ratio <0|1|2> Controls activation of downsampled SBR\n" +" 0: Use lib default (default)\n" +" 1: downsampled SBR (default for ELD+SBR)\n" +" 2: dual-rate SBR (default for HE-AAC)\n" " -f, --transport-format Transport format\n" " 0: RAW (default, muxed into M4A)\n" " 1: ADIF\n" @@ -95,12 +147,35 @@ PROGNAME " %s\n" " 6: LATM MCP=1\n" " 7: LATM MCP=0\n" " 10: LOAS/LATM (LATM within LOAS)\n" -" -c, --adts-crc-check Add CRC protection on ADTS header\n" +" -C, --adts-crc-check Add CRC protection on ADTS header\n" " -h, --header-period StreamMuxConfig/PCE repetition period in\n" " transport layer\n" "\n" " -o Output filename\n" -" --ignore-length Ignore length of WAV header\n" +" -G, --gapless-mode Encoder delay signaling for gapless playback\n" +" 0: iTunSMPB (default)\n" +" 1: ISO standard (edts + sgpd)\n" +" 2: Both\n" +" --include-sbr-delay Count SBR decoder delay in encoder delay\n" +" This is not iTunes compatible, but is default\n" +" behavior of FDK library.\n" +" -I, --ignorelength Ignore length of WAV header\n" +" -S, --silent Don't print progress messages\n" +" --moov-before-mdat Place moov box before mdat box on m4a output\n" +"\n" +"Options for raw (headerless) input:\n" +" -R, --raw Treat input as raw (by default WAV is\n" +" assumed)\n" +" --raw-channels Number of channels (default: 2)\n" +" --raw-rate Sample rate (default: 44100)\n" +" --raw-format Sample format, default is \"S16L\".\n" +" Spec is as follows:\n" +" 1st char: S(igned)|U(nsigned)|F(loat)\n" +" 2nd part: bits per channel\n" +" Last char: L(ittle)|B(ig)\n" +" Last char can be omitted, in which case L is\n" +" assumed. Spec is case insensitive, therefore\n" +" \"u16b\" is same as \"U16B\".\n" "\n" "Tagging options:\n" " --title \n" @@ -115,65 +190,109 @@ PROGNAME " %s\n" " --track \n" " --disk \n" " --tempo \n" +" --tag : Set iTunes predefined tag with four char code.\n" +" --tag-from-file :\n" +" Same as above, but value is read from file.\n" +" --long-tag : Set arbitrary tag as iTunes custom metadata.\n" +" --tag-from-json \n" +" Read tags from JSON. By default, tags are\n" +" assumed to be direct children of the root\n" +" object(dictionary).\n" +" Optionally, position of the dictionary\n" +" that contains tags can be specified with\n" +" dotted notation.\n" +" Example:\n" +" --tag-from-json /path/to/json?format.tags\n" , fdkaac_version); } -typedef struct aacenc_tag_entry_t { - uint32_t tag; - const char *data; -} aacenc_tag_entry_t; - typedef struct aacenc_param_ex_t { AACENC_PARAMS char *input_filename; + FILE *input_fp; char *output_filename; + FILE *output_fp; + unsigned gapless_mode; + unsigned include_sbr_delay; unsigned ignore_length; + int silent; + int moov_before_mdat; + + int is_raw; + unsigned raw_channels; + unsigned raw_rate; + const char *raw_format; + + aacenc_tag_store_t tags; + aacenc_tag_store_t source_tags; + aacenc_translate_generic_text_tag_ctx_t source_tag_ctx; - aacenc_tag_entry_t *tag_table; - unsigned tag_count; - unsigned tag_table_capacity; + char *json_filename; } aacenc_param_ex_t; static int parse_options(int argc, char **argv, aacenc_param_ex_t *params) { int ch; - unsigned n; - aacenc_tag_entry_t *tag; + int n; + +#define OPT_INCLUDE_SBR_DELAY M4AF_FOURCC('s','d','l','y') +#define OPT_MOOV_BEFORE_MDAT M4AF_FOURCC('m','o','o','v') +#define OPT_RAW_CHANNELS M4AF_FOURCC('r','c','h','n') +#define OPT_RAW_RATE M4AF_FOURCC('r','r','a','t') +#define OPT_RAW_FORMAT M4AF_FOURCC('r','f','m','t') +#define OPT_SHORT_TAG M4AF_FOURCC('s','t','a','g') +#define OPT_SHORT_TAG_FILE M4AF_FOURCC('s','t','g','f') +#define OPT_LONG_TAG M4AF_FOURCC('l','t','a','g') +#define OPT_TAG_FROM_JSON M4AF_FOURCC('t','f','j','s') static struct option long_options[] = { { "help", no_argument, 0, 'h' }, { "profile", required_argument, 0, 'p' }, { "bitrate", required_argument, 0, 'b' }, - { "biterate-mode", required_argument, 0, 'm' }, + { "bitrate-mode", required_argument, 0, 'm' }, { "bandwidth", required_argument, 0, 'w' }, { "afterburner", required_argument, 0, 'a' }, - { "lowdelay-sbr", no_argument, 0, 'L' }, - { "sbr-signaling", required_argument, 0, 's' }, + { "lowdelay-sbr", required_argument, 0, 'L' }, + { "sbr-ratio", required_argument, 0, 's' }, { "transport-format", required_argument, 0, 'f' }, - { "adts-crc-check", no_argument, 0, 'c' }, + { "adts-crc-check", no_argument, 0, 'C' }, { "header-period", required_argument, 0, 'P' }, - { "ignore-length", no_argument, 0, 'I' }, - - { "title", required_argument, 0, M4AF_TAG_TITLE }, - { "artist", required_argument, 0, M4AF_TAG_ARTIST }, - { "album", required_argument, 0, M4AF_TAG_ALBUM }, - { "genre", required_argument, 0, M4AF_TAG_GENRE }, - { "date", required_argument, 0, M4AF_TAG_DATE }, - { "composer", required_argument, 0, M4AF_TAG_COMPOSER }, - { "grouping", required_argument, 0, M4AF_TAG_GROUPING }, - { "comment", required_argument, 0, M4AF_TAG_COMMENT }, - { "album-artist", required_argument, 0, M4AF_TAG_ALBUM_ARTIST }, - { "track", required_argument, 0, M4AF_TAG_TRACK }, - { "disk", required_argument, 0, M4AF_TAG_DISK }, - { "tempo", required_argument, 0, M4AF_TAG_TEMPO }, + { "gapless-mode", required_argument, 0, 'G' }, + { "include-sbr-delay", no_argument, 0, OPT_INCLUDE_SBR_DELAY }, + { "ignorelength", no_argument, 0, 'I' }, + { "silent", no_argument, 0, 'S' }, + { "moov-before-mdat", no_argument, 0, OPT_MOOV_BEFORE_MDAT }, + + { "raw", no_argument, 0, 'R' }, + { "raw-channels", required_argument, 0, OPT_RAW_CHANNELS }, + { "raw-rate", required_argument, 0, OPT_RAW_RATE }, + { "raw-format", required_argument, 0, OPT_RAW_FORMAT }, + + { "title", required_argument, 0, M4AF_TAG_TITLE }, + { "artist", required_argument, 0, M4AF_TAG_ARTIST }, + { "album", required_argument, 0, M4AF_TAG_ALBUM }, + { "genre", required_argument, 0, M4AF_TAG_GENRE }, + { "date", required_argument, 0, M4AF_TAG_DATE }, + { "composer", required_argument, 0, M4AF_TAG_COMPOSER }, + { "grouping", required_argument, 0, M4AF_TAG_GROUPING }, + { "comment", required_argument, 0, M4AF_TAG_COMMENT }, + { "album-artist", required_argument, 0, M4AF_TAG_ALBUM_ARTIST }, + { "track", required_argument, 0, M4AF_TAG_TRACK }, + { "disk", required_argument, 0, M4AF_TAG_DISK }, + { "tempo", required_argument, 0, M4AF_TAG_TEMPO }, + { "tag", required_argument, 0, OPT_SHORT_TAG }, + { "tag-from-file", required_argument, 0, OPT_SHORT_TAG_FILE }, + { "long-tag", required_argument, 0, OPT_LONG_TAG }, + { "tag-from-json", required_argument, 0, OPT_TAG_FROM_JSON }, + { 0, 0, 0, 0 }, }; params->afterburner = 1; aacenc_getmainargs(&argc, &argv); - while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:cP:Io:", + while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:CP:G:Io:SR", long_options, 0)) != EOF) { switch (ch) { case 'h': @@ -214,14 +333,18 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) params->afterburner = n; break; case 'L': - params->lowdelay_sbr = 1; + if (sscanf(optarg, "%d", &n) != 1 || n < -1 || n > 1) { + fprintf(stderr, "invalid arg for lowdelay-sbr\n"); + return -1; + } + params->lowdelay_sbr = n; break; case 's': if (sscanf(optarg, "%u", &n) != 1 || n > 2) { - fprintf(stderr, "invalid arg for sbr-signaling\n"); + fprintf(stderr, "invalid arg for sbr-ratio\n"); return -1; } - params->sbr_signaling = n; + params->sbr_ratio = n; break; case 'f': if (sscanf(optarg, "%u", &n) != 1) { @@ -230,7 +353,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) } params->transport_format = n; break; - case 'c': + case 'C': params->adts_crc_check = 1; break; case 'P': @@ -243,9 +366,45 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) case 'o': params->output_filename = optarg; break; + case 'G': + if (sscanf(optarg, "%u", &n) != 1 || n > 2) { + fprintf(stderr, "invalid arg for gapless-mode\n"); + return -1; + } + params->gapless_mode = n; + break; + case OPT_INCLUDE_SBR_DELAY: + params->include_sbr_delay = 1; + break; case 'I': params->ignore_length = 1; break; + case 'S': + params->silent = 1; + break; + case OPT_MOOV_BEFORE_MDAT: + params->moov_before_mdat = 1; + break; + case 'R': + params->is_raw = 1; + break; + case OPT_RAW_CHANNELS: + if (sscanf(optarg, "%u", &n) != 1) { + fprintf(stderr, "invalid arg for raw-channels\n"); + return -1; + } + params->raw_channels = n; + break; + case OPT_RAW_RATE: + if (sscanf(optarg, "%u", &n) != 1) { + fprintf(stderr, "invalid arg for raw-rate\n"); + return -1; + } + params->raw_rate = n; + break; + case OPT_RAW_FORMAT: + params->raw_format = optarg; + break; case M4AF_TAG_TITLE: case M4AF_TAG_ARTIST: case M4AF_TAG_ALBUM: @@ -258,18 +417,47 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) case M4AF_TAG_TRACK: case M4AF_TAG_DISK: case M4AF_TAG_TEMPO: - if (params->tag_count == params->tag_table_capacity) { - unsigned newsize = params->tag_table_capacity; - newsize = newsize ? newsize * 2 : 1; - params->tag_table = - realloc(params->tag_table, - newsize * sizeof(aacenc_tag_entry_t)); - params->tag_table_capacity = newsize; + aacenc_add_tag_to_store(¶ms->tags, ch, 0, optarg, + strlen(optarg), 0); + break; + case OPT_SHORT_TAG: + case OPT_SHORT_TAG_FILE: + case OPT_LONG_TAG: + { + char *val; + size_t klen; + unsigned fcc = M4AF_FOURCC('-','-','-','-'); + + if ((val = strchr(optarg, ':')) == 0) { + fprintf(stderr, "invalid arg for tag\n"); + return -1; + } + *val++ = '\0'; + if (ch == OPT_SHORT_TAG || ch == OPT_SHORT_TAG_FILE) { + /* + * take care of U+00A9(COPYRIGHT SIGN). + * 1) if length of fcc is 3, we prepend '\xa9'. + * 2) U+00A9 becomes "\xc2\xa9" in UTF-8. Therefore + * we remove first '\xc2'. + */ + if (optarg[0] == '\xc2') + ++optarg; + if ((klen = strlen(optarg))== 3) + fcc = 0xa9; + else if (klen != 4) { + fprintf(stderr, "invalid arg for tag\n"); + return -1; + } + for (; *optarg; ++optarg) + fcc = ((fcc << 8) | (*optarg & 0xff)); + } + aacenc_add_tag_to_store(¶ms->tags, fcc, optarg, + val, strlen(val), + ch == OPT_SHORT_TAG_FILE); } - tag = params->tag_table + params->tag_count; - tag->tag = ch; - tag->data = optarg; - params->tag_count++; + break; + case OPT_TAG_FROM_JSON: + params->json_filename = optarg; break; default: return usage(), -1; @@ -277,6 +465,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) } if (argc == optind) return usage(), -1; + if (!params->bitrate && !params->bitrate_mode) { fprintf(stderr, "bitrate or bitrate-mode is mandatory\n"); return -1; @@ -288,20 +477,29 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) } if (params->bitrate && params->bitrate < 10000) params->bitrate *= 1000; + + if (params->is_raw) { + if (!params->raw_channels) + params->raw_channels = 2; + if (!params->raw_rate) + params->raw_rate = 44100; + if (!params->raw_format) + params->raw_format = "S16L"; + } params->input_filename = argv[optind]; return 0; }; static -int write_sample(FILE *ofp, m4af_writer_t *m4af, - const void *data, uint32_t size, uint32_t duration) +int write_sample(FILE *ofp, m4af_ctx_t *m4af, aacenc_frame_t *frame) { if (!m4af) { - if (fwrite(data, 1, size, ofp) < 0) { + fwrite(frame->data, 1, frame->size, ofp); + if (ferror(ofp)) { fprintf(stderr, "ERROR: fwrite(): %s\n", strerror(errno)); return -1; } - } else if (m4af_write_sample(m4af, 0, data, size, duration) < 0) { + } else if (m4af_write_sample(m4af, 0, frame->data, frame->size, 0) < 0) { fprintf(stderr, "ERROR: failed to write m4a sample\n"); return -1; } @@ -309,136 +507,126 @@ int write_sample(FILE *ofp, m4af_writer_t *m4af, } static -int encode(wav_reader_t *wavf, HANDLE_AACENCODER encoder, - uint32_t frame_length, FILE *ofp, m4af_writer_t *m4af) +int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, + HANDLE_AACENCODER encoder, uint32_t frame_length, + m4af_ctx_t *m4af) { - uint8_t *ibuf = 0; - int16_t *pcmbuf = 0; - uint32_t pcmsize = 0; - uint8_t *obuf = 0; - uint32_t olen; - uint32_t osize = 0; + int16_t *ibuf = 0, *ip; + aacenc_frame_t obuf[2] = {{ 0 }}, *obp; + unsigned flip = 0; int nread = 1; - int consumed; int rc = -1; - int frames_written = 0; + int remaining, consumed; + int frames_written = 0, encoded = 0; aacenc_progress_t progress = { 0 }; - const pcm_sample_description_t *format = wav_get_format(wavf); - - ibuf = malloc(frame_length * format->bytes_per_frame); - aacenc_progress_init(&progress, wav_get_length(wavf), format->sample_rate); - do { - if (nread) { - if ((nread = wav_read_frames(wavf, ibuf, frame_length)) < 0) { + const pcm_sample_description_t *fmt = pcm_get_format(reader); + + ibuf = malloc(frame_length * fmt->bytes_per_frame); + aacenc_progress_init(&progress, pcm_get_length(reader), fmt->sample_rate); + + for (;;) { + /* + * Since we delay the write, we cannot just exit loop when interrupted. + * Instead, we regard it as EOF. + */ + if (g_interrupted) + nread = 0; + if (nread > 0) { + if ((nread = pcm_read_frames(reader, ibuf, frame_length)) < 0) { fprintf(stderr, "ERROR: read failed\n"); goto END; - } else if (nread > 0) { - if (pcm_convert_to_native_sint16(format, ibuf, nread, - &pcmbuf, &pcmsize) < 0) { - fprintf(stderr, "ERROR: unsupported sample format\n"); - goto END; - } } - aacenc_progress_update(&progress, wav_get_position(wavf), - format->sample_rate * 2); + if (!params->silent) + aacenc_progress_update(&progress, pcm_get_position(reader), + fmt->sample_rate * 2); } - if ((consumed = aac_encode_frame(encoder, format, pcmbuf, nread, - &obuf, &olen, &osize)) < 0) - goto END; - if (olen > 0) { - if (write_sample(ofp, m4af, obuf, olen, frame_length) < 0) + ip = ibuf; + remaining = nread; + do { + obp = &obuf[flip]; + consumed = aac_encode_frame(encoder, fmt, ip, remaining, obp); + if (consumed < 0) goto END; + if (consumed == 0 && obp->size == 0) goto DONE; + if (obp->size == 0) break; + + remaining -= consumed; + ip += consumed * fmt->channels_per_frame; + flip ^= 1; + /* + * As we pad 1 frame at beginning and ending by our extrapolator, + * we want to drop them. + * We delay output by 1 frame by double buffering, and discard + * second frame and final frame from the encoder. + * Since sbr_header is included in the first frame (in case of + * SBR), we cannot discard first frame. So we pick second instead. + */ + ++encoded; + if (encoded == 1 || encoded == 3) + continue; + obp = &obuf[flip]; + if (write_sample(params->output_fp, m4af, obp) < 0) goto END; ++frames_written; - } - } while (nread > 0 || olen > 0); - aacenc_progress_finish(&progress, wav_get_position(wavf)); + } while (remaining > 0); + } +DONE: + if (!params->silent) + aacenc_progress_finish(&progress, pcm_get_position(reader)); rc = frames_written; END: if (ibuf) free(ibuf); - if (pcmbuf) free(pcmbuf); - if (obuf) free(obuf); + if (obuf[0].data) free(obuf[0].data); + if (obuf[1].data) free(obuf[1].data); return rc; } static -int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params, +void put_tool_tag(m4af_ctx_t *m4af, const aacenc_param_ex_t *params, + HANDLE_AACENCODER encoder) +{ + char tool_info[256]; + char *p = tool_info; + LIB_INFO lib_info; + + p += sprintf(p, PROGNAME " %s, ", fdkaac_version); + aacenc_get_lib_info(&lib_info); + p += sprintf(p, "libfdk-aac %s, ", lib_info.versionStr); + if (params->bitrate_mode) + sprintf(p, "VBR mode %d", params->bitrate_mode); + else + sprintf(p, "CBR %dkbps", + aacEncoder_GetParam(encoder, AACENC_BITRATE) / 1000); + + m4af_add_itmf_string_tag(m4af, M4AF_TAG_TOOL, tool_info); +} + +static +int finalize_m4a(m4af_ctx_t *m4af, const aacenc_param_ex_t *params, HANDLE_AACENCODER encoder) { unsigned i; - aacenc_tag_entry_t *tag = params->tag_table; + aacenc_tag_entry_t *tag; + + tag = params->source_tags.tag_table; + for (i = 0; i < params->source_tags.tag_count; ++i, ++tag) + aacenc_write_tag_entry(m4af, tag); - for (i = 0; i < params->tag_count; ++i, ++tag) { - switch (tag->tag) { - case M4AF_TAG_TRACK: - { - unsigned m, n = 0; - if (sscanf(tag->data, "%u/%u", &m, &n) >= 1) - m4af_add_itmf_track_tag(m4af, m, n); - break; - } - case M4AF_TAG_DISK: - { - unsigned m, n = 0; - if (sscanf(tag->data, "%u/%u", &m, &n) >= 1) - m4af_add_itmf_disk_tag(m4af, m, n); - break; - } - case M4AF_TAG_TEMPO: - { - unsigned n; - if (sscanf(tag->data, "%u", &n) == 1) - m4af_add_itmf_int16_tag(m4af, tag->tag, n); - break; - } - default: - { - char *u8 = aacenc_to_utf8(tag->data); - m4af_add_itmf_string_tag(m4af, tag->tag, u8); - free(u8); - } - } - } - { - char tool_info[256]; - char *p = tool_info; - LIB_INFO *lib_info = 0; - - p += sprintf(p, PROGNAME " %s, ", fdkaac_version); - - 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) - break; - p += sprintf(p, "libfdk-aac %s, ", lib_info[i].versionStr); - } - free(lib_info); - if (params->bitrate_mode) - sprintf(p, "VBR mode %d", params->bitrate_mode); - else - sprintf(p, "CBR %dkbps", - aacEncoder_GetParam(encoder, AACENC_BITRATE) / 1000); - - m4af_add_itmf_string_tag(m4af, M4AF_TAG_TOOL, tool_info); - } - if (m4af_finalize(m4af) < 0) { + if (params->json_filename) + aacenc_write_tags_from_json(m4af, params->json_filename); + + tag = params->tags.tag_table; + for (i = 0; i < params->tags.tag_count; ++i, ++tag) + aacenc_write_tag_entry(m4af, tag); + + put_tool_tag(m4af, params, encoder); + + if (m4af_finalize(m4af, params->moov_before_mdat) < 0) { fprintf(stderr, "ERROR: failed to finalize m4a\n"); return -1; } 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) { @@ -449,35 +637,143 @@ char *generate_output_filename(const char *filename, const char *ext) p = malloc(ext_len + 6); sprintf(p, "stdin%s", ext); } else { - const char *base = basename(filename); + const char *base = aacenc_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); + sprintf(p, "%.*s%s", (int)ilen, base, ext); } return p; } +static +int parse_raw_spec(const char *spec, pcm_sample_description_t *desc) +{ + unsigned bits; + unsigned char c_type, c_endian = 'L'; + int type; + + if (sscanf(spec, "%c%u%c", &c_type, &bits, &c_endian) < 2) + return -1; + c_type = toupper(c_type); + c_endian = toupper(c_endian); + + if (c_type == 'S') + type = 1; + else if (c_type == 'U') + type = 2; + else if (c_type == 'F') + type = 4; + else + return -1; + + if (c_endian == 'B') + type |= 8; + else if (c_endian != 'L') + return -1; + + if (c_type == 'F' && bits != 32 && bits != 64) + return -1; + if (c_type != 'F' && (bits < 8 || bits > 32)) + return -1; + + desc->sample_type = type; + desc->bits_per_channel = bits; + return 0; +} + +static pcm_io_vtbl_t pcm_io_vtbl = { + read_callback, seek_callback, tell_callback +}; +static pcm_io_vtbl_t pcm_io_vtbl_noseek = { read_callback, 0, tell_callback }; + +static +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, + strerror(errno)); + goto END; + } + io.cookie = params->input_fp; + if (fstat(fileno(params->input_fp), &stb) == 0 + && (stb.st_mode & S_IFMT) == S_IFREG) + io.vtbl = &pcm_io_vtbl; + else + io.vtbl = &pcm_io_vtbl_noseek; + + if (params->is_raw) { + int bytes_per_channel; + 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; + } + desc.sample_rate = params->raw_rate; + desc.channels_per_frame = params->raw_channels; + bytes_per_channel = (desc.bits_per_channel + 7) / 8; + 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; + } + } else { + int c; + ungetc(c = getc(params->input_fp), params->input_fp); + + switch (c) { + case 'R': + if ((reader = wav_open(&io, params->ignore_length)) == 0) { + fprintf(stderr, "ERROR: broken / unsupported input file\n"); + goto END; + } + break; + case 'c': + params->source_tag_ctx.add = aacenc_add_tag_entry_to_store; + params->source_tag_ctx.add_ctx = ¶ms->source_tags; + if ((reader = caf_open(&io, + aacenc_translate_generic_text_tag, + ¶ms->source_tag_ctx)) == 0) { + fprintf(stderr, "ERROR: broken / unsupported input file\n"); + goto END; + } + break; + default: + fprintf(stderr, "ERROR: unsupported input file\n"); + goto END; + } + } + if ((reader = pcm_open_sint16_converter(reader)) != 0) + reader = extrapolater_open(reader); + return reader; +END: + return 0; +} + int main(int argc, char **argv) { - wav_io_context_t wav_io = { read_callback, seek_callback }; - m4af_io_callbacks_t m4af_io = { - write_callback, seek_callback, tell_callback }; + static m4af_io_callbacks_t m4af_io = { + read_callback, write_callback, seek_callback, tell_callback + }; aacenc_param_ex_t params = { 0 }; int result = 2; - FILE *ifp = 0; - FILE *ofp = 0; char *output_filename = 0; - wav_reader_t *wavf = 0; + pcm_reader_t *reader = 0; HANDLE_AACENCODER encoder = 0; AACENC_InfoStruct aacinfo = { 0 }; - m4af_writer_t *m4af = 0; + LIB_INFO lib_info = { 0 }; + m4af_ctx_t *m4af = 0; const pcm_sample_description_t *sample_format; int downsampled_timescale = 0; int frame_count = 0; - struct stat stb = { 0 }; + int sbr_mode = 0; + unsigned scale_shift = 0; setlocale(LC_CTYPE, ""); setbuf(stderr, 0); @@ -485,20 +781,30 @@ int main(int argc, char **argv) if (parse_options(argc, argv, ¶ms) < 0) return 1; - if ((ifp = aacenc_fopen(params.input_filename, "rb")) == 0) { - aacenc_fprintf(stderr, "ERROR: %s: %s\n", params.input_filename, - strerror(errno)); + if ((reader = open_input(¶ms)) == 0) goto END; - } - if (fstat(fileno(ifp), &stb) == 0 && (stb.st_mode & S_IFMT) != S_IFREG) - wav_io.seek = 0; - - if ((wavf = wav_open(&wav_io, ifp, params.ignore_length)) == 0) { - fprintf(stderr, "ERROR: broken / unsupported input file\n"); - goto END; + 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*)¶ms); + if (sbr_mode && !aacenc_is_sbr_ratio_available()) { + fprintf(stderr, "WARNING: Only dual-rate SBR is available " + "for this version\n"); + params.sbr_ratio = 2; } - sample_format = wav_get_format(wavf); + scale_shift = aacenc_is_dual_rate_sbr((aacenc_param_t*)¶ms); + params.sbr_signaling = (params.transport_format == TT_MP4_LOAS) ? 2 : 0; + if (sbr_mode && !scale_shift) + params.sbr_signaling = 2; if (aacenc_init(&encoder, (aacenc_param_t*)¶ms, sample_format, &aacinfo) < 0) @@ -510,48 +816,71 @@ int main(int argc, char **argv) params.output_filename = output_filename; } - if ((ofp = aacenc_fopen(params.output_filename, "wb")) == 0) { + if ((params.output_fp = aacenc_fopen(params.output_filename, "wb+")) == 0) { aacenc_fprintf(stderr, "ERROR: %s: %s\n", params.output_filename, strerror(errno)); goto END; } + handle_signals(); + if (!params.transport_format) { uint32_t scale; + uint8_t mp4asc[32]; + uint32_t ascsize = sizeof(mp4asc); unsigned framelen = aacinfo.frameLength; - int sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)¶ms); - int sig_mode = aacEncoder_GetParam(encoder, AACENC_SIGNALING_MODE); - if (sbr_mode && !sig_mode) - downsampled_timescale = 1; - scale = sample_format->sample_rate >> downsampled_timescale; - if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io, ofp)) < 0) + scale = sample_format->sample_rate >> scale_shift; + if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io, + params.output_fp)) < 0) goto END; - m4af_decoder_specific_info(m4af, 0, aacinfo.confBuf, aacinfo.confSize); + aacenc_mp4asc((aacenc_param_t*)¶ms, aacinfo.confBuf, + aacinfo.confSize, mp4asc, &ascsize); + m4af_set_decoder_specific_info(m4af, 0, mp4asc, ascsize); m4af_set_fixed_frame_duration(m4af, 0, - framelen >> downsampled_timescale); + 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); } - frame_count = encode(wavf, encoder, aacinfo.frameLength, ofp, m4af); + if (scale_shift && (aacinfo.encoderDelay & 1)) { + /* + * Since odd delay cannot be exactly expressed in downsampled scale, + * we push one zero frame to the encoder here, to make delay even + */ + int16_t zero[8] = { 0 }; + aacenc_frame_t frame = { 0 }; + aac_encode_frame(encoder, sample_format, zero, 1, &frame); + free(frame.data); + } + frame_count = encode(¶ms, reader, encoder, aacinfo.frameLength, m4af); if (frame_count < 0) goto END; if (m4af) { uint32_t delay = aacinfo.encoderDelay; - int64_t frames_read = wav_get_position(wavf); - uint32_t padding = frame_count * aacinfo.frameLength - - frames_read - aacinfo.encoderDelay; - m4af_set_priming(m4af, 0, delay >> downsampled_timescale, - padding >> downsampled_timescale); + uint32_t padding; + int64_t frames_read = pcm_get_position(reader); + + if (sbr_mode && params.profile != AOT_ER_AAC_ELD && + !params.include_sbr_delay) + delay -= 481 << scale_shift; + if (scale_shift && (delay & 1)) + ++delay; + padding = frame_count * aacinfo.frameLength - frames_read - delay; + m4af_set_priming(m4af, 0, delay >> scale_shift, padding >> scale_shift); if (finalize_m4a(m4af, ¶ms, encoder) < 0) goto END; } result = 0; END: - if (wavf) wav_teardown(&wavf); - if (ifp) fclose(ifp); + if (reader) pcm_teardown(&reader); + if (params.input_fp) fclose(params.input_fp); if (m4af) m4af_teardown(&m4af); - if (ofp) fclose(ofp); + if (params.output_fp) fclose(params.output_fp); if (encoder) aacEncClose(&encoder); if (output_filename) free(output_filename); - if (params.tag_table) free(params.tag_table); + if (params.tags.tag_table) + aacenc_free_tag_store(¶ms.tags); + if (params.source_tags.tag_table) + aacenc_free_tag_store(¶ms.source_tags); return result; }