Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
23d0fdcf
Commit
23d0fdcf
authored
Sep 27, 2013
by
Maxim Poliakovski
Committed by
Anton Khirnov
Sep 29, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for multichannel ATRAC3+ streams.
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
93370d12
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
3 deletions
+28
-3
oma.c
libavformat/oma.c
+15
-0
oma.h
libavformat/oma.h
+3
-0
omadec.c
libavformat/omadec.c
+10
-3
No files found.
libavformat/oma.c
View file @
23d0fdcf
...
...
@@ -21,6 +21,7 @@
#include "internal.h"
#include "oma.h"
#include "libavcodec/avcodec.h"
#include "libavutil/channel_layout.h"
const
uint16_t
ff_oma_srate_tab
[
8
]
=
{
320
,
441
,
480
,
882
,
960
,
0
};
...
...
@@ -31,3 +32,17 @@ const AVCodecTag ff_oma_codec_tags[] = {
{
AV_CODEC_ID_PCM_S16BE
,
OMA_CODECID_LPCM
},
{
0
},
};
/** map ATRAC-X channel id to internal channel layout */
const
uint64_t
ff_oma_chid_to_native_layout
[
7
]
=
{
AV_CH_LAYOUT_MONO
,
AV_CH_LAYOUT_STEREO
,
AV_CH_LAYOUT_SURROUND
,
AV_CH_LAYOUT_4POINT0
,
AV_CH_LAYOUT_5POINT1_BACK
,
AV_CH_LAYOUT_6POINT1_BACK
,
AV_CH_LAYOUT_7POINT1
};
/** map ATRAC-X channel id to total number of channels */
const
int
ff_oma_chid_to_num_channels
[
7
]
=
{
1
,
2
,
3
,
4
,
6
,
7
,
8
};
libavformat/oma.h
View file @
23d0fdcf
...
...
@@ -41,4 +41,7 @@ extern const uint16_t ff_oma_srate_tab[8];
extern
const
AVCodecTag
ff_oma_codec_tags
[];
extern
const
uint64_t
ff_oma_chid_to_native_layout
[
7
];
extern
const
int
ff_oma_chid_to_num_channels
[
7
];
#endif
/* AVFORMAT_OMA_H */
libavformat/omadec.c
View file @
23d0fdcf
/*
* Sony OpenMG (OMA) demuxer
*
* Copyright (c) 2008 Maxim Poliakovski
* Copyright (c) 2008
, 2013
Maxim Poliakovski
* 2008 Benjamin Larsson
* 2011 David Goldwich
*
...
...
@@ -284,7 +284,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
static
int
oma_read_header
(
AVFormatContext
*
s
)
{
int
ret
,
framesize
,
jsflag
,
samplerate
;
uint32_t
codec_params
;
uint32_t
codec_params
,
channel_id
;
int16_t
eid
;
uint8_t
buf
[
EA3_HEADER_SIZE
];
uint8_t
*
edata
;
...
...
@@ -364,7 +364,14 @@ static int oma_read_header(AVFormatContext *s)
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
break
;
case
OMA_CODECID_ATRAC3P
:
st
->
codec
->
channels
=
(
codec_params
>>
10
)
&
7
;
channel_id
=
(
codec_params
>>
10
)
&
7
;
if
(
!
channel_id
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Invalid ATRAC-X channel id: %d
\n
"
,
channel_id
);
return
AVERROR_INVALIDDATA
;
}
st
->
codec
->
channel_layout
=
ff_oma_chid_to_native_layout
[
channel_id
-
1
];
st
->
codec
->
channels
=
ff_oma_chid_to_num_channels
[
channel_id
-
1
];
framesize
=
((
codec_params
&
0x3FF
)
*
8
)
+
8
;
samplerate
=
ff_oma_srate_tab
[(
codec_params
>>
13
)
&
7
]
*
100
;
if
(
!
samplerate
)
{
...
...
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