mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-05 06:58:56 +00:00
codec-utils: Add AAC channel configurations 11, 12 and 14 and levels 6 and 7
This commit is contained in:
parent
ce16635f46
commit
b3b2251c59
1 changed files with 11 additions and 0 deletions
|
@ -258,12 +258,19 @@ gst_codec_utils_aac_get_level (const guint8 * audio_config, guint len)
|
||||||
num_cpe = 2;
|
num_cpe = 2;
|
||||||
break;
|
break;
|
||||||
case 7:
|
case 7:
|
||||||
|
case 12:
|
||||||
|
case 14:
|
||||||
/* front left, right, center and LFE; outside front left and right;
|
/* front left, right, center and LFE; outside front left and right;
|
||||||
* rear left and right surround */
|
* rear left and right surround */
|
||||||
num_sce = 1;
|
num_sce = 1;
|
||||||
num_cpe = 3;
|
num_cpe = 3;
|
||||||
num_lfe = 1;
|
num_lfe = 1;
|
||||||
break;
|
break;
|
||||||
|
case 11:
|
||||||
|
num_sce = 2;
|
||||||
|
num_cpe = 2;
|
||||||
|
num_lfe = 1;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
GST_WARNING ("Unknown channel config in header: %d", channel_config);
|
GST_WARNING ("Unknown channel config in header: %d", channel_config);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -320,6 +327,10 @@ gst_codec_utils_aac_get_level (const guint8 * audio_config, guint len)
|
||||||
ret = 4;
|
ret = 4;
|
||||||
else if (num_channels <= 5 && rate <= 96000 && pcu <= 38 && rcu <= 15)
|
else if (num_channels <= 5 && rate <= 96000 && pcu <= 38 && rcu <= 15)
|
||||||
ret = 5;
|
ret = 5;
|
||||||
|
else if (num_channels <= 7 && rate <= 48000 && pcu <= 25 && rcu <= 19)
|
||||||
|
ret = 6;
|
||||||
|
else if (num_channels <= 7 && rate <= 96000 && pcu <= 50 && rcu <= 19)
|
||||||
|
ret = 7;
|
||||||
} else {
|
} else {
|
||||||
/* Return the level as per the 'Main Profile' */
|
/* Return the level as per the 'Main Profile' */
|
||||||
if (pcu < 40 && rcu < 20)
|
if (pcu < 40 && rcu < 20)
|
||||||
|
|
Loading…
Reference in a new issue