Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
76313d31
Commit
76313d31
authored
May 28, 2019
by
Anton Khirnov
Committed by
James Almer
Mar 15, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
atrac9: convert to new channel layout API
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
00fd056b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
atrac9dec.c
libavcodec/atrac9dec.c
+2
-2
atrac9tab.h
libavcodec/atrac9tab.h
+7
-7
No files found.
libavcodec/atrac9dec.c
View file @
76313d31
...
...
@@ -938,8 +938,8 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx)
}
s
->
block_config
=
&
at9_block_layout
[
block_config_idx
];
av
ctx
->
channel_layout
=
s
->
block_config
->
channel_layout
;
avctx
->
ch
annels
=
av_get_channel_layout_nb_channels
(
avctx
->
channel_layout
)
;
av
_channel_layout_uninit
(
&
avctx
->
ch_layout
)
;
avctx
->
ch
_layout
=
s
->
block_config
->
channel_layout
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_FLTP
;
if
(
get_bits1
(
&
gb
))
{
...
...
libavcodec/atrac9tab.h
View file @
76313d31
...
...
@@ -33,7 +33,7 @@ enum ATRAC9BlockType {
};
typedef
struct
ATRAC9BlockConfig
{
uint64_
t
channel_layout
;
AVChannelLayou
t
channel_layout
;
enum
ATRAC9BlockType
type
[
5
];
int
plane_map
[
5
][
2
];
int
count
;
...
...
@@ -41,25 +41,25 @@ typedef struct ATRAC9BlockConfig {
static
const
ATRAC9BlockConfig
at9_block_layout
[]
=
{
{
/* Mono */
.
channel_layout
=
AV_CH_LAYOUT_MONO
,
.
channel_layout
=
AV_CH
ANNEL
_LAYOUT_MONO
,
.
type
=
{
ATRAC9_BLOCK_TYPE_SCE
,
},
.
count
=
1
,
},
{
/* Dual Mono */
.
channel_layout
=
AV_CH_LAYOUT_STEREO
,
.
channel_layout
=
AV_CH
ANNEL
_LAYOUT_STEREO
,
.
type
=
{
ATRAC9_BLOCK_TYPE_SCE
,
ATRAC9_BLOCK_TYPE_SCE
,
},
.
plane_map
=
{
{
0
},
{
1
},
},
.
count
=
2
,
},
{
/* Stereo */
.
channel_layout
=
AV_CH_LAYOUT_STEREO
,
.
channel_layout
=
AV_CH
ANNEL
_LAYOUT_STEREO
,
.
type
=
{
ATRAC9_BLOCK_TYPE_CPE
,
},
.
plane_map
=
{
{
0
,
1
},
},
.
count
=
1
,
},
{
/* 5.1 */
.
channel_layout
=
AV_CH_LAYOUT_5POINT1
,
.
channel_layout
=
AV_CH
ANNEL
_LAYOUT_5POINT1
,
.
type
=
{
ATRAC9_BLOCK_TYPE_CPE
,
ATRAC9_BLOCK_TYPE_SCE
,
ATRAC9_BLOCK_TYPE_LFE
,
...
...
@@ -68,7 +68,7 @@ static const ATRAC9BlockConfig at9_block_layout[] = {
.
count
=
4
,
},
{
/* 7.1 */
.
channel_layout
=
AV_CH_LAYOUT_7POINT1
,
.
channel_layout
=
AV_CH
ANNEL
_LAYOUT_7POINT1
,
.
type
=
{
ATRAC9_BLOCK_TYPE_CPE
,
ATRAC9_BLOCK_TYPE_SCE
,
ATRAC9_BLOCK_TYPE_LFE
,
...
...
@@ -78,7 +78,7 @@ static const ATRAC9BlockConfig at9_block_layout[] = {
.
count
=
5
,
},
{
/* Quad */
.
channel_layout
=
AV_CH_LAYOUT_QUAD
,
.
channel_layout
=
AV_CH
ANNEL
_LAYOUT_QUAD
,
.
type
=
{
ATRAC9_BLOCK_TYPE_CPE
,
ATRAC9_BLOCK_TYPE_CPE
,
},
.
plane_map
=
{
{
0
,
1
},
{
2
,
3
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment