From d6b7d9715474d719369f787b7e7e0139cc54e517 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Fri, 25 Feb 2011 17:37:59 +0000 Subject: Improve audio labels for BD audio decoded by ffmpeg Give lpcm and e-ac3 proper labels git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3805 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/bd.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libhb/bd.c b/libhb/bd.c index c4d0c6d52..74e4ad464 100644 --- a/libhb/bd.c +++ b/libhb/bd.c @@ -289,13 +289,18 @@ hb_title_t * hb_bd_title_scan( hb_bd_t * d, int tt, uint64_t min_duration ) lang = lang_for_code2( (char*)bdaudio->lang ); snprintf( audio->config.lang.description, - sizeof( audio->config.lang.description ), "%s (%s)", - strlen(lang->native_name) ? lang->native_name : + sizeof( audio->config.lang.description ), "%s (%s)", + strlen(lang->native_name) ? lang->native_name : lang->eng_name, - audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : - ( audio->config.in.codec == HB_ACODEC_DCA ? "DTS" : - ( audio->config.in.codec == HB_ACODEC_MPGA ? "MPEG" : - "LPCM" ) ) ); + audio->config.in.codec == HB_ACODEC_AC3 ? "AC3" : + ( audio->config.in.codec == HB_ACODEC_DCA ? "DTS" : + ( audio->config.in.codec == HB_ACODEC_MPGA ? + ( audio->config.in.codec_param == CODEC_ID_PCM_BLURAY ? "LPCM" : + ( audio->config.in.codec_param == CODEC_ID_EAC3 ? "E-AC3" : + ( audio->config.in.codec_param == CODEC_ID_MP2 ? "MPEG" : + "Unknown FFMpeg" + ) ) ) : "Unknown" + ) ) ); snprintf( audio->config.lang.simple, sizeof( audio->config.lang.simple ), "%s", -- cgit v1.2.3