#include <string.h>
#include "aacenc.h"
+int aacenc_is_explicit_bw_compatible_sbr_signaling_available()
+{
+ LIB_INFO lib_info;
+ aacenc_get_lib_info(&lib_info);
+ return lib_info.version > 0x03040900;
+}
+
+int aacenc_is_sbr_ratio_available()
+{
+#if AACENCODER_LIB_VL0 < 3 || (AACENCODER_LIB_VL0==3 && AACENCODER_LIB_VL1<4)
+ return 0;
+#else
+ LIB_INFO lib_info;
+ aacenc_get_lib_info(&lib_info);
+ return lib_info.version > 0x03040800;
+#endif
+}
+
int aacenc_is_sbr_active(const aacenc_param_t *params)
{
switch (params->profile) {
- case AOT_SBR: case AOT_PS: case AOT_MP2_SBR: case AOT_MP2_PS:
- case AOT_DABPLUS_SBR: case AOT_DABPLUS_PS:
+ case AOT_SBR: case AOT_PS:
case AOT_DRM_SBR: case AOT_DRM_MPEG_PS:
return 1;
}
return 0;
}
+int aacenc_is_dual_rate_sbr(const aacenc_param_t *params)
+{
+ if (params->profile == AOT_PS)
+ return 1;
+ else if (params->profile == AOT_SBR)
+ return params->sbr_ratio == 0 || params->sbr_ratio == 2;
+ else if (params->profile == AOT_ER_AAC_ELD && params->lowdelay_sbr)
+ return params->sbr_ratio == 2;
+ return 0;
+}
+
+void aacenc_get_lib_info(LIB_INFO *info)
+{
+ LIB_INFO *lib_info = 0;
+ lib_info = calloc(FDK_MODULE_LAST, sizeof(LIB_INFO));
+ if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
+ int i;
+ for (i = 0; i < FDK_MODULE_LAST; ++i) {
+ if (lib_info[i].module_id == FDK_AACENC) {
+ memcpy(info, &lib_info[i], sizeof(LIB_INFO));
+ break;
+ }
+ }
+ }
+ free(lib_info);
+}
+
static const unsigned aacenc_sampling_freq_tab[] = {
96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
16000, 12000, 11025, 8000, 7350, 0, 0, 0
uint8_t *outasc, uint32_t *outsize)
{
unsigned asc_sfreq = aacenc_sampling_freq_tab[(asc[0]&0x7)<<1 |asc[1]>>7];
+ unsigned shift = aacenc_is_dual_rate_sbr(params);
switch (params->profile) {
case AOT_SBR:
case AOT_PS:
+ if (!shift)
+ break;
if (*outsize < ascsize + 3)
return -1;
memcpy(outasc, asc, ascsize);
/* sbrPresentFlag:1 (value:1) */
outasc[ascsize+2] = 0x80;
/* extensionSamplingFrequencyIndex:4 */
- outasc[ascsize+2] |= sampling_freq_index(asc_sfreq << 1) << 3;
+ outasc[ascsize+2] |= sampling_freq_index(asc_sfreq << shift) << 3;
if (params->profile == AOT_SBR) {
*outsize = ascsize + 3;
- break;
+ return 0;
}
if (*outsize < ascsize + 5)
return -1;
/* psPresentFlag:1 (value:1) */
outasc[ascsize+4] = 0x80;
*outsize = ascsize + 5;
- break;
- default:
- if (*outsize < ascsize)
- return -1;
- memcpy(outasc, asc, ascsize);
- *outsize = ascsize;
+ return 0;
}
+ if (*outsize < ascsize)
+ return -1;
+ memcpy(outasc, asc, ascsize);
+ *outsize = ascsize;
return 0;
}
{
uint32_t chanmask = format->channel_mask;
- if (format->channels_per_frame > 6)
+ if (format->channels_per_frame > 8)
return 0;
if (!chanmask) {
- static uint32_t defaults[] = { 0x4, 0x3, 0x7, 0, 0x37, 0x3f };
+ static uint32_t defaults[] = { 0x4, 0x3, 0x7, 0, 0x37, 0x3f, 0, 0x63f };
chanmask = defaults[format->channels_per_frame - 1];
}
switch (chanmask) {
case 0x107: return MODE_1_2_1;
case 0x607: return MODE_1_2_2;
case 0x60f: return MODE_1_2_2_1;
+#if AACENCODER_LIB_VL0 > 3 || (AACENCODER_LIB_VL0==3 && AACENCODER_LIB_VL1>=4)
+ case 0xff: return MODE_1_2_2_2_1;
+ case 0x63f: return MODE_7_1_REAR_SURROUND;
+#endif
}
return 0;
}
{
int channel_mode;
int aot;
+ LIB_INFO lib_info;
*encoder = 0;
+ aacenc_get_lib_info(&lib_info);
+
if ((channel_mode = aacenc_channel_mode(format)) == 0) {
fprintf(stderr, "ERROR: unsupported channel layout\n");
goto FAIL;
fprintf(stderr, "ERROR: unsupported sample rate\n");
goto FAIL;
}
- aacEncoder_SetParam(*encoder, AACENC_CHANNELMODE, channel_mode);
+ if (aacEncoder_SetParam(*encoder, AACENC_CHANNELMODE,
+ channel_mode) != AACENC_OK) {
+ fprintf(stderr, "ERROR: unsupported channel mode\n");
+ goto FAIL;
+ }
aacEncoder_SetParam(*encoder, AACENC_BANDWIDTH, params->bandwidth);
aacEncoder_SetParam(*encoder, AACENC_CHANNELORDER, 1);
aacEncoder_SetParam(*encoder, AACENC_AFTERBURNER, !!params->afterburner);
- if (aot == AOT_ER_AAC_ELD && params->lowdelay_sbr)
- aacEncoder_SetParam(*encoder, AACENC_SBR_MODE, 1);
+ aacEncoder_SetParam(*encoder, AACENC_SBR_MODE, params->lowdelay_sbr);
+
+#if AACENCODER_LIB_VL0 > 3 || (AACENCODER_LIB_VL0==3 && AACENCODER_LIB_VL1>=4)
+ if (lib_info.version > 0x03040800)
+ aacEncoder_SetParam(*encoder, AACENC_SBR_RATIO, params->sbr_ratio);
+#endif
if (aacEncoder_SetParam(*encoder, AACENC_TRANSMUX,
params->transport_format) != AACENC_OK) {
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 };
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;
fprintf(stderr, "ERROR: aacEncEncode() failed\n");
return -1;
}
- output->len = oargs.numOutBytes;
+ output->size = oargs.numOutBytes;
return oargs.numInSamples / format->channels_per_frame;
}