diff options
| author | Rodeo <[email protected]> | 2014-01-26 16:12:23 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-01-26 16:12:23 +0000 |
| commit | 1d7db22df59be148ed995eee7755f21d8f0b9d5b (patch) | |
| tree | 32eb0acf048550576259f0798f8da0a7975c5703 /libhb/scan.c | |
| parent | ee621317fb45852db29b94308b87690827a9a0df (diff) | |
libhb: support AV_FRAME_DATA_MATRIXENCODING side data.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6000 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/scan.c')
| -rw-r--r-- | libhb/scan.c | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/libhb/scan.c b/libhb/scan.c index 6dc5f6fc6..fc13810ed 100644 --- a/libhb/scan.c +++ b/libhb/scan.c @@ -1029,6 +1029,7 @@ static void LookForAudio( hb_title_t * title, hb_buffer_t * b ) audio->config.in.samplerate = info.rate; audio->config.in.samples_per_frame = info.samples_per_frame; audio->config.in.bitrate = info.bitrate; + audio->config.in.matrix_encoding = info.matrix_encoding; audio->config.in.channel_layout = info.channel_layout; audio->config.in.channel_map = info.channel_map; audio->config.in.version = info.version; @@ -1145,11 +1146,7 @@ static void LookForAudio( hb_title_t * title, hb_buffer_t * b ) break; } - if (audio->config.in.channel_layout == AV_CH_LAYOUT_STEREO_DOWNMIX) - { - strcat(audio->config.lang.description, " (Dolby Surround)"); - } - else if (audio->config.in.channel_layout) + if (audio->config.in.channel_layout) { int lfes = (!!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY) + !!(audio->config.in.channel_layout & AV_CH_LOW_FREQUENCY_2)); @@ -1157,6 +1154,39 @@ static void LookForAudio( hb_title_t * title, hb_buffer_t * b ) char *desc = audio->config.lang.description + strlen(audio->config.lang.description); sprintf(desc, " (%d.%d ch)", channels - lfes, lfes); + + // describe the matrix encoding mode, if any + switch (audio->config.in.matrix_encoding) + { + case AV_MATRIX_ENCODING_DOLBY: + if (audio->config.in.codec == HB_ACODEC_AC3 || + audio->config.in.codec_param == AV_CODEC_ID_AC3 || + audio->config.in.codec_param == AV_CODEC_ID_EAC3 || + audio->config.in.codec_param == AV_CODEC_ID_TRUEHD) + { + strcat(audio->config.lang.description, " (Dolby Surround)"); + break; + } + strcat(audio->config.lang.description, " (Lt/Rt)"); + break; + case AV_MATRIX_ENCODING_DPLII: + strcat(audio->config.lang.description, " (Dolby Pro Logic II)"); + break; + case AV_MATRIX_ENCODING_DPLIIX: + strcat(audio->config.lang.description, " (Dolby Pro Logic IIx)"); + break; + case AV_MATRIX_ENCODING_DPLIIZ: + strcat(audio->config.lang.description, " (Dolby Pro Logic IIz)"); + break; + case AV_MATRIX_ENCODING_DOLBYEX: + strcat(audio->config.lang.description, " (Dolby Digital EX)"); + break; + case AV_MATRIX_ENCODING_DOLBYHEADPHONE: + strcat(audio->config.lang.description, " (Dolby Headphone)"); + break; + default: + break; + } } hb_log( "scan: audio 0x%x: %s, rate=%dHz, bitrate=%d %s", audio->id, |