4 months ago · 6eb4bf04e9
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07
 
				 
			
 
				 API changes, most recent first:
			
 
				 
			
 
				+2024-12-13 - xxxxxxxxxx - lavu 59.50.100 - channel_layout.h
			
 
				+  Add AV_CH_LAYOUT_9POINT1POINT6 and AV_CHANNEL_LAYOUT_9POINT1POINT6.
			
 
				+
			
 
				 2024-12-05 - xxxxxxxxxx - lavu 59.49.100 - csp.h
			
 
				   Add av_csp_itu_eotf() and av_csp_itu_eotf_inv().
			
 
				 
			
--- a/doc/utils.texi
+++ b/doc/utils.texi
@@ -731,6 +731,8 @@ FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR
 
				 FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2
			
 
				 @item 9.1.4
			
 
				 FL+FR+FC+LFE+BL+BR+FLC+FRC+SL+SR+TFL+TFR+TBL+TBR
			
 
				+@item 9.1.6
			
 
				+FL+FR+FC+LFE+BL+BR+FLC+FRC+SL+SR+TFL+TFR+TBL+TBR+TSL+TSR
			
 
				 @item hexadecagonal
			
 
				 FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR
			
 
				 @item binaural
			
--- a/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@ -221,6 +221,7 @@ static const struct channel_layout_name channel_layout_map[] = {
 
				     { "7.1.4",          AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK  },
			
 
				     { "7.2.3",          AV_CHANNEL_LAYOUT_7POINT2POINT3       },
			
 
				     { "9.1.4",          AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK  },
			
 
				+    { "9.1.6",          AV_CHANNEL_LAYOUT_9POINT1POINT6       },
			
 
				     { "hexadecagonal",  AV_CHANNEL_LAYOUT_HEXADECAGONAL       },
			
 
				     { "binaural",       AV_CHANNEL_LAYOUT_BINAURAL            },
			
 
				     { "downmix",        AV_CHANNEL_LAYOUT_STEREO_DOWNMIX,     },
			
--- a/libavutil/channel_layout.h
+++ b/libavutil/channel_layout.h
@@ -248,6 +248,7 @@ enum AVChannelOrder {
 
				 #define AV_CH_LAYOUT_7POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
			
 
				 #define AV_CH_LAYOUT_7POINT2POINT3     (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_CENTER|AV_CH_LOW_FREQUENCY_2)
			
 
				 #define AV_CH_LAYOUT_9POINT1POINT4_BACK (AV_CH_LAYOUT_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
			
 
				+#define AV_CH_LAYOUT_9POINT1POINT6     (AV_CH_LAYOUT_9POINT1POINT4_BACK|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT)
			
 
				 #define AV_CH_LAYOUT_HEXADECAGONAL     (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
			
 
				 #define AV_CH_LAYOUT_BINAURAL          (AV_CH_BINAURAL_LEFT|AV_CH_BINAURAL_RIGHT)
			
 
				 #define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
			
@@ -423,6 +424,7 @@ typedef struct AVChannelLayout {
 
				 #define AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT1POINT4_BACK)
			
 
				 #define AV_CHANNEL_LAYOUT_7POINT2POINT3     AV_CHANNEL_LAYOUT_MASK(12, AV_CH_LAYOUT_7POINT2POINT3)
			
 
				 #define AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK AV_CHANNEL_LAYOUT_MASK(14, AV_CH_LAYOUT_9POINT1POINT4_BACK)
			
 
				+#define AV_CHANNEL_LAYOUT_9POINT1POINT6     AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_9POINT1POINT6)
			
 
				 #define AV_CHANNEL_LAYOUT_HEXADECAGONAL     AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL)
			
 
				 #define AV_CHANNEL_LAYOUT_BINAURAL          AV_CHANNEL_LAYOUT_MASK(2,  AV_CH_LAYOUT_BINAURAL)
			
 
				 #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX    AV_CHANNEL_LAYOUT_MASK(2,  AV_CH_LAYOUT_STEREO_DOWNMIX)
			
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
 
				  */
			
 
				 
			
 
				 #define LIBAVUTIL_VERSION_MAJOR  59
			
 
				-#define LIBAVUTIL_VERSION_MINOR  49
			
 
				+#define LIBAVUTIL_VERSION_MINOR  50
			
 
				 #define LIBAVUTIL_VERSION_MICRO 100
			
 
				 
			
 
				 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
			
--- a/tests/ref/fate/channel_layout
+++ b/tests/ref/fate/channel_layout
@@ -33,6 +33,7 @@ cube           FL+FR+BL+BR+TFL+TFR+TBL+TBR
 
				 7.1.4          FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBL+TBR
			
 
				 7.2.3          FL+FR+FC+LFE+BL+BR+SL+SR+TFL+TFR+TBC+LFE2
			
 
				 9.1.4          FL+FR+FC+LFE+BL+BR+FLC+FRC+SL+SR+TFL+TFR+TBL+TBR
			
 
				+9.1.6          FL+FR+FC+LFE+BL+BR+FLC+FRC+SL+SR+TFL+TFR+TBL+TBR+TSL+TSR
			
 
				 hexadecagonal  FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR
			
 
				 binaural       BIL+BIR
			
 
				 downmix        DL+DR