diff options
| author | Rodeo <[email protected]> | 2012-09-23 14:14:38 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2012-09-23 14:14:38 +0000 |
| commit | 5f6aaa4d6d3d6ad5bff14a1005410141b7e82a09 (patch) | |
| tree | e6275472e8e4ec0df51ce576e0872b8480105b23 | |
| parent | 8852d5092b11e633ab7a479e19f6df2a1670c992 (diff) | |
libhb: remove unnecessary usage of hb_audio_remap.
All decoders now output channels in Libav order.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4977 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | libhb/decavcodec.c | 1 | ||||
| -rw-r--r-- | libhb/declpcm.c | 1 | ||||
| -rw-r--r-- | libhb/encavcodecaudio.c | 16 |
3 files changed, 1 insertions, 17 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index b9e87b4eb..984b1cf87 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -40,7 +40,6 @@ #include "hb.h" #include "hbffmpeg.h" -#include "audio_remap.h" #include "audio_resample.h" static void compute_frame_duration( hb_work_private_t *pv ); diff --git a/libhb/declpcm.c b/libhb/declpcm.c index 0cb5726a5..c531d4b97 100644 --- a/libhb/declpcm.c +++ b/libhb/declpcm.c @@ -9,7 +9,6 @@ #include "hb.h" #include "hbffmpeg.h" -#include "audio_remap.h" #include "audio_resample.h" struct hb_work_private_s diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c index 67f4d23d5..fe398ab4f 100644 --- a/libhb/encavcodecaudio.c +++ b/libhb/encavcodecaudio.c @@ -9,7 +9,6 @@ #include "hb.h" #include "hbffmpeg.h" -#include "audio_remap.h" #include "audio_resample.h" struct hb_work_private_s @@ -24,7 +23,6 @@ struct hb_work_private_s hb_list_t * list; uint8_t * buf; - hb_audio_remap_t *remap; hb_audio_resample_t *resample; }; @@ -108,14 +106,6 @@ static int encavcodecaInit(hb_work_object_t *w, hb_job_t *job) } av_dict_free(&av_opts); - // channel remapping - pv->remap = hb_audio_remap_init(context->channel_layout, &hb_libav_chan_map, - audio->config.in.channel_map); - if (pv->remap == NULL) - { - hb_error("encavcodecaInit: hb_audio_remap_init() failed"); - } - // sample_fmt conversion pv->resample = hb_audio_resample_init(context->sample_fmt, audio->config.out.mixdown, 0, 0); @@ -210,9 +200,6 @@ static void encavcodecaClose(hb_work_object_t * w) hb_list_empty(&pv->list); } - hb_audio_remap_free(pv->remap); - pv->remap = NULL; - hb_audio_resample_free(pv->resample); pv->resample = NULL; @@ -236,8 +223,7 @@ static hb_buffer_t* Encode(hb_work_object_t *w) hb_list_getbytes(pv->list, pv->buf, pv->input_samples * sizeof(float), &pts, &pos); - // channel remapping and sample_fmt conversion - hb_audio_remap(pv->remap, (hb_sample_t*)pv->buf, pv->samples_per_frame); + // sample_fmt conversion resampled = hb_audio_resample(pv->resample, (void*)pv->buf, pv->samples_per_frame); |