From d533c8e002bd64237ed54ca6b24b55b05578f41f Mon Sep 17 00:00:00 2001 From: nu774 Date: Wed, 30 Oct 2013 11:58:30 +0900 Subject: [PATCH] rename aacenc_result_t -> aacenc_frame_t, simplify write_sample() --- src/aacenc.c | 8 ++++---- src/aacenc.h | 8 ++++---- src/main.c | 22 ++++++++++------------ 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/aacenc.c b/src/aacenc.c index 99c288a..3640498 100644 --- a/src/aacenc.c +++ b/src/aacenc.c @@ -187,7 +187,7 @@ FAIL: int aac_encode_frame(HANDLE_AACENCODER encoder, const pcm_sample_description_t *format, const int16_t *input, unsigned iframes, - aacenc_result_t *output) + aacenc_frame_t *output) { uint32_t ilen = iframes * format->channels_per_frame; AACENC_BufDesc ibdesc = { 0 }, obdesc = { 0 }; @@ -206,10 +206,10 @@ int aac_encode_frame(HANDLE_AACENCODER encoder, channel_mode = aacEncoder_GetParam(encoder, AACENC_CHANNELMODE); obytes = 6144 / 8 * channel_mode; - if (!output->data || output->size < obytes) { + if (!output->data || output->capacity < obytes) { uint8_t *p = realloc(output->data, obytes); if (!p) return -1; - output->size = obytes; + output->capacity = obytes; output->data = p; } obufs[0] = output->data; @@ -232,6 +232,6 @@ int aac_encode_frame(HANDLE_AACENCODER encoder, fprintf(stderr, "ERROR: aacEncEncode() failed\n"); return -1; } - output->len = oargs.numOutBytes; + output->size = oargs.numOutBytes; return oargs.numInSamples / format->channels_per_frame; } diff --git a/src/aacenc.h b/src/aacenc.h index dc6751b..e622054 100644 --- a/src/aacenc.h +++ b/src/aacenc.h @@ -24,10 +24,10 @@ typedef struct aacenc_param_t { AACENC_PARAMS } aacenc_param_t; -typedef struct aacenc_result_t { +typedef struct aacenc_frame_t { uint8_t *data; - uint32_t len, size; -} aacenc_result_t; + uint32_t size, capacity; +} aacenc_frame_t; int aacenc_is_sbr_active(const aacenc_param_t *params); @@ -42,6 +42,6 @@ int aacenc_init(HANDLE_AACENCODER *encoder, const aacenc_param_t *params, int aac_encode_frame(HANDLE_AACENCODER encoder, const pcm_sample_description_t *format, const int16_t *input, unsigned iframes, - aacenc_result_t *output); + aacenc_frame_t *output); #endif diff --git a/src/main.c b/src/main.c index 7d1a68f..c3a9cca 100644 --- a/src/main.c +++ b/src/main.c @@ -472,16 +472,15 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) }; static -int write_sample(FILE *ofp, m4af_ctx_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) { - fwrite(data, 1, size, ofp); + 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; } @@ -494,7 +493,7 @@ int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, m4af_ctx_t *m4af) { int16_t *ibuf = 0, *ip; - aacenc_result_t obuf[2] = {{ 0 }}, *obp; + aacenc_frame_t obuf[2] = {{ 0 }}, *obp; unsigned flip = 0; int nread = 1; int rc = -1; @@ -528,8 +527,8 @@ int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, obp = &obuf[flip]; consumed = aac_encode_frame(encoder, fmt, ip, remaining, obp); if (consumed < 0) goto END; - if (consumed == 0 && obp->len == 0) goto DONE; - if (obp->len == 0) break; + if (consumed == 0 && obp->size == 0) goto DONE; + if (obp->size == 0) break; remaining -= consumed; ip += consumed * fmt->channels_per_frame; @@ -546,8 +545,7 @@ int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, if (encoded == 1 || encoded == 3) continue; obp = &obuf[flip]; - if (write_sample(params->output_fp, m4af, obp->data, obp->len, - frame_length) < 0) + if (write_sample(params->output_fp, m4af, obp) < 0) goto END; ++frames_written; } while (remaining > 0); @@ -829,9 +827,9 @@ int main(int argc, char **argv) * we push one zero frame to the encoder here, to make delay even */ int16_t zero[8] = { 0 }; - aacenc_result_t obuf = { 0 }; - aac_encode_frame(encoder, sample_format, zero, 1, &obuf); - free(obuf.data); + 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) -- 2.39.2