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
baf35bb4
Commit
baf35bb4
authored
Jan 22, 2013
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dsputil: remove one array dimension from avg_no_rnd_pixels_tab.
parent
2612c4dc
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
30 deletions
+30
-30
dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.c
+4
-4
dsputil_init_neon.c
libavcodec/arm/dsputil_init_neon.c
+4
-4
dsputil.c
libavcodec/dsputil.c
+1
-1
dsputil.h
libavcodec/dsputil.h
+1
-1
dsputil_align.c
libavcodec/sh4/dsputil_align.c
+4
-4
dsputil_vis.c
libavcodec/sparc/dsputil_vis.c
+4
-4
vc1dec.c
libavcodec/vc1dec.c
+1
-1
dsputil_mmx.c
libavcodec/x86/dsputil_mmx.c
+11
-11
No files found.
libavcodec/alpha/dsputil_alpha.c
View file @
baf35bb4
...
...
@@ -288,10 +288,10 @@ void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx)
c
->
avg_pixels_tab
[
0
][
2
]
=
avg_pixels16_y2_axp
;
c
->
avg_pixels_tab
[
0
][
3
]
=
avg_pixels16_xy2_axp
;
c
->
avg_no_rnd_pixels_tab
[
0
]
[
0
]
=
avg_no_rnd_pixels16_axp
;
c
->
avg_no_rnd_pixels_tab
[
0
][
1
]
=
avg_no_rnd_pixels16_x2_axp
;
c
->
avg_no_rnd_pixels_tab
[
0
][
2
]
=
avg_no_rnd_pixels16_y2_axp
;
c
->
avg_no_rnd_pixels_tab
[
0
][
3
]
=
avg_no_rnd_pixels16_xy2_axp
;
c
->
avg_no_rnd_pixels_tab
[
0
]
=
avg_no_rnd_pixels16_axp
;
c
->
avg_no_rnd_pixels_tab
[
1
]
=
avg_no_rnd_pixels16_x2_axp
;
c
->
avg_no_rnd_pixels_tab
[
2
]
=
avg_no_rnd_pixels16_y2_axp
;
c
->
avg_no_rnd_pixels_tab
[
3
]
=
avg_no_rnd_pixels16_xy2_axp
;
c
->
put_pixels_tab
[
1
][
0
]
=
put_pixels_axp_asm
;
c
->
put_pixels_tab
[
1
][
1
]
=
put_pixels_x2_axp
;
...
...
libavcodec/arm/dsputil_init_neon.c
View file @
baf35bb4
...
...
@@ -196,10 +196,10 @@ void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
c
->
avg_pixels_tab
[
1
][
2
]
=
ff_avg_pixels8_y2_neon
;
c
->
avg_pixels_tab
[
1
][
3
]
=
ff_avg_pixels8_xy2_neon
;
c
->
avg_no_rnd_pixels_tab
[
0
]
[
0
]
=
ff_avg_pixels16_neon
;
c
->
avg_no_rnd_pixels_tab
[
0
][
1
]
=
ff_avg_pixels16_x2_no_rnd_neon
;
c
->
avg_no_rnd_pixels_tab
[
0
][
2
]
=
ff_avg_pixels16_y2_no_rnd_neon
;
c
->
avg_no_rnd_pixels_tab
[
0
][
3
]
=
ff_avg_pixels16_xy2_no_rnd_neon
;
c
->
avg_no_rnd_pixels_tab
[
0
]
=
ff_avg_pixels16_neon
;
c
->
avg_no_rnd_pixels_tab
[
1
]
=
ff_avg_pixels16_x2_no_rnd_neon
;
c
->
avg_no_rnd_pixels_tab
[
2
]
=
ff_avg_pixels16_y2_no_rnd_neon
;
c
->
avg_no_rnd_pixels_tab
[
3
]
=
ff_avg_pixels16_xy2_no_rnd_neon
;
}
c
->
add_pixels_clamped
=
ff_add_pixels_clamped_neon
;
...
...
libavcodec/dsputil.c
View file @
baf35bb4
...
...
@@ -2705,7 +2705,7 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
hpel_funcs
(
avg
,
[
1
],
8
);
hpel_funcs
(
avg
,
[
2
],
4
);
hpel_funcs
(
avg
,
[
3
],
2
);
hpel_funcs
(
avg_no_rnd
,
[
0
]
,
16
);
hpel_funcs
(
avg_no_rnd
,,
16
);
#undef FUNC
#undef FUNCC
...
...
libavcodec/dsputil.h
View file @
baf35bb4
...
...
@@ -288,7 +288,7 @@ typedef struct DSPContext {
* @param line_size number of bytes in a horizontal line of block
* @param h height
*/
op_pixels_func
avg_no_rnd_pixels_tab
[
1
][
4
];
op_pixels_func
avg_no_rnd_pixels_tab
[
4
];
/**
* Thirdpel motion compensation with rounding (a+b+1)>>1.
...
...
libavcodec/sh4/dsputil_align.c
View file @
baf35bb4
...
...
@@ -358,10 +358,10 @@ void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx)
c
->
avg_pixels_tab
[
1
][
2
]
=
avg_rnd_pixels8_y
;
c
->
avg_pixels_tab
[
1
][
3
]
=
avg_rnd_pixels8_xy
;
c
->
avg_no_rnd_pixels_tab
[
0
]
[
0
]
=
avg_no_rnd_pixels16_o
;
c
->
avg_no_rnd_pixels_tab
[
0
][
1
]
=
avg_no_rnd_pixels16_x
;
c
->
avg_no_rnd_pixels_tab
[
0
][
2
]
=
avg_no_rnd_pixels16_y
;
c
->
avg_no_rnd_pixels_tab
[
0
][
3
]
=
avg_no_rnd_pixels16_xy
;
c
->
avg_no_rnd_pixels_tab
[
0
]
=
avg_no_rnd_pixels16_o
;
c
->
avg_no_rnd_pixels_tab
[
1
]
=
avg_no_rnd_pixels16_x
;
c
->
avg_no_rnd_pixels_tab
[
2
]
=
avg_no_rnd_pixels16_y
;
c
->
avg_no_rnd_pixels_tab
[
3
]
=
avg_no_rnd_pixels16_xy
;
}
#ifdef QPEL
...
...
libavcodec/sparc/dsputil_vis.c
View file @
baf35bb4
...
...
@@ -3540,10 +3540,10 @@ void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx)
c
->
put_no_rnd_pixels_tab
[
1
][
2
]
=
MC_put_no_round_y_8_vis
;
c
->
put_no_rnd_pixels_tab
[
1
][
3
]
=
MC_put_no_round_xy_8_vis
;
c
->
avg_no_rnd_pixels_tab
[
0
]
[
0
]
=
MC_avg_no_round_o_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
0
][
1
]
=
MC_avg_no_round_x_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
0
][
2
]
=
MC_avg_no_round_y_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
0
][
3
]
=
MC_avg_no_round_xy_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
0
]
=
MC_avg_no_round_o_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
1
]
=
MC_avg_no_round_x_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
2
]
=
MC_avg_no_round_y_16_vis
;
c
->
avg_no_rnd_pixels_tab
[
3
]
=
MC_avg_no_round_xy_16_vis
;
}
}
}
libavcodec/vc1dec.c
View file @
baf35bb4
...
...
@@ -1949,7 +1949,7 @@ static void vc1_interp_mc(VC1Context *v)
if
(
!
v
->
rnd
)
dsp
->
avg_pixels_tab
[
0
][
dxy
](
s
->
dest
[
0
]
+
off
,
srcY
,
s
->
linesize
,
16
);
else
dsp
->
avg_no_rnd_pixels_tab
[
0
][
dxy
](
s
->
dest
[
0
]
+
off
,
srcY
,
s
->
linesize
,
16
);
dsp
->
avg_no_rnd_pixels_tab
[
dxy
](
s
->
dest
[
0
]
+
off
,
srcY
,
s
->
linesize
,
16
);
}
if
(
s
->
flags
&
CODEC_FLAG_GRAY
)
return
;
...
...
libavcodec/x86/dsputil_mmx.c
View file @
baf35bb4
...
...
@@ -1876,10 +1876,10 @@ void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src,
#define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \
do { \
c->PFX ## _pixels_tab
[IDX]
[0] = PFX ## _pixels ## SIZE ## _ ## CPU; \
c->PFX ## _pixels_tab
[IDX]
[1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \
c->PFX ## _pixels_tab
[IDX]
[2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \
c->PFX ## _pixels_tab
[IDX]
[3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \
c->PFX ## _pixels_tab
IDX
[0] = PFX ## _pixels ## SIZE ## _ ## CPU; \
c->PFX ## _pixels_tab
IDX
[1] = PFX ## _pixels ## SIZE ## _x2_ ## CPU; \
c->PFX ## _pixels_tab
IDX
[2] = PFX ## _pixels ## SIZE ## _y2_ ## CPU; \
c->PFX ## _pixels_tab
IDX
[3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \
} while (0)
#define H264_QPEL_FUNCS(x, y, CPU) \
...
...
@@ -1912,13 +1912,13 @@ static void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
c
->
clear_blocks
=
clear_blocks_mmx
;
c
->
draw_edges
=
draw_edges_mmx
;
SET_HPEL_FUNCS
(
put
,
0
,
16
,
mmx
);
SET_HPEL_FUNCS
(
put_no_rnd
,
0
,
16
,
mmx
);
SET_HPEL_FUNCS
(
avg
,
0
,
16
,
mmx
);
SET_HPEL_FUNCS
(
avg_no_rnd
,
0
,
16
,
mmx
);
SET_HPEL_FUNCS
(
put
,
1
,
8
,
mmx
);
SET_HPEL_FUNCS
(
put_no_rnd
,
1
,
8
,
mmx
);
SET_HPEL_FUNCS
(
avg
,
1
,
8
,
mmx
);
SET_HPEL_FUNCS
(
put
,
[
0
]
,
16
,
mmx
);
SET_HPEL_FUNCS
(
put_no_rnd
,
[
0
]
,
16
,
mmx
);
SET_HPEL_FUNCS
(
avg
,
[
0
]
,
16
,
mmx
);
SET_HPEL_FUNCS
(
avg_no_rnd
,
,
16
,
mmx
);
SET_HPEL_FUNCS
(
put
,
[
1
]
,
8
,
mmx
);
SET_HPEL_FUNCS
(
put_no_rnd
,
[
1
]
,
8
,
mmx
);
SET_HPEL_FUNCS
(
avg
,
[
1
]
,
8
,
mmx
);
switch
(
avctx
->
idct_algo
)
{
case
FF_IDCT_AUTO
:
...
...
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