Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
9cf0841e
Commit
9cf0841e
authored
Feb 15, 2012
by
Martin Storsjö
Browse files
dsputil: Add ff_ prefix to the dsputil*_init* functions
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
99560a4c
Changes
75
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
39 additions
and
39 deletions
+39
-39
libavcodec/4xm.c
libavcodec/4xm.c
+1
-1
libavcodec/aacdec.c
libavcodec/aacdec.c
+1
-1
libavcodec/aacenc.c
libavcodec/aacenc.c
+1
-1
libavcodec/ac3dec.c
libavcodec/ac3dec.c
+1
-1
libavcodec/ac3enc.c
libavcodec/ac3enc.c
+1
-1
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.c
+1
-1
libavcodec/alsdec.c
libavcodec/alsdec.c
+1
-1
libavcodec/apedec.c
libavcodec/apedec.c
+1
-1
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_arm.c
+1
-1
libavcodec/asv1.c
libavcodec/asv1.c
+1
-1
libavcodec/atrac1.c
libavcodec/atrac1.c
+1
-1
libavcodec/atrac3.c
libavcodec/atrac3.c
+1
-1
libavcodec/bfin/dsputil_bfin.c
libavcodec/bfin/dsputil_bfin.c
+1
-1
libavcodec/bink.c
libavcodec/bink.c
+1
-1
libavcodec/binkaudio.c
libavcodec/binkaudio.c
+1
-1
libavcodec/dca.c
libavcodec/dca.c
+1
-1
libavcodec/dnxhddec.c
libavcodec/dnxhddec.c
+2
-2
libavcodec/dnxhdenc.c
libavcodec/dnxhdenc.c
+1
-1
libavcodec/dsputil.c
libavcodec/dsputil.c
+10
-10
libavcodec/dsputil.h
libavcodec/dsputil.h
+10
-10
No files found.
libavcodec/4xm.c
View file @
9cf0841e
...
...
@@ -880,7 +880,7 @@ static av_cold void common_init(AVCodecContext *avctx)
{
FourXContext
*
const
f
=
avctx
->
priv_data
;
dsputil_init
(
&
f
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
f
->
dsp
,
avctx
);
f
->
avctx
=
avctx
;
}
...
...
libavcodec/aacdec.c
View file @
9cf0841e
...
...
@@ -804,7 +804,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ff_aac_sbr_init
();
dsputil_init
(
&
ac
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
ac
->
dsp
,
avctx
);
ff_fmt_convert_init
(
&
ac
->
fmt_conv
,
avctx
);
ac
->
random_state
=
0x1f2e3d4c
;
...
...
libavcodec/aacenc.c
View file @
9cf0841e
...
...
@@ -669,7 +669,7 @@ static av_cold int dsp_init(AVCodecContext *avctx, AACEncContext *s)
{
int
ret
=
0
;
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
// window init
ff_kbd_window_init
(
ff_aac_kbd_long_1024
,
4
.
0
,
1024
);
...
...
libavcodec/ac3dec.c
View file @
9cf0841e
...
...
@@ -167,7 +167,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
ff_mdct_init
(
&
s
->
imdct_256
,
8
,
1
,
1
.
0
);
ff_mdct_init
(
&
s
->
imdct_512
,
9
,
1
,
1
.
0
);
ff_kbd_window_init
(
s
->
window
,
5
.
0
,
256
);
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_ac3dsp_init
(
&
s
->
ac3dsp
,
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
ff_fmt_convert_init
(
&
s
->
fmt_conv
,
avctx
);
av_lfg_init
(
&
s
->
dith_state
,
0
);
...
...
libavcodec/ac3enc.c
View file @
9cf0841e
...
...
@@ -2468,7 +2468,7 @@ av_cold int ff_ac3_encode_init(AVCodecContext *avctx)
avctx
->
coded_frame
=
avcodec_alloc_frame
();
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_ac3dsp_init
(
&
s
->
ac3dsp
,
avctx
->
flags
&
CODEC_FLAG_BITEXACT
);
dprint_options
(
s
);
...
...
libavcodec/alpha/dsputil_alpha.c
View file @
9cf0841e
...
...
@@ -268,7 +268,7 @@ static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,
put_pixels_axp_asm
(
block
+
8
,
pixels
+
8
,
line_size
,
h
);
}
void
dsputil_init_alpha
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
void
ff_
dsputil_init_alpha
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
{
const
int
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
...
...
libavcodec/alsdec.c
View file @
9cf0841e
...
...
@@ -1724,7 +1724,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
}
dsputil_init
(
&
ctx
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
ctx
->
dsp
,
avctx
);
avcodec_get_frame_defaults
(
&
ctx
->
frame
);
avctx
->
coded_frame
=
&
ctx
->
frame
;
...
...
libavcodec/apedec.c
View file @
9cf0841e
...
...
@@ -231,7 +231,7 @@ static av_cold int ape_decode_init(AVCodecContext *avctx)
filter_alloc_fail
);
}
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
avctx
->
channel_layout
=
(
avctx
->
channels
==
2
)
?
AV_CH_LAYOUT_STEREO
:
AV_CH_LAYOUT_MONO
;
avcodec_get_frame_defaults
(
&
s
->
frame
);
...
...
libavcodec/arm/dsputil_init_arm.c
View file @
9cf0841e
...
...
@@ -73,7 +73,7 @@ static void simple_idct_arm_add(uint8_t *dest, int line_size, DCTELEM *block)
ff_add_pixels_clamped
(
block
,
dest
,
line_size
);
}
void
dsputil_init_arm
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
void
ff_
dsputil_init_arm
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
{
const
int
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
...
...
libavcodec/asv1.c
View file @
9cf0841e
...
...
@@ -519,7 +519,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
static
av_cold
void
common_init
(
AVCodecContext
*
avctx
){
ASV1Context
*
const
a
=
avctx
->
priv_data
;
dsputil_init
(
&
a
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
a
->
dsp
,
avctx
);
a
->
mb_width
=
(
avctx
->
width
+
15
)
/
16
;
a
->
mb_height
=
(
avctx
->
height
+
15
)
/
16
;
...
...
libavcodec/atrac1.c
View file @
9cf0841e
...
...
@@ -380,7 +380,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx)
ff_atrac_generate_tables
();
dsputil_init
(
&
q
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
q
->
dsp
,
avctx
);
ff_fmt_convert_init
(
&
q
->
fmt_conv
,
avctx
);
q
->
bands
[
0
]
=
q
->
low
;
...
...
libavcodec/atrac3.c
View file @
9cf0841e
...
...
@@ -1037,7 +1037,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
q
->
matrix_coeff_index_next
[
i
]
=
3
;
}
dsputil_init
(
&
dsp
,
avctx
);
ff_
dsputil_init
(
&
dsp
,
avctx
);
ff_fmt_convert_init
(
&
q
->
fmt_conv
,
avctx
);
q
->
pUnits
=
av_mallocz
(
sizeof
(
channel_unit
)
*
q
->
channels
);
...
...
libavcodec/bfin/dsputil_bfin.c
View file @
9cf0841e
...
...
@@ -195,7 +195,7 @@ static int bfin_pix_abs8_xy2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_si
*/
void
dsputil_init_bfin
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
void
ff_
dsputil_init_bfin
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
{
const
int
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
...
...
libavcodec/bink.c
View file @
9cf0841e
...
...
@@ -1298,7 +1298,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx
->
pix_fmt
=
c
->
has_alpha
?
PIX_FMT_YUVA420P
:
PIX_FMT_YUV420P
;
avctx
->
idct_algo
=
FF_IDCT_BINK
;
dsputil_init
(
&
c
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
c
->
dsp
,
avctx
);
ff_binkdsp_init
(
&
c
->
bdsp
);
init_bundles
(
c
);
...
...
libavcodec/binkaudio.c
View file @
9cf0841e
...
...
@@ -79,7 +79,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
int
i
;
int
frame_len_bits
;
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_fmt_convert_init
(
&
s
->
fmt_conv
,
avctx
);
/* determine frame length */
...
...
libavcodec/dca.c
View file @
9cf0841e
...
...
@@ -1933,7 +1933,7 @@ static av_cold int dca_decode_init(AVCodecContext *avctx)
s
->
avctx
=
avctx
;
dca_init_vlcs
();
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_
dsputil_init
(
&
s
->
dsp
,
avctx
);
ff_mdct_init
(
&
s
->
imdct
,
6
,
1
,
1
.
0
);
ff_synth_filter_init
(
&
s
->
synth
);
ff_dcadsp_init
(
&
s
->
dcadsp
);
...
...
libavcodec/dnxhddec.c
View file @
9cf0841e
...
...
@@ -127,7 +127,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si
ctx
->
avctx
->
pix_fmt
=
PIX_FMT_YUV422P10
;
ctx
->
avctx
->
bits_per_raw_sample
=
10
;
if
(
ctx
->
bit_depth
!=
10
)
{
dsputil_init
(
&
ctx
->
dsp
,
ctx
->
avctx
);
ff_
dsputil_init
(
&
ctx
->
dsp
,
ctx
->
avctx
);
ctx
->
bit_depth
=
10
;
ctx
->
decode_dct_block
=
dnxhd_decode_dct_block_10
;
}
...
...
@@ -135,7 +135,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_si
ctx
->
avctx
->
pix_fmt
=
PIX_FMT_YUV422P
;
ctx
->
avctx
->
bits_per_raw_sample
=
8
;
if
(
ctx
->
bit_depth
!=
8
)
{
dsputil_init
(
&
ctx
->
dsp
,
ctx
->
avctx
);
ff_
dsputil_init
(
&
ctx
->
dsp
,
ctx
->
avctx
);
ctx
->
bit_depth
=
8
;
ctx
->
decode_dct_block
=
dnxhd_decode_dct_block_8
;
}
...
...
libavcodec/dnxhdenc.c
View file @
9cf0841e
...
...
@@ -261,7 +261,7 @@ static int dnxhd_encode_init(AVCodecContext *avctx)
avctx
->
bits_per_raw_sample
=
ctx
->
cid_table
->
bit_depth
;
dsputil_init
(
&
ctx
->
m
.
dsp
,
avctx
);
ff_
dsputil_init
(
&
ctx
->
m
.
dsp
,
avctx
);
ff_dct_common_init
(
&
ctx
->
m
);
if
(
!
ctx
->
m
.
dct_quantize
)
ctx
->
m
.
dct_quantize
=
ff_dct_quantize_c
;
...
...
libavcodec/dsputil.c
View file @
9cf0841e
...
...
@@ -2747,7 +2747,7 @@ static void ff_jref_idct1_add(uint8_t *dest, int line_size, DCTELEM *block)
static
void
just_return
(
void
*
mem
av_unused
,
int
stride
av_unused
,
int
h
av_unused
)
{
return
;
}
/* init static data */
av_cold
void
dsputil_static_init
(
void
)
av_cold
void
ff_
dsputil_static_init
(
void
)
{
int
i
;
...
...
@@ -2784,7 +2784,7 @@ int ff_check_alignment(void){
return
0
;
}
av_cold
void
dsputil_init
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
av_cold
void
ff_
dsputil_init
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
{
int
i
;
...
...
@@ -3136,14 +3136,14 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
}
if
(
HAVE_MMX
)
dsputil_init_mmx
(
c
,
avctx
);
if
(
ARCH_ARM
)
dsputil_init_arm
(
c
,
avctx
);
if
(
HAVE_VIS
)
dsputil_init_vis
(
c
,
avctx
);
if
(
ARCH_ALPHA
)
dsputil_init_alpha
(
c
,
avctx
);
if
(
ARCH_PPC
)
dsputil_init_ppc
(
c
,
avctx
);
if
(
HAVE_MMI
)
dsputil_init_mmi
(
c
,
avctx
);
if
(
ARCH_SH4
)
dsputil_init_sh4
(
c
,
avctx
);
if
(
ARCH_BFIN
)
dsputil_init_bfin
(
c
,
avctx
);
if
(
HAVE_MMX
)
ff_
dsputil_init_mmx
(
c
,
avctx
);
if
(
ARCH_ARM
)
ff_
dsputil_init_arm
(
c
,
avctx
);
if
(
HAVE_VIS
)
ff_
dsputil_init_vis
(
c
,
avctx
);
if
(
ARCH_ALPHA
)
ff_
dsputil_init_alpha
(
c
,
avctx
);
if
(
ARCH_PPC
)
ff_
dsputil_init_ppc
(
c
,
avctx
);
if
(
HAVE_MMI
)
ff_
dsputil_init_mmi
(
c
,
avctx
);
if
(
ARCH_SH4
)
ff_
dsputil_init_sh4
(
c
,
avctx
);
if
(
ARCH_BFIN
)
ff_
dsputil_init_bfin
(
c
,
avctx
);
for
(
i
=
0
;
i
<
64
;
i
++
){
if
(
!
c
->
put_2tap_qpel_pixels_tab
[
0
][
i
])
...
...
libavcodec/dsputil.h
View file @
9cf0841e
...
...
@@ -580,8 +580,8 @@ typedef struct DSPContext {
op_fill_func
fill_block_tab
[
2
];
}
DSPContext
;
void
dsputil_static_init
(
void
);
void
dsputil_init
(
DSPContext
*
p
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_static_init
(
void
);
void
ff_
dsputil_init
(
DSPContext
*
p
,
AVCodecContext
*
avctx
);
int
ff_check_alignment
(
void
);
...
...
@@ -640,14 +640,14 @@ static inline int get_penalty_factor(int lambda, int lambda2, int type){
}
}
void
dsputil_init_alpha
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_arm
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_bfin
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_mmi
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_mmx
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_ppc
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_sh4
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
dsputil_init_vis
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_alpha
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_arm
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_bfin
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_mmi
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_mmx
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_ppc
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_sh4
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_
dsputil_init_vis
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
void
ff_dsputil_init_dwt
(
DSPContext
*
c
);
void
ff_intrax8dsp_init
(
DSPContext
*
c
,
AVCodecContext
*
avctx
);
...
...
Prev
1
2
3
4
Next
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