X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Faacenc.c;fp=src%2Faacenc.c;h=364049884796370f732f845e989c7e4dcbc9d7c2;hb=d533c8e002bd64237ed54ca6b24b55b05578f41f;hp=99c288a03a2d8feea78a6327118e81e93051dddf;hpb=c5eec1554942ef99bcf6b2065008fd3730121ec9;p=fdkaac.git 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; }