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
ade75fb8
Commit
ade75fb8
authored
Jan 17, 2014
by
Tim Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(e)ac3: clip surround mix level indexes.
Values 0-2 are reserved, 3 (-1.5dB) should be used instead.
parent
c229f571
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ac3dec.c
libavcodec/ac3dec.c
+2
-2
eac3dec.c
libavcodec/eac3dec.c
+2
-2
No files found.
libavcodec/ac3dec.c
View file @
ade75fb8
...
@@ -237,9 +237,9 @@ static int ac3_parse_header(AC3DecodeContext *s)
...
@@ -237,9 +237,9 @@ static int ac3_parse_header(AC3DecodeContext *s)
if
(
get_bits1
(
gbc
))
{
if
(
get_bits1
(
gbc
))
{
s
->
preferred_downmix
=
get_bits
(
gbc
,
2
);
s
->
preferred_downmix
=
get_bits
(
gbc
,
2
);
s
->
center_mix_level_ltrt
=
get_bits
(
gbc
,
3
);
s
->
center_mix_level_ltrt
=
get_bits
(
gbc
,
3
);
s
->
surround_mix_level_ltrt
=
get_bits
(
gbc
,
3
);
s
->
surround_mix_level_ltrt
=
av_clip
(
get_bits
(
gbc
,
3
),
3
,
7
);
s
->
center_mix_level
=
get_bits
(
gbc
,
3
);
s
->
center_mix_level
=
get_bits
(
gbc
,
3
);
s
->
surround_mix_level
=
get_bits
(
gbc
,
3
);
s
->
surround_mix_level
=
av_clip
(
get_bits
(
gbc
,
3
),
3
,
7
);
}
}
if
(
get_bits1
(
gbc
))
{
if
(
get_bits1
(
gbc
))
{
s
->
dolby_surround_ex_mode
=
get_bits
(
gbc
,
2
);
s
->
dolby_surround_ex_mode
=
get_bits
(
gbc
,
2
);
...
...
libavcodec/eac3dec.c
View file @
ade75fb8
...
@@ -353,8 +353,8 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
...
@@ -353,8 +353,8 @@ int ff_eac3_parse_header(AC3DecodeContext *s)
}
}
if
(
s
->
channel_mode
&
4
)
{
if
(
s
->
channel_mode
&
4
)
{
/* if a surround channel exists */
/* if a surround channel exists */
s
->
surround_mix_level_ltrt
=
get_bits
(
gbc
,
3
);
s
->
surround_mix_level_ltrt
=
av_clip
(
get_bits
(
gbc
,
3
),
3
,
7
);
s
->
surround_mix_level
=
get_bits
(
gbc
,
3
);
s
->
surround_mix_level
=
av_clip
(
get_bits
(
gbc
,
3
),
3
,
7
);
}
}
}
}
...
...
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