Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
3bb24fc3
Commit
3bb24fc3
authored
Feb 09, 2017
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aacsbr: Associate SBR data with AAC elements on init
Quiets some log spam on pure upsampling mode. Fixes ticket 5163.
parent
20ea8bf9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
aacdec_template.c
libavcodec/aacdec_template.c
+1
-1
aacsbr.h
libavcodec/aacsbr.h
+1
-1
aacsbr_template.c
libavcodec/aacsbr_template.c
+2
-1
No files found.
libavcodec/aacdec_template.c
View file @
3bb24fc3
...
...
@@ -134,7 +134,7 @@ static av_cold int che_configure(AACContext *ac,
if
(
!
ac
->
che
[
type
][
id
])
{
if
(
!
(
ac
->
che
[
type
][
id
]
=
av_mallocz
(
sizeof
(
ChannelElement
))))
return
AVERROR
(
ENOMEM
);
AAC_RENAME
(
ff_aac_sbr_ctx_init
)(
ac
,
&
ac
->
che
[
type
][
id
]
->
sbr
);
AAC_RENAME
(
ff_aac_sbr_ctx_init
)(
ac
,
&
ac
->
che
[
type
][
id
]
->
sbr
,
type
);
}
if
(
type
!=
TYPE_CCE
)
{
if
(
*
channels
>=
MAX_CHANNELS
-
(
type
==
TYPE_CPE
||
(
type
==
TYPE_SCE
&&
ac
->
oc
[
1
].
m4ac
.
ps
==
1
)))
{
...
...
libavcodec/aacsbr.h
View file @
3bb24fc3
...
...
@@ -81,7 +81,7 @@ static const int8_t vlc_sbr_lav[10] =
/** Initialize SBR. */
void
AAC_RENAME
(
ff_aac_sbr_init
)(
void
);
/** Initialize one SBR context. */
void
AAC_RENAME
(
ff_aac_sbr_ctx_init
)(
AACContext
*
ac
,
SpectralBandReplication
*
sbr
);
void
AAC_RENAME
(
ff_aac_sbr_ctx_init
)(
AACContext
*
ac
,
SpectralBandReplication
*
sbr
,
int
id_aac
);
/** Close one SBR context. */
void
AAC_RENAME
(
ff_aac_sbr_ctx_close
)(
SpectralBandReplication
*
sbr
);
/** Decode one SBR element. */
...
...
libavcodec/aacsbr_template.c
View file @
3bb24fc3
...
...
@@ -81,11 +81,12 @@ static void sbr_turnoff(SpectralBandReplication *sbr) {
memset
(
&
sbr
->
spectrum_params
,
-
1
,
sizeof
(
SpectrumParameters
));
}
av_cold
void
AAC_RENAME
(
ff_aac_sbr_ctx_init
)(
AACContext
*
ac
,
SpectralBandReplication
*
sbr
)
av_cold
void
AAC_RENAME
(
ff_aac_sbr_ctx_init
)(
AACContext
*
ac
,
SpectralBandReplication
*
sbr
,
int
id_aac
)
{
if
(
sbr
->
mdct
.
mdct_bits
)
return
;
sbr
->
kx
[
0
]
=
sbr
->
kx
[
1
];
sbr
->
id_aac
=
id_aac
;
sbr_turnoff
(
sbr
);
sbr
->
data
[
0
].
synthesis_filterbank_samples_offset
=
SBR_SYNTHESIS_BUF_SIZE
-
(
1280
-
128
);
sbr
->
data
[
1
].
synthesis_filterbank_samples_offset
=
SBR_SYNTHESIS_BUF_SIZE
-
(
1280
-
128
);
...
...
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