lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

channel_layout: add new channel positions supported by xHE-AAC

Browse source 
apichanges will be updated upon merging, as well as a version bump.
This commit is contained in:
Lynne 2024-05-25 03:33:22 +02:00
parent 6c6bec04f3
commit caeb275092
No known key found for this signature in database
GPG key ID: A2FEA5F03F034464
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavutil/channel_layout.c
View file

@ -75,6 +75,10 @@ static const struct channel_name channel_names[] = {
[AV_CHAN_BOTTOM_FRONT_CENTER ] = { "BFC", "bottom front center" }, [AV_CHAN_BOTTOM_FRONT_CENTER ] = { "BFC", "bottom front center" },
[AV_CHAN_BOTTOM_FRONT_LEFT ] = { "BFL", "bottom front left" }, [AV_CHAN_BOTTOM_FRONT_LEFT ] = { "BFL", "bottom front left" },
[AV_CHAN_BOTTOM_FRONT_RIGHT ] = { "BFR", "bottom front right" }, [AV_CHAN_BOTTOM_FRONT_RIGHT ] = { "BFR", "bottom front right" },
[AV_CHAN_SIDE_SURROUND_LEFT ] = { "SSL", "side surround left" },
[AV_CHAN_SIDE_SURROUND_RIGHT ] = { "SSR", "side surround right" },
[AV_CHAN_TOP_SURROUND_LEFT ] = { "TTL", "top surround left" },
[AV_CHAN_TOP_SURROUND_RIGHT ] = { "TTR", "top surround right" },
}; };
void av_channel_name_bprint(AVBPrint *bp, enum AVChannel channel_id) void av_channel_name_bprint(AVBPrint *bp, enum AVChannel channel_id)

8
libavutil/channel_layout.h
View file

@ -79,6 +79,10 @@ enum AVChannel {
AV_CHAN_BOTTOM_FRONT_CENTER, AV_CHAN_BOTTOM_FRONT_CENTER,
AV_CHAN_BOTTOM_FRONT_LEFT, AV_CHAN_BOTTOM_FRONT_LEFT,
AV_CHAN_BOTTOM_FRONT_RIGHT, AV_CHAN_BOTTOM_FRONT_RIGHT,
AV_CHAN_SIDE_SURROUND_LEFT, ///< +90 degrees, Lss, SiL
AV_CHAN_SIDE_SURROUND_RIGHT, ///< -90 degrees, Rss, SiR
AV_CHAN_TOP_SURROUND_LEFT, ///< +110 degrees, Lvs, TpLS
AV_CHAN_TOP_SURROUND_RIGHT, ///< -110 degrees, Rvs, TpRS
/** Channel is empty can be safely skipped. */ /** Channel is empty can be safely skipped. */
AV_CHAN_UNUSED = 0x200, AV_CHAN_UNUSED = 0x200,
@ -195,6 +199,10 @@ enum AVChannelOrder {
#define AV_CH_BOTTOM_FRONT_CENTER (1ULL << AV_CHAN_BOTTOM_FRONT_CENTER ) #define AV_CH_BOTTOM_FRONT_CENTER (1ULL << AV_CHAN_BOTTOM_FRONT_CENTER )
#define AV_CH_BOTTOM_FRONT_LEFT (1ULL << AV_CHAN_BOTTOM_FRONT_LEFT ) #define AV_CH_BOTTOM_FRONT_LEFT (1ULL << AV_CHAN_BOTTOM_FRONT_LEFT )
#define AV_CH_BOTTOM_FRONT_RIGHT (1ULL << AV_CHAN_BOTTOM_FRONT_RIGHT ) #define AV_CH_BOTTOM_FRONT_RIGHT (1ULL << AV_CHAN_BOTTOM_FRONT_RIGHT )
#define AV_CH_SIDE_SURROUND_LEFT (1ULL << AV_CHAN_SIDE_SURROUND_LEFT )
#define AV_CH_SIDE_SURROUND_RIGHT (1ULL << AV_CHAN_SIDE_SURROUND_RIGHT )
#define AV_CH_TOP_SURROUND_LEFT (1ULL << AV_CHAN_TOP_SURROUND_LEFT )
#define AV_CH_TOP_SURROUND_RIGHT (1ULL << AV_CHAN_TOP_SURROUND_RIGHT )
/** /**
* @} * @}