X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fmain.c;h=5fe46adb791cb5d65dfdeb4266e493d8ab4bbccd;hb=be234dc464159da366ec770fe8e5a958f317f7a9;hp=8c78c8edfe170dbcdb79134aebddbbf45facd94d;hpb=aa2ca1e3487019fe143a17bedbe9b667e816d095;p=fdkaac.git diff --git a/src/main.c b/src/main.c index 8c78c8e..5fe46ad 100644 --- a/src/main.c +++ b/src/main.c @@ -24,18 +24,59 @@ #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) { @@ -92,10 +133,6 @@ PROGNAME " %s\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" " -f, --transport-format Transport format\n" " 0: RAW (default, muxed into M4A)\n" " 1: ADIF\n" @@ -108,8 +145,16 @@ PROGNAME " %s\n" " transport layer\n" "\n" " -o Output filename\n" -" --ignorelength 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" @@ -139,55 +184,45 @@ PROGNAME " %s\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 *name; - const char *data; - uint32_t data_size; -} 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_entry_t *tag_table; - unsigned tag_count; - unsigned tag_table_capacity; -} aacenc_param_ex_t; + aacenc_tag_store_t tags; + aacenc_tag_store_t source_tags; + aacenc_translate_generic_text_tag_ctx_t source_tag_ctx; -static -void param_add_itmf_entry(aacenc_param_ex_t *params, uint32_t tag, - const char *key, const char *value, uint32_t size) -{ - aacenc_tag_entry_t *entry; - 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; - } - entry = params->tag_table + params->tag_count; - entry->tag = tag; - if (tag == M4AF_FOURCC('-','-','-','-')) - entry->name = key; - entry->data = value; - entry->data_size = size; - params->tag_count++; -} + char *json_filename; +} aacenc_param_ex_t; static int parse_options(int argc, char **argv, aacenc_param_ex_t *params) @@ -195,11 +230,15 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) int ch; unsigned n; -#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_LONG_TAG M4AF_FOURCC('l','t','a','g') +#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' }, @@ -209,13 +248,15 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) { "bandwidth", required_argument, 0, 'w' }, { "afterburner", required_argument, 0, 'a' }, { "lowdelay-sbr", no_argument, 0, 'L' }, - { "sbr-signaling", required_argument, 0, 's' }, { "transport-format", required_argument, 0, 'f' }, { "adts-crc-check", no_argument, 0, 'C' }, { "header-period", required_argument, 0, 'P' }, + { "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 }, @@ -235,13 +276,15 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) { "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:SR", + 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': @@ -284,13 +327,6 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) case 'L': params->lowdelay_sbr = 1; break; - case 's': - if (sscanf(optarg, "%u", &n) != 1 || n > 2) { - fprintf(stderr, "invalid arg for sbr-signaling\n"); - return -1; - } - params->sbr_signaling = n; - break; case 'f': if (sscanf(optarg, "%u", &n) != 1) { fprintf(stderr, "invalid arg for transport-format\n"); @@ -298,7 +334,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': @@ -311,12 +347,25 @@ 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; @@ -349,9 +398,11 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) case M4AF_TAG_TRACK: case M4AF_TAG_DISK: case M4AF_TAG_TEMPO: - param_add_itmf_entry(params, ch, 0, optarg, strlen(optarg)); + 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; @@ -363,7 +414,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) return -1; } *val++ = '\0'; - if (ch == OPT_SHORT_TAG) { + 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'. @@ -381,9 +432,14 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) for (; *optarg; ++optarg) fcc = ((fcc << 8) | (*optarg & 0xff)); } - param_add_itmf_entry(params, fcc, optarg, val, strlen(val)); + aacenc_add_tag_to_store(¶ms->tags, fcc, optarg, + val, strlen(val), + ch == OPT_SHORT_TAG_FILE); } break; + case OPT_TAG_FROM_JSON: + params->json_filename = optarg; + break; default: return usage(), -1; } @@ -416,7 +472,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) }; static -int write_sample(FILE *ofp, m4af_writer_t *m4af, +int write_sample(FILE *ofp, m4af_ctx_t *m4af, const void *data, uint32_t size, uint32_t duration) { if (!m4af) { @@ -433,13 +489,11 @@ 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(pcm_reader_t *reader, HANDLE_AACENCODER encoder, + uint32_t frame_length, FILE *ofp, m4af_ctx_t *m4af, int show_progress) { - uint8_t *ibuf = 0; - int16_t *pcmbuf = 0; - uint32_t pcmsize = 0; + int16_t *ibuf = 0; uint8_t *obuf = 0; uint32_t olen; uint32_t osize = 0; @@ -448,27 +502,23 @@ int encode(wav_reader_t *wavf, HANDLE_AACENCODER encoder, int rc = -1; int frames_written = 0; aacenc_progress_t progress = { 0 }; - const pcm_sample_description_t *format = wav_get_format(wavf); + const pcm_sample_description_t *fmt = pcm_get_format(reader); - ibuf = malloc(frame_length * format->bytes_per_frame); - aacenc_progress_init(&progress, wav_get_length(wavf), format->sample_rate); + ibuf = malloc(frame_length * fmt->bytes_per_frame); + aacenc_progress_init(&progress, pcm_get_length(reader), fmt->sample_rate); do { - if (nread) { - if ((nread = wav_read_frames(wavf, ibuf, frame_length)) < 0) { + if (g_interrupted) + nread = 0; + else if (nread) { + 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; - } } if (show_progress) - aacenc_progress_update(&progress, wav_get_position(wavf), - format->sample_rate * 2); + aacenc_progress_update(&progress, pcm_get_position(reader), + fmt->sample_rate * 2); } - if ((consumed = aac_encode_frame(encoder, format, pcmbuf, nread, + if ((consumed = aac_encode_frame(encoder, fmt, ibuf, nread, &obuf, &olen, &osize)) < 0) goto END; if (olen > 0) { @@ -479,131 +529,16 @@ int encode(wav_reader_t *wavf, HANDLE_AACENCODER encoder, } while (nread > 0 || olen > 0); if (show_progress) - aacenc_progress_finish(&progress, wav_get_position(wavf)); + aacenc_progress_finish(&progress, pcm_get_position(reader)); rc = frames_written; END: if (ibuf) free(ibuf); - if (pcmbuf) free(pcmbuf); if (obuf) free(obuf); return rc; } static -void put_tag_entry(m4af_writer_t *m4af, const aacenc_tag_entry_t *tag) -{ - unsigned m, n = 0; - - switch (tag->tag) { - case M4AF_TAG_TRACK: - if (sscanf(tag->data, "%u/%u", &m, &n) >= 1) - m4af_add_itmf_track_tag(m4af, m, n); - break; - case M4AF_TAG_DISK: - if (sscanf(tag->data, "%u/%u", &m, &n) >= 1) - m4af_add_itmf_disk_tag(m4af, m, n); - break; - case M4AF_TAG_GENRE_ID3: - if (sscanf(tag->data, "%u", &n) == 1) - m4af_add_itmf_genre_tag(m4af, n); - break; - case M4AF_TAG_TEMPO: - if (sscanf(tag->data, "%u", &n) == 1) - m4af_add_itmf_int16_tag(m4af, tag->tag, n); - break; - case M4AF_TAG_COMPILATION: - case M4AF_FOURCC('a','k','I','D'): - case M4AF_FOURCC('h','d','v','d'): - case M4AF_FOURCC('p','c','s','t'): - case M4AF_FOURCC('p','g','a','p'): - case M4AF_FOURCC('r','t','n','g'): - case M4AF_FOURCC('s','t','i','k'): - if (sscanf(tag->data, "%u", &n) == 1) - m4af_add_itmf_int8_tag(m4af, tag->tag, n); - break; - case M4AF_FOURCC('a','t','I','D'): - case M4AF_FOURCC('c','m','I','D'): - case M4AF_FOURCC('c','n','I','D'): - case M4AF_FOURCC('g','e','I','D'): - case M4AF_FOURCC('s','f','I','D'): - case M4AF_FOURCC('t','v','s','n'): - case M4AF_FOURCC('t','v','s','s'): - if (sscanf(tag->data, "%u", &n) == 1) - m4af_add_itmf_int32_tag(m4af, tag->tag, n); - break; - case M4AF_FOURCC('p','l','I','D'): - { - int64_t qn; - if (sscanf(tag->data, "%" SCNd64, &qn) == 1) - m4af_add_itmf_int64_tag(m4af, tag->tag, qn); - break; - } - case M4AF_TAG_ARTWORK: - { - int data_type = 0; - if (!memcmp(tag->data, "GIF", 3)) - data_type = M4AF_GIF; - else if (!memcmp(tag->data, "\xff\xd8\xff", 3)) - data_type = M4AF_JPEG; - else if (!memcmp(tag->data, "\x89PNG", 4)) - data_type = M4AF_PNG; - if (data_type) - m4af_add_itmf_short_tag(m4af, tag->tag, data_type, - tag->data, tag->data_size); - break; - } - case M4AF_FOURCC('-','-','-','-'): - { - char *u8 = aacenc_to_utf8(tag->data); - m4af_add_itmf_long_tag(m4af, tag->name, u8); - free(u8); - break; - } - case M4AF_TAG_TITLE: - case M4AF_TAG_ARTIST: - case M4AF_TAG_ALBUM: - case M4AF_TAG_GENRE: - case M4AF_TAG_DATE: - case M4AF_TAG_COMPOSER: - case M4AF_TAG_GROUPING: - case M4AF_TAG_COMMENT: - case M4AF_TAG_LYRICS: - case M4AF_TAG_TOOL: - case M4AF_TAG_ALBUM_ARTIST: - case M4AF_TAG_DESCRIPTION: - case M4AF_TAG_LONG_DESCRIPTION: - case M4AF_TAG_COPYRIGHT: - case M4AF_FOURCC('a','p','I','D'): - case M4AF_FOURCC('c','a','t','g'): - case M4AF_FOURCC('k','e','y','w'): - case M4AF_FOURCC('p','u','r','d'): - case M4AF_FOURCC('p','u','r','l'): - case M4AF_FOURCC('s','o','a','a'): - case M4AF_FOURCC('s','o','a','l'): - case M4AF_FOURCC('s','o','a','r'): - case M4AF_FOURCC('s','o','c','o'): - case M4AF_FOURCC('s','o','n','m'): - case M4AF_FOURCC('s','o','s','n'): - case M4AF_FOURCC('t','v','e','n'): - case M4AF_FOURCC('t','v','n','n'): - case M4AF_FOURCC('t','v','s','h'): - case M4AF_FOURCC('x','i','d',' '): - case M4AF_FOURCC('\xa9','e','n','c'): - case M4AF_FOURCC('\xa9','s','t','3'): - { - char *u8 = aacenc_to_utf8(tag->data); - m4af_add_itmf_string_tag(m4af, tag->tag, u8); - free(u8); - break; - } - default: - fprintf(stderr, "WARNING: unknown/unsupported tag: %c%c%c%c\n", - tag->tag >> 24, (tag->tag >> 16) & 0xff, - (tag->tag >> 8) & 0xff, tag->tag & 0xff); - } -} - -static -void put_tool_tag(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]; @@ -631,17 +566,26 @@ void put_tool_tag(m4af_writer_t *m4af, const aacenc_param_ex_t *params, } static -int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params, +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; - for (i = 0; i < params->tag_count; ++i, ++tag) - put_tag_entry(m4af, tag); + 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); + + 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) < 0) { + if (m4af_finalize(m4af, params->moov_before_mdat) < 0) { fprintf(stderr, "ERROR: failed to finalize m4a\n"); return -1; } @@ -704,25 +648,92 @@ int parse_raw_spec(const char *spec, pcm_sample_description_t *desc) 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, 0 }; + +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: + goto END; + } + } + return pcm_open_sint16_converter(reader); +END: + return 0; +} + int main(int argc, char **argv) { - wav_io_context_t wav_io = { read_callback, seek_callback, tell_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; + 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; setlocale(LC_CTYPE, ""); setbuf(stderr, 0); @@ -730,37 +741,21 @@ 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; - wav_io.tell = 0; - } - if (!params.is_raw) { - if ((wavf = wav_open(&wav_io, ifp, params.ignore_length)) == 0) { - fprintf(stderr, "ERROR: broken / unsupported input file\n"); - goto END; - } - } else { - 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 ((wavf = raw_open(&wav_io, ifp, &desc)) == 0) { - fprintf(stderr, "ERROR: failed to open raw input\n"); - goto END; - } - } - sample_format = wav_get_format(wavf); + + 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. + */ + params.sbr_signaling = (params.transport_format == TT_MP4_LOAS) ? 2 : 0; if (aacenc_init(&encoder, (aacenc_param_t*)¶ms, sample_format, &aacinfo) < 0) @@ -772,35 +767,48 @@ 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(); + sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)¶ms); 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) + if (sbr_mode) downsampled_timescale = 1; scale = sample_format->sample_rate >> downsampled_timescale; - if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io, ofp)) < 0) + 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); + 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, - !params.silent); + frame_count = encode(reader, encoder, aacinfo.frameLength, + params.output_fp, m4af, !params.silent); 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; + 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 << 1; + if (sbr_mode && (delay & 1)) + ++delay; + padding = frame_count * aacinfo.frameLength - frames_read - delay; m4af_set_priming(m4af, 0, delay >> downsampled_timescale, padding >> downsampled_timescale); if (finalize_m4a(m4af, ¶ms, encoder) < 0) @@ -808,13 +816,16 @@ int main(int argc, char **argv) } 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; }