summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-02-25 17:37:59 +0000
committerjstebbins <[email protected]>2011-02-25 17:37:59 +0000
commitd6b7d9715474d719369f787b7e7e0139cc54e517 (patch)
tree24aa87dc2cd66df46898373565f63e195e3e2ad8 /libhb
parent565e8b19462d5d3183ff922bc062f52262b49b49 (diff)
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
Diffstat (limited to 'libhb')
-rw-r--r--libhb/bd.c17
1 files 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",