unsigned raw_rate;
const char *raw_format;
- aacenc_tag_param_t tags;
+ aacenc_tag_store_t tags;
char *json_filename;
} aacenc_param_ex_t;
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:
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:
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;
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(fmt, ibuf, nread,
- &pcmbuf, &pcmsize) < 0) {
- fprintf(stderr, "ERROR: unsupported sample format\n");
- goto END;
- }
}
if (show_progress)
aacenc_progress_update(&progress, pcm_get_position(reader),
fmt->sample_rate * 2);
}
- if ((consumed = aac_encode_frame(encoder, fmt, pcmbuf, nread,
+ if ((consumed = aac_encode_frame(encoder, fmt, ibuf, nread,
&obuf, &olen, &osize)) < 0)
goto END;
if (olen > 0) {
rc = frames_written;
END:
if (ibuf) free(ibuf);
- if (pcmbuf) free(pcmbuf);
if (obuf) free(obuf);
return rc;
}
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);
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)
{
- wav_io_context_t wav_io = {
- read_callback, seek_callback, tell_callback
- };
+ pcm_io_context_t io = { 0 };
pcm_reader_t *reader = 0;
struct stat stb = { 0 };
strerror(errno));
goto END;
}
- if (fstat(fileno(params->input_fp), &stb) == 0
- && (stb.st_mode & S_IFMT) != S_IFREG) {
- wav_io.seek = 0;
- wav_io.tell = 0;
- }
+ 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 };
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(&wav_io, params->input_fp, &desc)) == 0) {
+ if ((reader = raw_open(&io, &desc)) == 0) {
fprintf(stderr, "ERROR: failed to open raw input\n");
goto END;
}
} else {
- if ((reader = wav_open(&wav_io, params->input_fp,
- params->ignore_length)) == 0) {
+ 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 reader;
+ return 0;
}
int main(int argc, char **argv)
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;
}