Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
4d7a4215
Commit
4d7a4215
authored
Apr 30, 2011
by
Justin Ruggles
Browse files
ac3enc: put the counting of stereo rematrixing bits in the same place to
make the code easier to understand.
parent
257de756
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
libavcodec/ac3enc.c
libavcodec/ac3enc.c
+4
-7
No files found.
libavcodec/ac3enc.c
View file @
4d7a4215
...
...
@@ -838,10 +838,6 @@ static void count_frame_bits_fixed(AC3EncodeContext *s)
if
(
!
blk
)
frame_bits
++
;
/* stereo rematrixing */
if
(
s
->
channel_mode
==
AC3_CHMODE_STEREO
)
frame_bits
++
;
/* exponent strategy */
frame_bits
+=
2
*
s
->
fbw_channels
;
if
(
s
->
lfe_on
)
...
...
@@ -931,8 +927,9 @@ static void count_frame_bits(AC3EncodeContext *s)
/* audio blocks */
for
(
blk
=
0
;
blk
<
AC3_MAX_BLOCKS
;
blk
++
)
{
/* stereo rematrixing */
if
(
s
->
channel_mode
==
AC3_CHMODE_STEREO
&&
s
->
blocks
[
blk
].
new_rematrixing_strategy
)
{
if
(
s
->
channel_mode
==
AC3_CHMODE_STEREO
)
{
frame_bits
++
;
if
(
s
->
blocks
[
blk
].
new_rematrixing_strategy
)
frame_bits
+=
s
->
num_rematrixing_bands
;
}
...
...
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