X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fmain.c;h=a1780704fce84a9589d192007ea7fed6d2e4d4b7;hb=29a8f73fafe37beb8048316cca06ac83dfd1f2e1;hp=eca3a9c30730c46e87defabb73582e767ac74637;hpb=2f6fc566ccaab90a089758155f5dfdd7bfb6d519;p=fdkaac.git diff --git a/src/main.c b/src/main.c index eca3a9c..a178070 100644 --- a/src/main.c +++ b/src/main.c @@ -203,7 +203,9 @@ typedef struct aacenc_param_ex_t { AACENC_PARAMS char *input_filename; + FILE *input_fp; char *output_filename; + FILE *output_fp; unsigned gapless_mode; unsigned ignore_length; int silent; @@ -214,7 +216,7 @@ typedef struct aacenc_param_ex_t { unsigned raw_rate; const char *raw_format; - aacenc_tag_param_t tags; + aacenc_tag_store_t tags; char *json_filename; } aacenc_param_ex_t; @@ -396,8 +398,8 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) case M4AF_TAG_TRACK: case M4AF_TAG_DISK: case M4AF_TAG_TEMPO: - aacenc_param_add_itmf_entry(¶ms->tags, ch, 0, optarg, - strlen(optarg), 0); + aacenc_add_tag_to_store(¶ms->tags, ch, 0, optarg, + strlen(optarg), 0); break; case OPT_SHORT_TAG: case OPT_SHORT_TAG_FILE: @@ -430,9 +432,9 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) for (; *optarg; ++optarg) fcc = ((fcc << 8) | (*optarg & 0xff)); } - aacenc_param_add_itmf_entry(¶ms->tags, fcc, optarg, - val, strlen(val), - ch == OPT_SHORT_TAG_FILE); + aacenc_add_tag_to_store(¶ms->tags, fcc, optarg, + val, strlen(val), + ch == OPT_SHORT_TAG_FILE); } break; case OPT_TAG_FROM_JSON: @@ -487,13 +489,11 @@ int write_sample(FILE *ofp, m4af_ctx_t *m4af, } static -int encode(wav_reader_t *wavf, HANDLE_AACENCODER encoder, +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; @@ -502,29 +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 (g_interrupted) nread = 0; else if (nread) { - if ((nread = wav_read_frames(wavf, ibuf, frame_length)) < 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; - } } 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) { @@ -535,11 +529,10 @@ 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; } @@ -580,10 +573,10 @@ int finalize_m4a(m4af_ctx_t *m4af, const aacenc_param_ex_t *params, aacenc_tag_entry_t *tag = params->tags.tag_table; if (params->json_filename) - aacenc_put_tags_from_json(m4af, params->json_filename); + aacenc_write_tags_from_json(m4af, params->json_filename); for (i = 0; i < params->tags.tag_count; ++i, ++tag) - aacenc_put_tag_entry(m4af, tag); + aacenc_write_tag_entry(m4af, tag); put_tool_tag(m4af, params, encoder); @@ -650,25 +643,72 @@ 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(io.cookie), &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 { + if ((reader = wav_open(&io, params->ignore_length)) == 0) { + fprintf(stderr, "ERROR: broken / unsupported input file\n"); + 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 = { read_callback, 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_ctx_t *m4af = 0; const pcm_sample_description_t *sample_format; int downsampled_timescale = 0; int frame_count = 0; - struct stat stb = { 0 }; setlocale(LC_CTYPE, ""); setbuf(stderr, 0); @@ -676,37 +716,10 @@ 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); if (aacenc_init(&encoder, (aacenc_param_t*)¶ms, sample_format, &aacinfo) < 0) @@ -718,7 +731,7 @@ 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; @@ -732,7 +745,8 @@ int main(int argc, char **argv) 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) + if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io, + params.output_fp)) < 0) goto END; m4af_set_decoder_specific_info(m4af, 0, aacinfo.confBuf, aacinfo.confSize); @@ -742,13 +756,13 @@ int main(int argc, char **argv) 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); + int64_t frames_read = pcm_get_position(reader); uint32_t padding = frame_count * aacinfo.frameLength - frames_read - aacinfo.encoderDelay; m4af_set_priming(m4af, 0, delay >> downsampled_timescale, @@ -758,13 +772,13 @@ 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.tags.tag_table) free(params.tags.tag_table); + if (params.tags.tag_table) aacenc_free_tag_store(¶ms.tags); return result; }