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
2c94e45f
Commit
2c94e45f
authored
Aug 22, 2015
by
Rostislav Pehlivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aacenc_is: rename struct to follow guidelines
Signed-off-by:
Rostislav Pehlivanov
<
atomnuker@gmail.com
>
parent
e8279880
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
aacenc_is.c
libavcodec/aacenc_is.c
+5
-5
aacenc_is.h
libavcodec/aacenc_is.h
+4
-4
No files found.
libavcodec/aacenc_is.c
View file @
2c94e45f
...
...
@@ -30,15 +30,15 @@
#include "aacenc_is.h"
#include "aacenc_quantization.h"
struct
ff_aac_is_e
rror
ff_aac_is_encoding_err
(
AACEncContext
*
s
,
ChannelElement
*
cpe
,
int
start
,
int
w
,
int
g
,
float
ener0
,
float
ener1
,
float
ener01
,
int
phase
)
struct
AACISE
rror
ff_aac_is_encoding_err
(
AACEncContext
*
s
,
ChannelElement
*
cpe
,
int
start
,
int
w
,
int
g
,
float
ener0
,
float
ener1
,
float
ener01
,
int
phase
)
{
int
i
,
w2
;
float
*
L34
=
&
s
->
scoefs
[
256
*
0
],
*
R34
=
&
s
->
scoefs
[
256
*
1
];
float
*
IS
=
&
s
->
scoefs
[
256
*
2
],
*
I34
=
&
s
->
scoefs
[
256
*
3
];
float
dist1
=
0
.
0
f
,
dist2
=
0
.
0
f
;
struct
ff_aac_is_e
rror
is_error
=
{
0
};
struct
AACISE
rror
is_error
=
{
0
};
SingleChannelElement
*
sce0
=
&
cpe
->
ch
[
0
];
SingleChannelElement
*
sce1
=
&
cpe
->
ch
[
1
];
...
...
@@ -106,7 +106,7 @@ void ff_aac_search_for_is(AACEncContext *s, AVCodecContext *avctx, ChannelElemen
cpe
->
ch
[
0
].
band_type
[
w
*
16
+
g
]
!=
NOISE_BT
&&
!
cpe
->
ch
[
0
].
zeroes
[
w
*
16
+
g
]
&&
cpe
->
ch
[
1
].
band_type
[
w
*
16
+
g
]
!=
NOISE_BT
&&
!
cpe
->
ch
[
1
].
zeroes
[
w
*
16
+
g
])
{
float
ener0
=
0
.
0
f
,
ener1
=
0
.
0
f
,
ener01
=
0
.
0
f
;
struct
ff_aac_is_e
rror
ph_err1
,
ph_err2
,
*
erf
;
struct
AACISE
rror
ph_err1
,
ph_err2
,
*
erf
;
for
(
w2
=
0
;
w2
<
sce0
->
ics
.
group_len
[
w
];
w2
++
)
{
for
(
i
=
0
;
i
<
sce0
->
ics
.
swb_sizes
[
g
];
i
++
)
{
float
coef0
=
sce0
->
pcoeffs
[
start
+
(
w
+
w2
)
*
128
+
i
];
...
...
libavcodec/aacenc_is.h
View file @
2c94e45f
...
...
@@ -31,7 +31,7 @@
/** Frequency in Hz for lower limit of intensity stereo **/
#define INT_STEREO_LOW_LIMIT 6100
struct
ff_aac_is_e
rror
{
struct
AACISE
rror
{
int
pass
;
/* 1 if dist2 <= dist1 */
int
phase
;
/* -1 or +1 */
float
error
;
/* fabs(dist1 - dist2) */
...
...
@@ -39,9 +39,9 @@ struct ff_aac_is_error {
float
dist2
;
/* From IS'd coeffs */
};
struct
ff_aac_is_e
rror
ff_aac_is_encoding_err
(
AACEncContext
*
s
,
ChannelElement
*
cpe
,
int
start
,
int
w
,
int
g
,
float
ener0
,
float
ener1
,
float
ener01
,
int
phase
);
struct
AACISE
rror
ff_aac_is_encoding_err
(
AACEncContext
*
s
,
ChannelElement
*
cpe
,
int
start
,
int
w
,
int
g
,
float
ener0
,
float
ener1
,
float
ener01
,
int
phase
);
void
ff_aac_search_for_is
(
AACEncContext
*
s
,
AVCodecContext
*
avctx
,
ChannelElement
*
cpe
);
#endif
/* AVCODEC_AACENC_IS_H */
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