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
8bce5c8e
Commit
8bce5c8e
authored
Nov 20, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/ac3dec: Use avpriv_float_dsp_alloc()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
17b7f99d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
ac3dec.c
libavcodec/ac3dec.c
+3
-5
ac3dec.h
libavcodec/ac3dec.h
+1
-1
No files found.
libavcodec/ac3dec.c
View file @
8bce5c8e
...
...
@@ -195,7 +195,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
#if (USE_FIXED)
s
->
fdsp
=
avpriv_alloc_fixed_dsp
(
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
#else
avpriv_float_dsp_init
(
&
s
->
fdsp
,
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
s
->
fdsp
=
avpriv_float_dsp_alloc
(
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
#endif
ff_ac3dsp_init
(
&
s
->
ac3dsp
,
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
...
...
@@ -688,7 +688,7 @@ static inline void do_imdct(AC3DecodeContext *s, int channels)
s
->
fdsp
->
vector_fmul_window_scaled
(
s
->
outptr
[
ch
-
1
],
s
->
delay
[
ch
-
1
],
s
->
tmp_output
,
s
->
window
,
128
,
8
);
#else
s
->
fdsp
.
vector_fmul_window
(
s
->
outptr
[
ch
-
1
],
s
->
delay
[
ch
-
1
],
s
->
fdsp
->
vector_fmul_window
(
s
->
outptr
[
ch
-
1
],
s
->
delay
[
ch
-
1
],
s
->
tmp_output
,
s
->
window
,
128
);
#endif
for
(
i
=
0
;
i
<
128
;
i
++
)
...
...
@@ -700,7 +700,7 @@ static inline void do_imdct(AC3DecodeContext *s, int channels)
s
->
fdsp
->
vector_fmul_window_scaled
(
s
->
outptr
[
ch
-
1
],
s
->
delay
[
ch
-
1
],
s
->
tmp_output
,
s
->
window
,
128
,
8
);
#else
s
->
fdsp
.
vector_fmul_window
(
s
->
outptr
[
ch
-
1
],
s
->
delay
[
ch
-
1
],
s
->
fdsp
->
vector_fmul_window
(
s
->
outptr
[
ch
-
1
],
s
->
delay
[
ch
-
1
],
s
->
tmp_output
,
s
->
window
,
128
);
#endif
memcpy
(
s
->
delay
[
ch
-
1
],
s
->
tmp_output
+
128
,
128
*
sizeof
(
FFTSample
));
...
...
@@ -1635,9 +1635,7 @@ static av_cold int ac3_decode_end(AVCodecContext *avctx)
AC3DecodeContext
*
s
=
avctx
->
priv_data
;
ff_mdct_end
(
&
s
->
imdct_512
);
ff_mdct_end
(
&
s
->
imdct_256
);
#if (USE_FIXED)
av_freep
(
&
s
->
fdsp
);
#endif
return
0
;
}
...
...
libavcodec/ac3dec.h
View file @
8bce5c8e
...
...
@@ -218,7 +218,7 @@ typedef struct AC3DecodeContext {
#if USE_FIXED
AVFixedDSPContext
*
fdsp
;
#else
AVFloatDSPContext
fdsp
;
AVFloatDSPContext
*
fdsp
;
#endif
AC3DSPContext
ac3dsp
;
FmtConvertContext
fmt_conv
;
///< optimized conversion functions
...
...
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