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
e7a44f87
Commit
e7a44f87
authored
Jun 05, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4xm: refactor fourxm_read_header
Split sound and video tag parsing in separate functions.
parent
e6496ea7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
96 additions
and
90 deletions
+96
-90
4xm.c
libavcodec/4xm.c
+3
-1
4xm.c
libavformat/4xm.c
+93
-89
No files found.
libavcodec/4xm.c
View file @
e7a44f87
...
@@ -389,12 +389,14 @@ static int decode_p_frame(FourXContext *f, AVFrame *frame,
...
@@ -389,12 +389,14 @@ static int decode_p_frame(FourXContext *f, AVFrame *frame,
int
x
,
y
;
int
x
,
y
;
const
int
width
=
f
->
avctx
->
width
;
const
int
width
=
f
->
avctx
->
width
;
const
int
height
=
f
->
avctx
->
height
;
const
int
height
=
f
->
avctx
->
height
;
uint16_t
*
src
=
(
uint16_t
*
)
f
->
last_picture
->
data
[
0
];
uint16_t
*
dst
=
(
uint16_t
*
)
frame
->
data
[
0
];
uint16_t
*
dst
=
(
uint16_t
*
)
frame
->
data
[
0
];
const
int
stride
=
frame
->
linesize
[
0
]
>>
1
;
const
int
stride
=
frame
->
linesize
[
0
]
>>
1
;
uint16_t
*
src
;
unsigned
int
bitstream_size
,
bytestream_size
,
wordstream_size
,
extra
,
unsigned
int
bitstream_size
,
bytestream_size
,
wordstream_size
,
extra
,
bytestream_offset
,
wordstream_offset
;
bytestream_offset
,
wordstream_offset
;
src
=
(
uint16_t
*
)
f
->
last_picture
->
data
[
0
];
if
(
f
->
version
>
1
)
{
if
(
f
->
version
>
1
)
{
extra
=
20
;
extra
=
20
;
bitstream_size
=
AV_RL32
(
buf
+
8
);
bitstream_size
=
AV_RL32
(
buf
+
8
);
...
...
libavformat/4xm.c
View file @
e7a44f87
...
@@ -72,8 +72,6 @@ typedef struct AudioTrack {
...
@@ -72,8 +72,6 @@ typedef struct AudioTrack {
}
AudioTrack
;
}
AudioTrack
;
typedef
struct
FourxmDemuxContext
{
typedef
struct
FourxmDemuxContext
{
int
width
;
int
height
;
int
video_stream_index
;
int
video_stream_index
;
int
track_count
;
int
track_count
;
AudioTrack
*
tracks
;
AudioTrack
*
tracks
;
...
@@ -91,6 +89,96 @@ static int fourxm_probe(AVProbeData *p)
...
@@ -91,6 +89,96 @@ static int fourxm_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
return
AVPROBE_SCORE_MAX
;
}
}
static
int
parse_vtrk
(
AVFormatContext
*
s
,
FourxmDemuxContext
*
fourxm
,
uint8_t
*
buf
,
int
size
)
{
AVStream
*
st
;
/* check that there is enough data */
if
(
size
!=
vtrk_SIZE
)
{
return
AVERROR_INVALIDDATA
;
}
/* allocate a new AVStream */
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
avpriv_set_pts_info
(
st
,
60
,
1
,
fourxm
->
fps
);
fourxm
->
video_stream_index
=
st
->
index
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_4XM
;
st
->
codec
->
extradata_size
=
4
;
st
->
codec
->
extradata
=
av_malloc
(
4
);
AV_WL32
(
st
->
codec
->
extradata
,
AV_RL32
(
buf
+
16
));
st
->
codec
->
width
=
AV_RL32
(
buf
+
36
);
st
->
codec
->
height
=
AV_RL32
(
buf
+
40
);
return
0
;
}
static
int
parse_strk
(
AVFormatContext
*
s
,
FourxmDemuxContext
*
fourxm
,
uint8_t
*
buf
,
int
size
)
{
AVStream
*
st
;
int
track
;
/* check that there is enough data */
if
(
size
!=
strk_SIZE
)
return
AVERROR_INVALIDDATA
;
track
=
AV_RL32
(
buf
+
8
);
if
(
track
+
1
>
fourxm
->
track_count
)
{
if
(
av_reallocp_array
(
&
fourxm
->
tracks
,
track
+
1
,
sizeof
(
AudioTrack
)))
return
AVERROR
(
ENOMEM
);
memset
(
&
fourxm
->
tracks
[
fourxm
->
track_count
],
0
,
sizeof
(
AudioTrack
)
*
(
track
+
1
-
fourxm
->
track_count
));
fourxm
->
track_count
=
track
+
1
;
}
fourxm
->
tracks
[
track
].
adpcm
=
AV_RL32
(
buf
+
12
);
fourxm
->
tracks
[
track
].
channels
=
AV_RL32
(
buf
+
36
);
fourxm
->
tracks
[
track
].
sample_rate
=
AV_RL32
(
buf
+
40
);
fourxm
->
tracks
[
track
].
bits
=
AV_RL32
(
buf
+
44
);
fourxm
->
tracks
[
track
].
audio_pts
=
0
;
if
(
fourxm
->
tracks
[
track
].
channels
<=
0
||
fourxm
->
tracks
[
track
].
sample_rate
<=
0
||
fourxm
->
tracks
[
track
].
bits
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"audio header invalid
\n
"
);
return
AVERROR_INVALIDDATA
;
}
/* allocate a new AVStream */
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
id
=
track
;
avpriv_set_pts_info
(
st
,
60
,
1
,
fourxm
->
tracks
[
track
].
sample_rate
);
fourxm
->
tracks
[
track
].
stream_index
=
st
->
index
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_tag
=
0
;
st
->
codec
->
channels
=
fourxm
->
tracks
[
track
].
channels
;
st
->
codec
->
sample_rate
=
fourxm
->
tracks
[
track
].
sample_rate
;
st
->
codec
->
bits_per_coded_sample
=
fourxm
->
tracks
[
track
].
bits
;
st
->
codec
->
bit_rate
=
st
->
codec
->
channels
*
st
->
codec
->
sample_rate
*
st
->
codec
->
bits_per_coded_sample
;
st
->
codec
->
block_align
=
st
->
codec
->
channels
*
st
->
codec
->
bits_per_coded_sample
;
if
(
fourxm
->
tracks
[
track
].
adpcm
){
st
->
codec
->
codec_id
=
AV_CODEC_ID_ADPCM_4XM
;
}
else
if
(
st
->
codec
->
bits_per_coded_sample
==
8
)
{
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_U8
;
}
else
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_S16LE
;
return
0
;
}
static
int
fourxm_read_header
(
AVFormatContext
*
s
)
static
int
fourxm_read_header
(
AVFormatContext
*
s
)
{
{
AVIOContext
*
pb
=
s
->
pb
;
AVIOContext
*
pb
=
s
->
pb
;
...
@@ -100,7 +188,6 @@ static int fourxm_read_header(AVFormatContext *s)
...
@@ -100,7 +188,6 @@ static int fourxm_read_header(AVFormatContext *s)
FourxmDemuxContext
*
fourxm
=
s
->
priv_data
;
FourxmDemuxContext
*
fourxm
=
s
->
priv_data
;
unsigned
char
*
header
;
unsigned
char
*
header
;
int
i
,
ret
;
int
i
,
ret
;
AVStream
*
st
;
fourxm
->
track_count
=
0
;
fourxm
->
track_count
=
0
;
fourxm
->
tracks
=
NULL
;
fourxm
->
tracks
=
NULL
;
...
@@ -132,98 +219,15 @@ static int fourxm_read_header(AVFormatContext *s)
...
@@ -132,98 +219,15 @@ static int fourxm_read_header(AVFormatContext *s)
if
(
fourcc_tag
==
std__TAG
)
{
if
(
fourcc_tag
==
std__TAG
)
{
fourxm
->
fps
=
av_int2float
(
AV_RL32
(
&
header
[
i
+
12
]));
fourxm
->
fps
=
av_int2float
(
AV_RL32
(
&
header
[
i
+
12
]));
}
else
if
(
fourcc_tag
==
vtrk_TAG
)
{
}
else
if
(
fourcc_tag
==
vtrk_TAG
)
{
/* check that there is enough data */
if
((
ret
=
parse_vtrk
(
s
,
fourxm
,
header
+
i
,
size
))
<
0
)
if
(
size
!=
vtrk_SIZE
)
{
ret
=
AVERROR_INVALIDDATA
;
goto
fail
;
goto
fail
;
}
fourxm
->
width
=
AV_RL32
(
&
header
[
i
+
36
]);
fourxm
->
height
=
AV_RL32
(
&
header
[
i
+
40
]);
/* allocate a new AVStream */
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
{
ret
=
AVERROR
(
ENOMEM
);
goto
fail
;
}
avpriv_set_pts_info
(
st
,
60
,
1
,
fourxm
->
fps
);
fourxm
->
video_stream_index
=
st
->
index
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_4XM
;
st
->
codec
->
extradata_size
=
4
;
st
->
codec
->
extradata
=
av_malloc
(
4
);
AV_WL32
(
st
->
codec
->
extradata
,
AV_RL32
(
&
header
[
i
+
16
]));
st
->
codec
->
width
=
fourxm
->
width
;
st
->
codec
->
height
=
fourxm
->
height
;
i
+=
8
+
size
;
i
+=
8
+
size
;
}
else
if
(
fourcc_tag
==
strk_TAG
)
{
}
else
if
(
fourcc_tag
==
strk_TAG
)
{
int
current_track
;
if
((
ret
=
parse_strk
(
s
,
fourxm
,
header
+
i
,
size
))
<
0
)
/* check that there is enough data */
if
(
size
!=
strk_SIZE
)
{
ret
=
AVERROR_INVALIDDATA
;
goto
fail
;
}
current_track
=
AV_RL32
(
&
header
[
i
+
8
]);
if
((
unsigned
)
current_track
>=
UINT_MAX
/
sizeof
(
AudioTrack
)
-
1
){
av_log
(
s
,
AV_LOG_ERROR
,
"current_track too large
\n
"
);
ret
=
-
1
;
goto
fail
;
goto
fail
;
}
if
(
current_track
+
1
>
fourxm
->
track_count
)
{
fourxm
->
tracks
=
av_realloc
(
fourxm
->
tracks
,
(
current_track
+
1
)
*
sizeof
(
AudioTrack
));
if
(
!
fourxm
->
tracks
)
{
ret
=
AVERROR
(
ENOMEM
);
goto
fail
;
}
memset
(
&
fourxm
->
tracks
[
fourxm
->
track_count
],
0
,
sizeof
(
AudioTrack
)
*
(
current_track
+
1
-
fourxm
->
track_count
));
fourxm
->
track_count
=
current_track
+
1
;
}
fourxm
->
tracks
[
current_track
].
adpcm
=
AV_RL32
(
&
header
[
i
+
12
]);
fourxm
->
tracks
[
current_track
].
channels
=
AV_RL32
(
&
header
[
i
+
36
]);
fourxm
->
tracks
[
current_track
].
sample_rate
=
AV_RL32
(
&
header
[
i
+
40
]);
fourxm
->
tracks
[
current_track
].
bits
=
AV_RL32
(
&
header
[
i
+
44
]);
fourxm
->
tracks
[
current_track
].
audio_pts
=
0
;
if
(
fourxm
->
tracks
[
current_track
].
channels
<=
0
||
fourxm
->
tracks
[
current_track
].
sample_rate
<=
0
||
fourxm
->
tracks
[
current_track
].
bits
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"audio header invalid
\n
"
);
ret
=
-
1
;
goto
fail
;
}
i
+=
8
+
size
;
/* allocate a new AVStream */
i
+=
8
+
size
;
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
{
ret
=
AVERROR
(
ENOMEM
);
goto
fail
;
}
st
->
id
=
current_track
;
avpriv_set_pts_info
(
st
,
60
,
1
,
fourxm
->
tracks
[
current_track
].
sample_rate
);
fourxm
->
tracks
[
current_track
].
stream_index
=
st
->
index
;
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_tag
=
0
;
st
->
codec
->
channels
=
fourxm
->
tracks
[
current_track
].
channels
;
st
->
codec
->
sample_rate
=
fourxm
->
tracks
[
current_track
].
sample_rate
;
st
->
codec
->
bits_per_coded_sample
=
fourxm
->
tracks
[
current_track
].
bits
;
st
->
codec
->
bit_rate
=
st
->
codec
->
channels
*
st
->
codec
->
sample_rate
*
st
->
codec
->
bits_per_coded_sample
;
st
->
codec
->
block_align
=
st
->
codec
->
channels
*
st
->
codec
->
bits_per_coded_sample
;
if
(
fourxm
->
tracks
[
current_track
].
adpcm
){
st
->
codec
->
codec_id
=
AV_CODEC_ID_ADPCM_4XM
;
}
else
if
(
st
->
codec
->
bits_per_coded_sample
==
8
)
{
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_U8
;
}
else
st
->
codec
->
codec_id
=
AV_CODEC_ID_PCM_S16LE
;
}
}
}
}
...
...
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