diff options
| author | Rodeo <[email protected]> | 2012-10-20 23:29:33 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-10-20 23:29:33 +0000 |
| commit | 305fc5798105e9a16f83868116d0a38a2919a638 (patch) | |
| tree | 607b57a009cfa57fb6191fec6655df42167675a1 /libhb/platform | |
| parent | 4916c07f34cf97a79ca76f8163a9e7e258491bce (diff) | |
hb_audio_remap improvements:
- support for additional sample formats
- support for variable channel layouts
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5023 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/platform')
| -rw-r--r-- | libhb/platform/macosx/encca_aac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c index 5c5069cd4..4d6352511 100644 --- a/libhb/platform/macosx/encca_aac.c +++ b/libhb/platform/macosx/encca_aac.c @@ -289,13 +289,14 @@ int encCoreAudioInit(hb_work_object_t *w, hb_job_t *job, enum AAC_MODE mode) audio->config.out.samples_per_frame = pv->isamples; // channel remapping - uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL); - pv->remap = hb_audio_remap_init(layout, &hb_aac_chan_map, + pv->remap = hb_audio_remap_init(AV_SAMPLE_FMT_FLT, &hb_aac_chan_map, audio->config.in.channel_map); if (pv->remap == NULL) { hb_error("encCoreAudioInit: hb_audio_remap_init() failed"); } + uint64_t layout = hb_ff_mixdown_xlat(audio->config.out.mixdown, NULL); + hb_audio_remap_set_channel_layout(pv->remap, layout); // get maximum output size AudioConverterGetProperty(pv->converter, @@ -388,8 +389,7 @@ static OSStatus inInputDataProc(AudioConverterRef converter, UInt32 *npackets, *npackets = buffers->mBuffers[0].mDataByteSize / pv->isamplesiz; pv->ibytes -= buffers->mBuffers[0].mDataByteSize; - hb_audio_remap(pv->remap, - (hb_sample_t*)buffers->mBuffers[0].mData, *npackets); + hb_audio_remap(pv->remap, (uint8_t*)buffers->mBuffers[0].mData, *npackets); return noErr; } |