History

avutil/channel_layout: add a 7.1(top) channel layout

James Almer committed 4 years ago

Commit 6228ba11 parent 8c7d3b46 files · +10 −1Browse files

Unified · Split

6 files
  1. doc/APIchanges +3 −0
  2. doc/utils.texi +2 −0
  3. libavutil/channel_layout.c +1 −0
  4. libavutil/channel_layout.h +2 −0
  5. libavutil/version.h +1 −1
  6. tests/ref/fate/channel_layout +1 −0
doc/APIchanges+3−0
@@ -14,6 +14,9 @@ libavutil: 2021-04-27 · 13 unmodified lines
14 14
15API changes, most recent first:15API changes, most recent first:
16 16
172022-11-03 - xxxxxxxxxx - lavu 57.41.100 - channel_layout.h
18 Add AV_CH_LAYOUT_7POINT1_TOP_BACK and AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK.
19
172022-10-30 - xxxxxxxxxx - lavu 57.40.100 - channel_layout.h202022-10-30 - xxxxxxxxxx - lavu 57.40.100 - channel_layout.h
18 Add AV_CH_LAYOUT_CUBE and AV_CHANNEL_LAYOUT_CUBE.21 Add AV_CH_LAYOUT_CUBE and AV_CHANNEL_LAYOUT_CUBE.
19 22
doc/utils.texi+2−0
@@ -713,6 +713,8 @@ FL+FR+FC+LFE+BL+BR+SL+SR · 712 unmodified lines
713FL+FR+FC+LFE+BL+BR+FLC+FRC713FL+FR+FC+LFE+BL+BR+FLC+FRC
714@item 7.1(wide-side)714@item 7.1(wide-side)
715FL+FR+FC+LFE+FLC+FRC+SL+SR715FL+FR+FC+LFE+FLC+FRC+SL+SR
716@item 7.1(top)
717FL+FR+FC+LFE+BL+BR+TFL+TFR
716@item octagonal718@item octagonal
717FL+FR+FC+BL+BR+BC+SL+SR719FL+FR+FC+BL+BR+BC+SL+SR
718@item cube720@item cube
libavutil/channel_layout.c+1−0
@@ -196,6 +196,7 @@ static const struct channel_layout_name channel_layout_map[] = { · 195 unmodified lines
196 { "7.1", AV_CHANNEL_LAYOUT_7POINT1 },196 { "7.1", AV_CHANNEL_LAYOUT_7POINT1 },
197 { "7.1(wide)", AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK },197 { "7.1(wide)", AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK },
198 { "7.1(wide-side)", AV_CHANNEL_LAYOUT_7POINT1_WIDE },198 { "7.1(wide-side)", AV_CHANNEL_LAYOUT_7POINT1_WIDE },
199 { "7.1(top)", AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK },
199 { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL },200 { "octagonal", AV_CHANNEL_LAYOUT_OCTAGONAL },
200 { "cube", AV_CHANNEL_LAYOUT_CUBE },201 { "cube", AV_CHANNEL_LAYOUT_CUBE },
201 { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL },202 { "hexadecagonal", AV_CHANNEL_LAYOUT_HEXADECAGONAL },
libavutil/channel_layout.h+2−0
@@ -232,6 +232,7 @@ enum AVChannelOrder { · 231 unmodified lines
232#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)232#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
233#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)233#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
234#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)234#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
235#define AV_CH_LAYOUT_7POINT1_TOP_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
235#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)236#define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
236#define AV_CH_LAYOUT_CUBE (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)237#define AV_CH_LAYOUT_CUBE (AV_CH_LAYOUT_QUAD|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
237#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)238#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)
@@ -389,6 +390,7 @@ typedef struct AVChannelLayout { · 151 unmodified lines
389#define AV_CHANNEL_LAYOUT_7POINT1 AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1)390#define AV_CHANNEL_LAYOUT_7POINT1 AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1)
390#define AV_CHANNEL_LAYOUT_7POINT1_WIDE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_WIDE)391#define AV_CHANNEL_LAYOUT_7POINT1_WIDE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_WIDE)
391#define AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_WIDE_BACK)392#define AV_CHANNEL_LAYOUT_7POINT1_WIDE_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_WIDE_BACK)
393#define AV_CHANNEL_LAYOUT_7POINT1_TOP_BACK AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_7POINT1_TOP_BACK)
392#define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL)394#define AV_CHANNEL_LAYOUT_OCTAGONAL AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_OCTAGONAL)
393#define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE)395#define AV_CHANNEL_LAYOUT_CUBE AV_CHANNEL_LAYOUT_MASK(8, AV_CH_LAYOUT_CUBE)
394#define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL)396#define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL)
libavutil/version.h+1−1
@@ -79,7 +79,7 @@ · 78 unmodified lines
79 */79 */
80 80
81#define LIBAVUTIL_VERSION_MAJOR 5781#define LIBAVUTIL_VERSION_MAJOR 57
82#define LIBAVUTIL_VERSION_MINOR 4082#define LIBAVUTIL_VERSION_MINOR 41
83#define LIBAVUTIL_VERSION_MICRO 10083#define LIBAVUTIL_VERSION_MICRO 100
84 84
85#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \85#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
tests/ref/fate/channel_layout+1−0
@@ -24,6 +24,7 @@ hexagonal FL+FR+FC+BL+BR+BC · 23 unmodified lines
247.1 FL+FR+FC+LFE+BL+BR+SL+SR247.1 FL+FR+FC+LFE+BL+BR+SL+SR
257.1(wide) FL+FR+FC+LFE+BL+BR+FLC+FRC257.1(wide) FL+FR+FC+LFE+BL+BR+FLC+FRC
267.1(wide-side) FL+FR+FC+LFE+FLC+FRC+SL+SR267.1(wide-side) FL+FR+FC+LFE+FLC+FRC+SL+SR
277.1(top) FL+FR+FC+LFE+BL+BR+TFL+TFR
27octagonal FL+FR+FC+BL+BR+BC+SL+SR28octagonal FL+FR+FC+BL+BR+BC+SL+SR
28cube FL+FR+BL+BR+TFL+TFR+TBL+TBR29cube FL+FR+BL+BR+TFL+TFR+TBL+TBR
29hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR30hexadecagonal FL+FR+FC+BL+BR+BC+SL+SR+TFL+TFC+TFR+TBL+TBC+TBR+WL+WR

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t