From 80987fa9a86baaddf5627bc4138070fb39b162ac Mon Sep 17 00:00:00 2001 From: Rodeo Date: Sun, 26 Aug 2012 14:35:54 +0000 Subject: Use a more direct workaround for the DTS-ES XCh decoding issue. The workaround committed in revision 4896 works for now, but if/when we add 6.1 encoding, we'll want to decode that discrete center surround channel. We could special-case it, but the issue would still be present under 64-bit Windows. Instead, disable the buggy assembly optimizations until they are fixed. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4918 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/decavcodec.c | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'libhb/decavcodec.c') diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c index 11a04a8b4..d0a64a2b0 100644 --- a/libhb/decavcodec.c +++ b/libhb/decavcodec.c @@ -221,18 +221,6 @@ static int decavcodecaInit( hb_work_object_t * w, hb_job_t * job ) hb_log( "decavcodecaInit: avcodec_open failed" ); return 1; } - /* Libav's ff_vector_fmac_scalar_*() asm functions are buggy under Win64 - * we can't let it decode the DTS-ES XCh extension until this is fixed - * - * Note: the DTS decoder doesn't support request_channels changing - * mid-stream, so we must do this here */ - if ((w->codec_param == CODEC_ID_DTS) && - (w->audio->config.in.channel_layout & ~AV_CH_LOW_FREQUENCY) == AV_CH_LAYOUT_6POINT0) - { - hb_deep_log(2, "decavcodecaInit: disabling DTS-ES XCh extension processing"); - pv->context->request_channels = - 5 + !!(w->audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY); - } return 0; } -- cgit v1.2.3