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
e22c63ac
Commit
e22c63ac
authored
Jan 04, 2016
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function
parent
d30719e6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
13 deletions
+3
-13
ac3enc_fixed.c
libavcodec/ac3enc_fixed.c
+2
-0
ac3enc_float.c
libavcodec/ac3enc_float.c
+0
-10
ac3enc_template.c
libavcodec/ac3enc_template.c
+1
-3
No files found.
libavcodec/ac3enc_fixed.c
View file @
e22c63ac
...
@@ -38,6 +38,8 @@
...
@@ -38,6 +38,8 @@
static
const
AVClass
ac3enc_class
=
{
"Fixed-Point AC-3 Encoder"
,
av_default_item_name
,
static
const
AVClass
ac3enc_class
=
{
"Fixed-Point AC-3 Encoder"
,
av_default_item_name
,
ac3_options
,
LIBAVUTIL_VERSION_INT
};
ac3_options
,
LIBAVUTIL_VERSION_INT
};
static
int
normalize_samples
(
AC3EncodeContext
*
s
);
#include "ac3enc_template.c"
#include "ac3enc_template.c"
...
...
libavcodec/ac3enc_float.c
View file @
e22c63ac
...
@@ -82,16 +82,6 @@ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s)
...
@@ -82,16 +82,6 @@ av_cold int ff_ac3_float_mdct_init(AC3EncodeContext *s)
}
}
/*
* Normalize the input samples.
* Not needed for the floating-point encoder.
*/
static
int
normalize_samples
(
AC3EncodeContext
*
s
)
{
return
0
;
}
/*
/*
* Scale MDCT coefficients from float to 24-bit fixed-point.
* Scale MDCT coefficients from float to 24-bit fixed-point.
*/
*/
...
...
libavcodec/ac3enc_template.c
View file @
e22c63ac
...
@@ -40,8 +40,6 @@
...
@@ -40,8 +40,6 @@
static
void
scale_coefficients
(
AC3EncodeContext
*
s
);
static
void
scale_coefficients
(
AC3EncodeContext
*
s
);
static
int
normalize_samples
(
AC3EncodeContext
*
s
);
static
void
clip_coefficients
(
AudioDSPContext
*
adsp
,
CoefType
*
coef
,
static
void
clip_coefficients
(
AudioDSPContext
*
adsp
,
CoefType
*
coef
,
unsigned
int
len
);
unsigned
int
len
);
...
@@ -110,10 +108,10 @@ static void apply_mdct(AC3EncodeContext *s)
...
@@ -110,10 +108,10 @@ static void apply_mdct(AC3EncodeContext *s)
#else
#else
s
->
ac3dsp
.
apply_window_int16
(
s
->
windowed_samples
,
input_samples
,
s
->
ac3dsp
.
apply_window_int16
(
s
->
windowed_samples
,
input_samples
,
s
->
mdct_window
,
AC3_WINDOW_SIZE
);
s
->
mdct_window
,
AC3_WINDOW_SIZE
);
#endif
if
(
s
->
fixed_point
)
if
(
s
->
fixed_point
)
block
->
coeff_shift
[
ch
+
1
]
=
normalize_samples
(
s
);
block
->
coeff_shift
[
ch
+
1
]
=
normalize_samples
(
s
);
#endif
s
->
mdct
.
mdct_calcw
(
&
s
->
mdct
,
block
->
mdct_coef
[
ch
+
1
],
s
->
mdct
.
mdct_calcw
(
&
s
->
mdct
,
block
->
mdct_coef
[
ch
+
1
],
s
->
windowed_samples
);
s
->
windowed_samples
);
...
...
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