har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/atrac9tab: use explicit ATRAC9BlockConfig struct initializers

Browse Source 
Cosmetic change.

Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-10-22 10:01:13 -03:00
parent 5561a1de90
commit 78a24fd014
1 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libavcodec/atrac9tab.h
View File

@ -41,61 +41,48 @@ typedef struct ATRAC9BlockConfig {
static const ATRAC9BlockConfig at9_block_layout[] = { static const ATRAC9BlockConfig at9_block_layout[] = {
{ /* Mono */ { /* Mono */
AV_CH_LAYOUT_MONO, .channel_layout = AV_CH_LAYOUT_MONO,
{ .type = { ATRAC9_BLOCK_TYPE_SCE, },
ATRAC9_BLOCK_TYPE_SCE, .count = 1,
},
{ { 0 }, },
1,
}, },
{ /* Dual Mono */ { /* Dual Mono */
AV_CH_LAYOUT_STEREO, .channel_layout = AV_CH_LAYOUT_STEREO,
{ .type = { ATRAC9_BLOCK_TYPE_SCE,
ATRAC9_BLOCK_TYPE_SCE, ATRAC9_BLOCK_TYPE_SCE, },
ATRAC9_BLOCK_TYPE_SCE, .plane_map = { { 0 }, { 1 }, },
}, .count = 2,
{ { 0 }, { 1 }, },
2,
}, },
{ /* Stereo */ { /* Stereo */
AV_CH_LAYOUT_STEREO, .channel_layout = AV_CH_LAYOUT_STEREO,
{ .type = { ATRAC9_BLOCK_TYPE_CPE, },
ATRAC9_BLOCK_TYPE_CPE, .plane_map = { { 0, 1 }, },
}, .count = 1,
{ { 0, 1 }, },
1,
}, },
{ /* 5.1 */ { /* 5.1 */
AV_CH_LAYOUT_5POINT1, .channel_layout = AV_CH_LAYOUT_5POINT1,
{ .type = { ATRAC9_BLOCK_TYPE_CPE,
ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_SCE,
ATRAC9_BLOCK_TYPE_SCE, ATRAC9_BLOCK_TYPE_LFE,
ATRAC9_BLOCK_TYPE_LFE, ATRAC9_BLOCK_TYPE_CPE, },
ATRAC9_BLOCK_TYPE_CPE, .plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, },
}, .count = 4,
{ { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, },
4,
}, },
{ /* 5.1 */ { /* 7.1 */
AV_CH_LAYOUT_7POINT1, .channel_layout = AV_CH_LAYOUT_7POINT1,
{ .type = { ATRAC9_BLOCK_TYPE_CPE,
ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_SCE,
ATRAC9_BLOCK_TYPE_SCE, ATRAC9_BLOCK_TYPE_LFE,
ATRAC9_BLOCK_TYPE_LFE, ATRAC9_BLOCK_TYPE_CPE,
ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_CPE, },
ATRAC9_BLOCK_TYPE_CPE, .plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, },
}, .count = 5,
{ { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, },
5,
}, },
{ /* Quad */ { /* Quad */
AV_CH_LAYOUT_QUAD, .channel_layout = AV_CH_LAYOUT_QUAD,
{ .type = { ATRAC9_BLOCK_TYPE_CPE,
ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_CPE, },
ATRAC9_BLOCK_TYPE_CPE, .plane_map = { { 0, 1 }, { 2, 3 }, },
}, .count = 2,
{ { 0, 1 }, { 2, 3 }, },
2,
}, },
}; };