Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
14285c33
Commit
14285c33
authored
Nov 29, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/aacenc: Use avpriv_float_dsp_alloc()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
cae851c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
aacenc.c
libavcodec/aacenc.c
+5
-2
aacenc.h
libavcodec/aacenc.h
+1
-1
No files found.
libavcodec/aacenc.c
View file @
14285c33
...
@@ -252,7 +252,7 @@ static void apply_window_and_mdct(AACEncContext *s, SingleChannelElement *sce,
...
@@ -252,7 +252,7 @@ static void apply_window_and_mdct(AACEncContext *s, SingleChannelElement *sce,
int
i
;
int
i
;
float
*
output
=
sce
->
ret_buf
;
float
*
output
=
sce
->
ret_buf
;
apply_window
[
sce
->
ics
.
window_sequence
[
0
]](
&
s
->
fdsp
,
sce
,
audio
);
apply_window
[
sce
->
ics
.
window_sequence
[
0
]](
s
->
fdsp
,
sce
,
audio
);
if
(
sce
->
ics
.
window_sequence
[
0
]
!=
EIGHT_SHORT_SEQUENCE
)
if
(
sce
->
ics
.
window_sequence
[
0
]
!=
EIGHT_SHORT_SEQUENCE
)
s
->
mdct1024
.
mdct_calc
(
&
s
->
mdct1024
,
sce
->
coeffs
,
output
);
s
->
mdct1024
.
mdct_calc
(
&
s
->
mdct1024
,
sce
->
coeffs
,
output
);
...
@@ -682,6 +682,7 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
...
@@ -682,6 +682,7 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
ff_psy_preprocess_end
(
s
->
psypp
);
ff_psy_preprocess_end
(
s
->
psypp
);
av_freep
(
&
s
->
buffer
.
samples
);
av_freep
(
&
s
->
buffer
.
samples
);
av_freep
(
&
s
->
cpe
);
av_freep
(
&
s
->
cpe
);
av_freep
(
&
s
->
fdsp
);
ff_af_queue_close
(
&
s
->
afq
);
ff_af_queue_close
(
&
s
->
afq
);
return
0
;
return
0
;
}
}
...
@@ -690,7 +691,9 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
...
@@ -690,7 +691,9 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
{
{
int
ret
=
0
;
int
ret
=
0
;
avpriv_float_dsp_init
(
&
s
->
fdsp
,
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
s
->
fdsp
=
avpriv_float_dsp_alloc
(
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
if
(
!
s
->
fdsp
)
return
AVERROR
(
ENOMEM
);
// window init
// window init
ff_kbd_window_init
(
ff_aac_kbd_long_1024
,
4
.
0
,
1024
);
ff_kbd_window_init
(
ff_aac_kbd_long_1024
,
4
.
0
,
1024
);
...
...
libavcodec/aacenc.h
View file @
14285c33
...
@@ -67,7 +67,7 @@ typedef struct AACEncContext {
...
@@ -67,7 +67,7 @@ typedef struct AACEncContext {
PutBitContext
pb
;
PutBitContext
pb
;
FFTContext
mdct1024
;
///< long (1024 samples) frame transform context
FFTContext
mdct1024
;
///< long (1024 samples) frame transform context
FFTContext
mdct128
;
///< short (128 samples) frame transform context
FFTContext
mdct128
;
///< short (128 samples) frame transform context
AVFloatDSPContext
fdsp
;
AVFloatDSPContext
*
fdsp
;
float
*
planar_samples
[
6
];
///< saved preprocessed input
float
*
planar_samples
[
6
];
///< saved preprocessed input
int
samplerate_index
;
///< MPEG-4 samplerate index
int
samplerate_index
;
///< MPEG-4 samplerate index
...
...
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