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
b6293e27
Commit
b6293e27
authored
Dec 27, 2012
by
Christophe Gisquet
Committed by
Martin Storsjö
Jul 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fmtconvert: Explicitly use int32_t instead of int
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
50612484
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
14 deletions
+17
-14
ac3dec.c
libavcodec/ac3dec.c
+1
-1
ac3dec.h
libavcodec/ac3dec.h
+1
-1
dca.h
libavcodec/arm/dca.h
+2
-2
fmtconvert_init_arm.c
libavcodec/arm/fmtconvert_init_arm.c
+1
-1
dcadec.c
libavcodec/dcadec.c
+3
-3
fmtconvert.c
libavcodec/fmtconvert.c
+3
-1
fmtconvert.h
libavcodec/fmtconvert.h
+2
-1
fmtconvert_altivec.c
libavcodec/ppc/fmtconvert_altivec.c
+1
-1
fmtconvert.asm
libavcodec/x86/fmtconvert.asm
+1
-1
fmtconvert_init.c
libavcodec/x86/fmtconvert_init.c
+2
-2
No files found.
libavcodec/ac3dec.c
View file @
b6293e27
...
...
@@ -429,7 +429,7 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma
int
end_freq
=
s
->
end_freq
[
ch_index
];
uint8_t
*
baps
=
s
->
bap
[
ch_index
];
int8_t
*
exps
=
s
->
dexps
[
ch_index
];
int
*
coeffs
=
s
->
fixed_coeffs
[
ch_index
];
int
32_t
*
coeffs
=
s
->
fixed_coeffs
[
ch_index
];
int
dither
=
(
ch_index
==
CPL_CH
)
||
s
->
dither_flag
[
ch_index
];
GetBitContext
*
gbc
=
&
s
->
gbc
;
int
freq
;
...
...
libavcodec/ac3dec.h
View file @
b6293e27
...
...
@@ -203,7 +203,7 @@ typedef struct AC3DecodeContext {
float
*
dlyptr
[
AC3_MAX_CHANNELS
];
///@name Aligned arrays
DECLARE_ALIGNED
(
16
,
int
,
fixed_coeffs
)[
AC3_MAX_CHANNELS
][
AC3_MAX_COEFS
];
///< fixed-point transform coefficients
DECLARE_ALIGNED
(
16
,
int
32_t
,
fixed_coeffs
)[
AC3_MAX_CHANNELS
][
AC3_MAX_COEFS
];
///< fixed-point transform coefficients
DECLARE_ALIGNED
(
32
,
float
,
transform_coeffs
)[
AC3_MAX_CHANNELS
][
AC3_MAX_COEFS
];
///< transform coefficients
DECLARE_ALIGNED
(
32
,
float
,
delay
)[
AC3_MAX_CHANNELS
][
AC3_BLOCK_SIZE
];
///< delay - added to the next block
DECLARE_ALIGNED
(
32
,
float
,
window
)[
AC3_BLOCK_SIZE
];
///< window coefficients
...
...
libavcodec/arm/dca.h
View file @
b6293e27
...
...
@@ -30,9 +30,9 @@
#define decode_blockcodes decode_blockcodes
static
inline
int
decode_blockcodes
(
int
code1
,
int
code2
,
int
levels
,
int
*
values
)
int
32_t
*
values
)
{
int
v0
,
v1
,
v2
,
v3
,
v4
,
v5
;
int
32_t
v0
,
v1
,
v2
,
v3
,
v4
,
v5
;
__asm__
(
"smmul %8, %14, %18
\n
"
"smmul %11, %15, %18
\n
"
...
...
libavcodec/arm/fmtconvert_init_arm.c
View file @
b6293e27
...
...
@@ -25,7 +25,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/fmtconvert.h"
void
ff_int32_to_float_fmul_scalar_neon
(
float
*
dst
,
const
int
*
src
,
void
ff_int32_to_float_fmul_scalar_neon
(
float
*
dst
,
const
int
32_t
*
src
,
float
mul
,
int
len
);
void
ff_float_to_int16_neon
(
int16_t
*
dst
,
const
float
*
src
,
long
len
);
...
...
libavcodec/dcadec.c
View file @
b6293e27
...
...
@@ -1097,7 +1097,7 @@ static void dca_downmix(float **samples, int srcfmt,
#ifndef decode_blockcodes
/* Very compact version of the block code decoder that does not use table
* look-up but is slightly slower */
static
int
decode_blockcode
(
int
code
,
int
levels
,
int
*
values
)
static
int
decode_blockcode
(
int
code
,
int
levels
,
int
32_t
*
values
)
{
int
i
;
int
offset
=
(
levels
-
1
)
>>
1
;
...
...
@@ -1111,7 +1111,7 @@ static int decode_blockcode(int code, int levels, int *values)
return
code
;
}
static
int
decode_blockcodes
(
int
code1
,
int
code2
,
int
levels
,
int
*
values
)
static
int
decode_blockcodes
(
int
code1
,
int
code2
,
int
levels
,
int
32_t
*
values
)
{
return
decode_blockcode
(
code1
,
levels
,
values
)
|
decode_blockcode
(
code2
,
levels
,
values
+
4
);
...
...
@@ -1140,7 +1140,7 @@ static int dca_subsubframe(DCAContext *s, int base_channel, int block_index)
/* FIXME */
float
(
*
subband_samples
)[
DCA_SUBBANDS
][
8
]
=
s
->
subband_samples
[
block_index
];
LOCAL_ALIGNED_16
(
int
,
block
,
[
8
]);
LOCAL_ALIGNED_16
(
int
32_t
,
block
,
[
8
]);
/*
* Audio data
...
...
libavcodec/fmtconvert.c
View file @
b6293e27
...
...
@@ -24,7 +24,9 @@
#include "fmtconvert.h"
#include "libavutil/common.h"
static
void
int32_to_float_fmul_scalar_c
(
float
*
dst
,
const
int
*
src
,
float
mul
,
int
len
){
static
void
int32_to_float_fmul_scalar_c
(
float
*
dst
,
const
int32_t
*
src
,
float
mul
,
int
len
)
{
int
i
;
for
(
i
=
0
;
i
<
len
;
i
++
)
dst
[
i
]
=
src
[
i
]
*
mul
;
...
...
libavcodec/fmtconvert.h
View file @
b6293e27
...
...
@@ -35,7 +35,8 @@ typedef struct FmtConvertContext {
* @param len number of elements to convert.
* constraints: multiple of 8
*/
void
(
*
int32_to_float_fmul_scalar
)(
float
*
dst
,
const
int
*
src
,
float
mul
,
int
len
);
void
(
*
int32_to_float_fmul_scalar
)(
float
*
dst
,
const
int32_t
*
src
,
float
mul
,
int
len
);
/**
* Convert an array of float to an array of int16_t.
...
...
libavcodec/ppc/fmtconvert_altivec.c
View file @
b6293e27
...
...
@@ -27,7 +27,7 @@
#if HAVE_ALTIVEC
static
void
int32_to_float_fmul_scalar_altivec
(
float
*
dst
,
const
int
*
src
,
static
void
int32_to_float_fmul_scalar_altivec
(
float
*
dst
,
const
int
32_t
*
src
,
float
mul
,
int
len
)
{
union
{
...
...
libavcodec/x86/fmtconvert.asm
View file @
b6293e27
...
...
@@ -32,7 +32,7 @@ SECTION_TEXT
%endmacro
;---------------------------------------------------------------------------------
; void int32_to_float_fmul_scalar(float *dst, const int *src, float mul, int len);
; void int32_to_float_fmul_scalar(float *dst, const int
32_t
*src, float mul, int len);
;---------------------------------------------------------------------------------
%macro
INT32_TO_FLOAT_FMUL_SCALAR
1
%if
UNIX64
...
...
libavcodec/x86/fmtconvert_init.c
View file @
b6293e27
...
...
@@ -30,8 +30,8 @@
#if HAVE_YASM
void
ff_int32_to_float_fmul_scalar_sse
(
float
*
dst
,
const
int
*
src
,
float
mul
,
int
len
);
void
ff_int32_to_float_fmul_scalar_sse2
(
float
*
dst
,
const
int
*
src
,
float
mul
,
int
len
);
void
ff_int32_to_float_fmul_scalar_sse
(
float
*
dst
,
const
int
32_t
*
src
,
float
mul
,
int
len
);
void
ff_int32_to_float_fmul_scalar_sse2
(
float
*
dst
,
const
int
32_t
*
src
,
float
mul
,
int
len
);
void
ff_float_to_int16_3dnow
(
int16_t
*
dst
,
const
float
*
src
,
long
len
);
void
ff_float_to_int16_sse
(
int16_t
*
dst
,
const
float
*
src
,
long
len
);
...
...
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