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
0cfd4a99
Commit
0cfd4a99
authored
Nov 09, 2015
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/rsd: add XMA support
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
a5202bc9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
rsd.c
libavformat/rsd.c
+14
-2
No files found.
libavformat/rsd.c
View file @
0cfd4a99
...
@@ -33,12 +33,12 @@ static const AVCodecTag rsd_tags[] = {
...
@@ -33,12 +33,12 @@ static const AVCodecTag rsd_tags[] = {
{
AV_CODEC_ID_ADPCM_IMA_WAV
,
MKTAG
(
'X'
,
'A'
,
'D'
,
'P'
)
},
{
AV_CODEC_ID_ADPCM_IMA_WAV
,
MKTAG
(
'X'
,
'A'
,
'D'
,
'P'
)
},
{
AV_CODEC_ID_PCM_S16BE
,
MKTAG
(
'P'
,
'C'
,
'M'
,
'B'
)
},
{
AV_CODEC_ID_PCM_S16BE
,
MKTAG
(
'P'
,
'C'
,
'M'
,
'B'
)
},
{
AV_CODEC_ID_PCM_S16LE
,
MKTAG
(
'P'
,
'C'
,
'M'
,
' '
)
},
{
AV_CODEC_ID_PCM_S16LE
,
MKTAG
(
'P'
,
'C'
,
'M'
,
' '
)
},
{
AV_CODEC_ID_XMA1
,
MKTAG
(
'X'
,
'M'
,
'A'
,
' '
)
},
{
AV_CODEC_ID_NONE
,
0
},
{
AV_CODEC_ID_NONE
,
0
},
};
};
static
const
uint32_t
rsd_unsupported_tags
[]
=
{
static
const
uint32_t
rsd_unsupported_tags
[]
=
{
MKTAG
(
'O'
,
'G'
,
'G'
,
' '
),
MKTAG
(
'O'
,
'G'
,
'G'
,
' '
),
MKTAG
(
'X'
,
'M'
,
'A'
,
' '
),
};
};
static
int
rsd_probe
(
AVProbeData
*
p
)
static
int
rsd_probe
(
AVProbeData
*
p
)
...
@@ -95,6 +95,13 @@ static int rsd_read_header(AVFormatContext *s)
...
@@ -95,6 +95,13 @@ static int rsd_read_header(AVFormatContext *s)
avio_skip
(
pb
,
4
);
// Unknown
avio_skip
(
pb
,
4
);
// Unknown
switch
(
codec
->
codec_id
)
{
switch
(
codec
->
codec_id
)
{
case
AV_CODEC_ID_XMA1
:
codec
->
block_align
=
2048
;
ff_alloc_extradata
(
codec
,
28
);
if
(
!
codec
->
extradata
)
return
AVERROR
(
ENOMEM
);
memset
(
codec
->
extradata
,
0
,
28
);
break
;
case
AV_CODEC_ID_ADPCM_PSX
:
case
AV_CODEC_ID_ADPCM_PSX
:
codec
->
block_align
=
16
*
codec
->
channels
;
codec
->
block_align
=
16
*
codec
->
channels
;
if
(
pb
->
seekable
)
if
(
pb
->
seekable
)
...
@@ -153,6 +160,10 @@ static int rsd_read_header(AVFormatContext *s)
...
@@ -153,6 +160,10 @@ static int rsd_read_header(AVFormatContext *s)
}
}
avio_skip
(
pb
,
start
-
avio_tell
(
pb
));
avio_skip
(
pb
,
start
-
avio_tell
(
pb
));
if
(
codec
->
codec_id
==
AV_CODEC_ID_XMA1
)
{
avio_skip
(
pb
,
avio_rb32
(
pb
)
+
avio_rb32
(
pb
));
st
->
duration
=
avio_rb32
(
pb
);
}
avpriv_set_pts_info
(
st
,
64
,
1
,
codec
->
sample_rate
);
avpriv_set_pts_info
(
st
,
64
,
1
,
codec
->
sample_rate
);
...
@@ -169,7 +180,8 @@ static int rsd_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -169,7 +180,8 @@ static int rsd_read_packet(AVFormatContext *s, AVPacket *pkt)
if
(
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_IMA_RAD
||
if
(
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_IMA_RAD
||
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_PSX
||
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_PSX
||
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_IMA_WAV
)
{
codec
->
codec_id
==
AV_CODEC_ID_ADPCM_IMA_WAV
||
codec
->
codec_id
==
AV_CODEC_ID_XMA1
)
{
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
codec
->
block_align
);
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
codec
->
block_align
);
}
else
if
(
codec
->
codec_tag
==
MKTAG
(
'W'
,
'A'
,
'D'
,
'P'
)
&&
}
else
if
(
codec
->
codec_tag
==
MKTAG
(
'W'
,
'A'
,
'D'
,
'P'
)
&&
codec
->
channels
>
1
)
{
codec
->
channels
>
1
)
{
...
...
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