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
5053a9a1
Commit
5053a9a1
authored
Apr 24, 2013
by
Michael Niedermayer
Committed by
Martin Storsjö
May 28, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vc1: Use shuffled use_ic instead of equally shuffled mv_mode
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
3ced06f2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
11 deletions
+24
-11
vc1dec.c
libavcodec/vc1dec.c
+24
-11
No files found.
libavcodec/vc1dec.c
View file @
5053a9a1
...
@@ -349,6 +349,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
...
@@ -349,6 +349,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
int
i
;
int
i
;
const
uint8_t
*
luty
,
*
lutuv
;
const
uint8_t
*
luty
,
*
lutuv
;
int
use_ic
;
if
((
!
v
->
field_mode
||
if
((
!
v
->
field_mode
||
(
v
->
ref_field_type
[
dir
]
==
1
&&
v
->
cur_field_type
==
1
))
&&
(
v
->
ref_field_type
[
dir
]
==
1
&&
v
->
cur_field_type
==
1
))
&&
...
@@ -389,12 +390,14 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
...
@@ -389,12 +390,14 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
srcV
=
s
->
current_picture
.
f
.
data
[
2
];
srcV
=
s
->
current_picture
.
f
.
data
[
2
];
luty
=
v
->
curr_luty
[
v
->
ref_field_type
[
dir
]];
luty
=
v
->
curr_luty
[
v
->
ref_field_type
[
dir
]];
lutuv
=
v
->
curr_lutuv
[
v
->
ref_field_type
[
dir
]];
lutuv
=
v
->
curr_lutuv
[
v
->
ref_field_type
[
dir
]];
use_ic
=
v
->
curr_use_ic
;
}
else
{
}
else
{
srcY
=
s
->
last_picture
.
f
.
data
[
0
];
srcY
=
s
->
last_picture
.
f
.
data
[
0
];
srcU
=
s
->
last_picture
.
f
.
data
[
1
];
srcU
=
s
->
last_picture
.
f
.
data
[
1
];
srcV
=
s
->
last_picture
.
f
.
data
[
2
];
srcV
=
s
->
last_picture
.
f
.
data
[
2
];
luty
=
v
->
last_luty
[
v
->
ref_field_type
[
dir
]];
luty
=
v
->
last_luty
[
v
->
ref_field_type
[
dir
]];
lutuv
=
v
->
last_lutuv
[
v
->
ref_field_type
[
dir
]];
lutuv
=
v
->
last_lutuv
[
v
->
ref_field_type
[
dir
]];
use_ic
=
v
->
last_use_ic
;
}
}
}
else
{
}
else
{
srcY
=
s
->
next_picture
.
f
.
data
[
0
];
srcY
=
s
->
next_picture
.
f
.
data
[
0
];
...
@@ -402,6 +405,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
...
@@ -402,6 +405,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
srcV
=
s
->
next_picture
.
f
.
data
[
2
];
srcV
=
s
->
next_picture
.
f
.
data
[
2
];
luty
=
v
->
next_luty
[
v
->
ref_field_type
[
dir
]];
luty
=
v
->
next_luty
[
v
->
ref_field_type
[
dir
]];
lutuv
=
v
->
next_lutuv
[
v
->
ref_field_type
[
dir
]];
lutuv
=
v
->
next_lutuv
[
v
->
ref_field_type
[
dir
]];
use_ic
=
v
->
next_use_ic
;
}
}
src_x
=
s
->
mb_x
*
16
+
(
mx
>>
2
);
src_x
=
s
->
mb_x
*
16
+
(
mx
>>
2
);
...
@@ -437,7 +441,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
...
@@ -437,7 +441,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
srcV
=
s
->
edge_emu_buffer
+
18
*
s
->
linesize
;
srcV
=
s
->
edge_emu_buffer
+
18
*
s
->
linesize
;
}
}
if
(
v
->
rangeredfrm
||
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
if
(
v
->
rangeredfrm
||
use_ic
||
s
->
h_edge_pos
<
22
||
v_edge_pos
<
22
||
s
->
h_edge_pos
<
22
||
v_edge_pos
<
22
||
(
unsigned
)(
src_x
-
s
->
mspel
)
>
s
->
h_edge_pos
-
(
mx
&
3
)
-
16
-
s
->
mspel
*
3
||
(
unsigned
)(
src_x
-
s
->
mspel
)
>
s
->
h_edge_pos
-
(
mx
&
3
)
-
16
-
s
->
mspel
*
3
||
(
unsigned
)(
src_y
-
1
)
>
v_edge_pos
-
(
my
&
3
)
-
16
-
3
)
{
||
(
unsigned
)(
src_y
-
1
)
>
v_edge_pos
-
(
my
&
3
)
-
16
-
3
)
{
...
@@ -478,7 +482,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
...
@@ -478,7 +482,7 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
}
}
}
}
/* if we deal with intensity compensation we need to scale source blocks */
/* if we deal with intensity compensation we need to scale source blocks */
if
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
{
if
(
use_ic
)
{
int
i
,
j
;
int
i
,
j
;
uint8_t
*
src
,
*
src2
;
uint8_t
*
src
,
*
src2
;
...
@@ -552,6 +556,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
...
@@ -552,6 +556,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
int
fieldmv
=
(
v
->
fcm
==
ILACE_FRAME
)
?
v
->
blk_mv_type
[
s
->
block_index
[
n
]]
:
0
;
int
fieldmv
=
(
v
->
fcm
==
ILACE_FRAME
)
?
v
->
blk_mv_type
[
s
->
block_index
[
n
]]
:
0
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
const
uint8_t
*
luty
;
const
uint8_t
*
luty
;
int
use_ic
;
if
((
!
v
->
field_mode
||
if
((
!
v
->
field_mode
||
(
v
->
ref_field_type
[
dir
]
==
1
&&
v
->
cur_field_type
==
1
))
&&
(
v
->
ref_field_type
[
dir
]
==
1
&&
v
->
cur_field_type
==
1
))
&&
...
@@ -565,13 +570,16 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
...
@@ -565,13 +570,16 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
if
(
v
->
field_mode
&&
(
v
->
cur_field_type
!=
v
->
ref_field_type
[
dir
])
&&
v
->
second_field
)
{
if
(
v
->
field_mode
&&
(
v
->
cur_field_type
!=
v
->
ref_field_type
[
dir
])
&&
v
->
second_field
)
{
srcY
=
s
->
current_picture
.
f
.
data
[
0
];
srcY
=
s
->
current_picture
.
f
.
data
[
0
];
luty
=
v
->
curr_luty
[
v
->
ref_field_type
[
dir
]];
luty
=
v
->
curr_luty
[
v
->
ref_field_type
[
dir
]];
use_ic
=
v
->
curr_use_ic
;
}
else
{
}
else
{
srcY
=
s
->
last_picture
.
f
.
data
[
0
];
srcY
=
s
->
last_picture
.
f
.
data
[
0
];
luty
=
v
->
last_luty
[
v
->
ref_field_type
[
dir
]];
luty
=
v
->
last_luty
[
v
->
ref_field_type
[
dir
]];
use_ic
=
v
->
last_use_ic
;
}
}
}
else
{
}
else
{
srcY
=
s
->
next_picture
.
f
.
data
[
0
];
srcY
=
s
->
next_picture
.
f
.
data
[
0
];
luty
=
v
->
next_luty
[
v
->
ref_field_type
[
dir
]];
luty
=
v
->
next_luty
[
v
->
ref_field_type
[
dir
]];
use_ic
=
v
->
next_use_ic
;
}
}
if
(
v
->
field_mode
)
{
if
(
v
->
field_mode
)
{
...
@@ -668,7 +676,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
...
@@ -668,7 +676,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
v_edge_pos
--
;
v_edge_pos
--
;
if
(
fieldmv
&&
(
src_y
&
1
)
&&
src_y
<
4
)
if
(
fieldmv
&&
(
src_y
&
1
)
&&
src_y
<
4
)
src_y
--
;
src_y
--
;
if
(
v
->
rangeredfrm
||
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
if
(
v
->
rangeredfrm
||
use_ic
||
s
->
h_edge_pos
<
13
||
v_edge_pos
<
23
||
s
->
h_edge_pos
<
13
||
v_edge_pos
<
23
||
(
unsigned
)(
src_x
-
s
->
mspel
)
>
s
->
h_edge_pos
-
(
mx
&
3
)
-
8
-
s
->
mspel
*
2
||
(
unsigned
)(
src_x
-
s
->
mspel
)
>
s
->
h_edge_pos
-
(
mx
&
3
)
-
8
-
s
->
mspel
*
2
||
(
unsigned
)(
src_y
-
(
s
->
mspel
<<
fieldmv
))
>
v_edge_pos
-
(
my
&
3
)
-
((
8
+
s
->
mspel
*
2
)
<<
fieldmv
))
{
||
(
unsigned
)(
src_y
-
(
s
->
mspel
<<
fieldmv
))
>
v_edge_pos
-
(
my
&
3
)
-
((
8
+
s
->
mspel
*
2
)
<<
fieldmv
))
{
...
@@ -692,7 +700,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
...
@@ -692,7 +700,7 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
}
}
}
}
/* if we deal with intensity compensation we need to scale source blocks */
/* if we deal with intensity compensation we need to scale source blocks */
if
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
{
if
(
use_ic
)
{
int
i
,
j
;
int
i
,
j
;
uint8_t
*
src
;
uint8_t
*
src
;
...
@@ -788,6 +796,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
...
@@ -788,6 +796,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
int
chroma_ref_type
=
v
->
cur_field_type
;
int
chroma_ref_type
=
v
->
cur_field_type
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
const
uint8_t
*
lutuv
;
const
uint8_t
*
lutuv
;
int
use_ic
;
if
(
!
v
->
field_mode
&&
!
v
->
s
.
last_picture
.
f
.
data
[
0
])
if
(
!
v
->
field_mode
&&
!
v
->
s
.
last_picture
.
f
.
data
[
0
])
return
;
return
;
...
@@ -854,15 +863,18 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
...
@@ -854,15 +863,18 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
srcU
=
s
->
current_picture
.
f
.
data
[
1
];
srcU
=
s
->
current_picture
.
f
.
data
[
1
];
srcV
=
s
->
current_picture
.
f
.
data
[
2
];
srcV
=
s
->
current_picture
.
f
.
data
[
2
];
lutuv
=
v
->
curr_lutuv
[
chroma_ref_type
];
lutuv
=
v
->
curr_lutuv
[
chroma_ref_type
];
use_ic
=
v
->
curr_use_ic
;
}
else
{
}
else
{
srcU
=
s
->
last_picture
.
f
.
data
[
1
];
srcU
=
s
->
last_picture
.
f
.
data
[
1
];
srcV
=
s
->
last_picture
.
f
.
data
[
2
];
srcV
=
s
->
last_picture
.
f
.
data
[
2
];
lutuv
=
v
->
last_lutuv
[
chroma_ref_type
];
lutuv
=
v
->
last_lutuv
[
chroma_ref_type
];
use_ic
=
v
->
last_use_ic
;
}
}
}
else
{
}
else
{
srcU
=
s
->
next_picture
.
f
.
data
[
1
];
srcU
=
s
->
next_picture
.
f
.
data
[
1
];
srcV
=
s
->
next_picture
.
f
.
data
[
2
];
srcV
=
s
->
next_picture
.
f
.
data
[
2
];
lutuv
=
v
->
next_lutuv
[
chroma_ref_type
];
lutuv
=
v
->
next_lutuv
[
chroma_ref_type
];
use_ic
=
v
->
next_use_ic
;
}
}
srcU
+=
uvsrc_y
*
s
->
uvlinesize
+
uvsrc_x
;
srcU
+=
uvsrc_y
*
s
->
uvlinesize
+
uvsrc_x
;
...
@@ -875,7 +887,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
...
@@ -875,7 +887,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
}
}
}
}
if
(
v
->
rangeredfrm
||
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
if
(
v
->
rangeredfrm
||
use_ic
||
s
->
h_edge_pos
<
18
||
v_edge_pos
<
18
||
s
->
h_edge_pos
<
18
||
v_edge_pos
<
18
||
(
unsigned
)
uvsrc_x
>
(
s
->
h_edge_pos
>>
1
)
-
9
||
(
unsigned
)
uvsrc_x
>
(
s
->
h_edge_pos
>>
1
)
-
9
||
(
unsigned
)
uvsrc_y
>
(
v_edge_pos
>>
1
)
-
9
)
{
||
(
unsigned
)
uvsrc_y
>
(
v_edge_pos
>>
1
)
-
9
)
{
...
@@ -905,7 +917,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
...
@@ -905,7 +917,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
}
}
}
}
/* if we deal with intensity compensation we need to scale source blocks */
/* if we deal with intensity compensation we need to scale source blocks */
if
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
{
if
(
use_ic
)
{
int
i
,
j
;
int
i
,
j
;
uint8_t
*
src
,
*
src2
;
uint8_t
*
src
,
*
src2
;
...
@@ -948,6 +960,7 @@ static void vc1_mc_4mv_chroma4(VC1Context *v)
...
@@ -948,6 +960,7 @@ static void vc1_mc_4mv_chroma4(VC1Context *v)
static
const
int
s_rndtblfield
[
16
]
=
{
0
,
0
,
1
,
2
,
4
,
4
,
5
,
6
,
2
,
2
,
3
,
8
,
6
,
6
,
7
,
12
};
static
const
int
s_rndtblfield
[
16
]
=
{
0
,
0
,
1
,
2
,
4
,
4
,
5
,
6
,
2
,
2
,
3
,
8
,
6
,
6
,
7
,
12
};
int
v_dist
=
fieldmv
?
1
:
4
;
// vertical offset for lower sub-blocks
int
v_dist
=
fieldmv
?
1
:
4
;
// vertical offset for lower sub-blocks
int
v_edge_pos
=
s
->
v_edge_pos
>>
1
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
1
;
int
use_ic
=
v
->
last_use_ic
;
if
(
!
v
->
s
.
last_picture
.
f
.
data
[
0
])
if
(
!
v
->
s
.
last_picture
.
f
.
data
[
0
])
return
;
return
;
...
@@ -980,7 +993,7 @@ static void vc1_mc_4mv_chroma4(VC1Context *v)
...
@@ -980,7 +993,7 @@ static void vc1_mc_4mv_chroma4(VC1Context *v)
v_edge_pos
--
;
v_edge_pos
--
;
if
(
fieldmv
&&
(
uvsrc_y
&
1
)
&&
uvsrc_y
<
2
)
if
(
fieldmv
&&
(
uvsrc_y
&
1
)
&&
uvsrc_y
<
2
)
uvsrc_y
--
;
uvsrc_y
--
;
if
(
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
if
(
use_ic
||
s
->
h_edge_pos
<
10
||
v_edge_pos
<
(
5
<<
fieldmv
)
||
s
->
h_edge_pos
<
10
||
v_edge_pos
<
(
5
<<
fieldmv
)
||
(
unsigned
)
uvsrc_x
>
(
s
->
h_edge_pos
>>
1
)
-
5
||
(
unsigned
)
uvsrc_x
>
(
s
->
h_edge_pos
>>
1
)
-
5
||
(
unsigned
)
uvsrc_y
>
v_edge_pos
-
(
5
<<
fieldmv
))
{
||
(
unsigned
)
uvsrc_y
>
v_edge_pos
-
(
5
<<
fieldmv
))
{
...
@@ -994,7 +1007,7 @@ static void vc1_mc_4mv_chroma4(VC1Context *v)
...
@@ -994,7 +1007,7 @@ static void vc1_mc_4mv_chroma4(VC1Context *v)
srcV
=
s
->
edge_emu_buffer
+
16
;
srcV
=
s
->
edge_emu_buffer
+
16
;
/* if we deal with intensity compensation we need to scale source blocks */
/* if we deal with intensity compensation we need to scale source blocks */
if
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
{
if
(
use_ic
)
{
int
i
,
j
;
int
i
,
j
;
uint8_t
*
src
,
*
src2
;
uint8_t
*
src
,
*
src2
;
const
uint8_t
*
lutuv
=
v
->
last_lutuv
[
v
->
ref_field_type
[
0
]];
const
uint8_t
*
lutuv
=
v
->
last_lutuv
[
v
->
ref_field_type
[
0
]];
...
@@ -1844,6 +1857,7 @@ static void vc1_interp_mc(VC1Context *v)
...
@@ -1844,6 +1857,7 @@ static void vc1_interp_mc(VC1Context *v)
int
dxy
,
mx
,
my
,
uvmx
,
uvmy
,
src_x
,
src_y
,
uvsrc_x
,
uvsrc_y
;
int
dxy
,
mx
,
my
,
uvmx
,
uvmy
,
src_x
,
src_y
,
uvsrc_x
,
uvsrc_y
;
int
off
,
off_uv
;
int
off
,
off_uv
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
int
v_edge_pos
=
s
->
v_edge_pos
>>
v
->
field_mode
;
int
use_ic
=
v
->
next_use_ic
;
if
(
!
v
->
field_mode
&&
!
v
->
s
.
next_picture
.
f
.
data
[
0
])
if
(
!
v
->
field_mode
&&
!
v
->
s
.
next_picture
.
f
.
data
[
0
])
return
;
return
;
...
@@ -1898,8 +1912,7 @@ static void vc1_interp_mc(VC1Context *v)
...
@@ -1898,8 +1912,7 @@ static void vc1_interp_mc(VC1Context *v)
srcV
=
s
->
edge_emu_buffer
+
18
*
s
->
linesize
;
srcV
=
s
->
edge_emu_buffer
+
18
*
s
->
linesize
;
}
}
if
(
v
->
rangeredfrm
||
s
->
h_edge_pos
<
22
||
v_edge_pos
<
22
if
(
v
->
rangeredfrm
||
s
->
h_edge_pos
<
22
||
v_edge_pos
<
22
||
use_ic
||
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
||
(
unsigned
)(
src_x
-
1
)
>
s
->
h_edge_pos
-
(
mx
&
3
)
-
16
-
3
||
(
unsigned
)(
src_x
-
1
)
>
s
->
h_edge_pos
-
(
mx
&
3
)
-
16
-
3
||
(
unsigned
)(
src_y
-
1
)
>
v_edge_pos
-
(
my
&
3
)
-
16
-
3
)
{
||
(
unsigned
)(
src_y
-
1
)
>
v_edge_pos
-
(
my
&
3
)
-
16
-
3
)
{
uint8_t
*
uvbuf
=
s
->
edge_emu_buffer
+
19
*
s
->
linesize
;
uint8_t
*
uvbuf
=
s
->
edge_emu_buffer
+
19
*
s
->
linesize
;
...
@@ -1939,7 +1952,7 @@ static void vc1_interp_mc(VC1Context *v)
...
@@ -1939,7 +1952,7 @@ static void vc1_interp_mc(VC1Context *v)
}
}
}
}
if
(
v
->
mv_mode
==
MV_PMODE_INTENSITY_COMP
)
{
if
(
use_ic
)
{
const
uint8_t
*
luty
=
v
->
next_luty
[
v
->
ref_field_type
[
1
]];
const
uint8_t
*
luty
=
v
->
next_luty
[
v
->
ref_field_type
[
1
]];
const
uint8_t
*
lutuv
=
v
->
next_lutuv
[
v
->
ref_field_type
[
1
]];
const
uint8_t
*
lutuv
=
v
->
next_lutuv
[
v
->
ref_field_type
[
1
]];
int
i
,
j
;
int
i
,
j
;
...
...
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