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
4fe44873
Commit
4fe44873
authored
Aug 30, 2014
by
Reimar Döffinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WMA: add "const" to avoid warnings with hardcoded tables.
Signed-off-by:
Reimar Döffinger
<
Reimar.Doeffinger@gmx.de
>
parent
3bc5d2a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
wma.h
libavcodec/wma.h
+1
-1
wmaprodec.c
libavcodec/wmaprodec.c
+2
-2
No files found.
libavcodec/wma.h
View file @
4fe44873
...
@@ -115,7 +115,7 @@ typedef struct WMACodecContext {
...
@@ -115,7 +115,7 @@ typedef struct WMACodecContext {
DECLARE_ALIGNED
(
32
,
float
,
coefs
)[
MAX_CHANNELS
][
BLOCK_MAX_SIZE
];
DECLARE_ALIGNED
(
32
,
float
,
coefs
)[
MAX_CHANNELS
][
BLOCK_MAX_SIZE
];
DECLARE_ALIGNED
(
32
,
FFTSample
,
output
)[
BLOCK_MAX_SIZE
*
2
];
DECLARE_ALIGNED
(
32
,
FFTSample
,
output
)[
BLOCK_MAX_SIZE
*
2
];
FFTContext
mdct_ctx
[
BLOCK_NB_SIZES
];
FFTContext
mdct_ctx
[
BLOCK_NB_SIZES
];
float
*
windows
[
BLOCK_NB_SIZES
];
const
float
*
windows
[
BLOCK_NB_SIZES
];
/* output buffer for one frame and the last for IMDCT windowing */
/* output buffer for one frame and the last for IMDCT windowing */
DECLARE_ALIGNED
(
32
,
float
,
frame_out
)[
MAX_CHANNELS
][
BLOCK_MAX_SIZE
*
2
];
DECLARE_ALIGNED
(
32
,
float
,
frame_out
)[
MAX_CHANNELS
][
BLOCK_MAX_SIZE
*
2
];
/* last frame info */
/* last frame info */
...
...
libavcodec/wmaprodec.c
View file @
4fe44873
...
@@ -177,7 +177,7 @@ typedef struct WMAProDecodeCtx {
...
@@ -177,7 +177,7 @@ typedef struct WMAProDecodeCtx {
PutBitContext
pb
;
///< context for filling the frame_data buffer
PutBitContext
pb
;
///< context for filling the frame_data buffer
FFTContext
mdct_ctx
[
WMAPRO_BLOCK_SIZES
];
///< MDCT context per block size
FFTContext
mdct_ctx
[
WMAPRO_BLOCK_SIZES
];
///< MDCT context per block size
DECLARE_ALIGNED
(
32
,
float
,
tmp
)[
WMAPRO_BLOCK_MAX_SIZE
];
///< IMDCT output buffer
DECLARE_ALIGNED
(
32
,
float
,
tmp
)[
WMAPRO_BLOCK_MAX_SIZE
];
///< IMDCT output buffer
float
*
windows
[
WMAPRO_BLOCK_SIZES
];
///< windows for the different block sizes
const
float
*
windows
[
WMAPRO_BLOCK_SIZES
];
///< windows for the different block sizes
/* frame size dependent frame information (set during initialization) */
/* frame size dependent frame information (set during initialization) */
uint32_t
decode_flags
;
///< used compression features
uint32_t
decode_flags
;
///< used compression features
...
@@ -1055,7 +1055,7 @@ static void wmapro_window(WMAProDecodeCtx *s)
...
@@ -1055,7 +1055,7 @@ static void wmapro_window(WMAProDecodeCtx *s)
int
i
;
int
i
;
for
(
i
=
0
;
i
<
s
->
channels_for_cur_subframe
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
channels_for_cur_subframe
;
i
++
)
{
int
c
=
s
->
channel_indexes_for_cur_subframe
[
i
];
int
c
=
s
->
channel_indexes_for_cur_subframe
[
i
];
float
*
window
;
const
float
*
window
;
int
winlen
=
s
->
channel
[
c
].
prev_block_len
;
int
winlen
=
s
->
channel
[
c
].
prev_block_len
;
float
*
start
=
s
->
channel
[
c
].
coeffs
-
(
winlen
>>
1
);
float
*
start
=
s
->
channel
[
c
].
coeffs
-
(
winlen
>>
1
);
...
...
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