Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
9526c9cc
Commit
9526c9cc
authored
Apr 23, 2013
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Read block_align from extradata when decoding qclp in aiff.
Fixes ticket #1287.
parent
8f04220d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
4 deletions
+16
-4
aiffdec.c
libavformat/aiffdec.c
+16
-4
No files found.
libavformat/aiffdec.c
View file @
9526c9cc
...
...
@@ -147,9 +147,6 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
case
AV_CODEC_ID_GSM
:
codec
->
block_align
=
33
;
break
;
case
AV_CODEC_ID_QCELP
:
codec
->
block_align
=
35
;
break
;
default:
aiff
->
block_duration
=
1
;
break
;
...
...
@@ -286,6 +283,21 @@ static int aiff_read_header(AVFormatContext *s)
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_QDM2
&&
size
>=
12
*
4
&&
!
st
->
codec
->
block_align
)
{
st
->
codec
->
block_align
=
AV_RB32
(
st
->
codec
->
extradata
+
11
*
4
);
aiff
->
block_duration
=
AV_RB32
(
st
->
codec
->
extradata
+
9
*
4
);
}
else
if
(
st
->
codec
->
codec_id
==
AV_CODEC_ID_QCELP
)
{
char
rate
=
0
;
if
(
size
>=
25
)
rate
=
st
->
codec
->
extradata
[
24
];
switch
(
rate
)
{
case
'H'
:
// RATE_HALF
st
->
codec
->
block_align
=
17
;
break
;
case
'F'
:
// RATE_FULL
default:
st
->
codec
->
block_align
=
35
;
}
aiff
->
block_duration
=
160
;
st
->
codec
->
bit_rate
=
st
->
codec
->
sample_rate
*
(
st
->
codec
->
block_align
<<
3
)
/
aiff
->
block_duration
;
}
break
;
case
MKTAG
(
'C'
,
'H'
,
'A'
,
'N'
):
...
...
@@ -332,7 +344,7 @@ static int aiff_read_packet(AVFormatContext *s,
return
AVERROR_EOF
;
/* Now for that packet */
if
(
st
->
codec
->
block_align
>=
33
)
// GSM, QCLP, IMA4
if
(
st
->
codec
->
block_align
>=
17
)
// GSM, QCLP, IMA4
size
=
st
->
codec
->
block_align
;
else
size
=
(
MAX_SIZE
/
st
->
codec
->
block_align
)
*
st
->
codec
->
block_align
;
...
...
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