Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
65c7bb9e
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
65c7bb9e
编写于
7月 09, 2006
作者:
K
Kostya Shishkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use overlap filter instead of loop filter.
Originally committed as revision 5685 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
d2779ecd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
34 deletion
+24
-34
libavcodec/vc1.c
libavcodec/vc1.c
+24
-34
未找到文件。
libavcodec/vc1.c
浏览文件 @
65c7bb9e
...
...
@@ -825,24 +825,10 @@ static void vc1_inv_trans(DCTELEM block[64], int M, int N)
}
}
/** Apply overlap transform
/** Apply overlap transform
to vertical edge
* @todo optimize
* @todo move to DSPContext
*/
static
void
vc1_overlap_block
(
MpegEncContext
*
s
,
DCTELEM
block
[
64
],
int
n
,
int
do_hor
,
int
do_vert
)
{
int
i
;
if
(
do_hor
)
{
//TODO
}
if
(
do_vert
)
{
//TODO
}
for
(
i
=
0
;
i
<
64
;
i
++
)
block
[
i
]
+=
128
;
}
static
void
vc1_v_overlap
(
uint8_t
*
src
,
int
stride
)
{
int
i
;
...
...
@@ -861,6 +847,10 @@ static void vc1_v_overlap(uint8_t* src, int stride)
}
}
/** Apply overlap transform to horizontal edge
* @todo optimize
* @todo move to DSPContext
*/
static
void
vc1_h_overlap
(
uint8_t
*
src
,
int
stride
)
{
int
i
;
...
...
@@ -2450,9 +2440,9 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64])
/* TODO: proper loop filtering */
if
(
v
->
pq
>=
9
&&
v
->
overlap
)
{
if
(
v
->
a_avail
)
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
),
s
->
y_dc_scale
);
vc1_v_overlap
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
)
);
if
(
v
->
c_avail
)
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
),
s
->
y_dc_scale
);
vc1_h_overlap
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
)
);
}
}
else
if
(
val
)
{
vc1_decode_p_block
(
v
,
block
[
i
],
i
,
mquant
,
ttmb
,
first_block
);
...
...
@@ -2546,9 +2536,9 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64])
/* TODO: proper loop filtering */
if
(
v
->
pq
>=
9
&&
v
->
overlap
)
{
if
(
v
->
a_avail
)
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
),
s
->
y_dc_scale
);
vc1_v_overlap
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
)
);
if
(
v
->
c_avail
)
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
),
s
->
y_dc_scale
);
vc1_h_overlap
(
s
->
dest
[
dst_idx
]
+
off
,
s
->
linesize
>>
((
i
&
4
)
>>
2
)
);
}
}
else
if
(
is_coded
[
i
])
{
status
=
vc1_decode_p_block
(
v
,
s
->
block
[
i
],
i
,
mquant
,
ttmb
,
first_block
);
...
...
@@ -2582,7 +2572,7 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64])
*/
static
void
vc1_decode_i_blocks
(
VC1Context
*
v
)
{
int
k
;
int
k
,
j
;
MpegEncContext
*
s
=
&
v
->
s
;
int
cbp
,
val
;
uint8_t
*
coded_val
;
...
...
@@ -2649,28 +2639,28 @@ static void vc1_decode_i_blocks(VC1Context *v)
vc1_inv_trans
(
s
->
block
[
k
],
8
,
8
);
if
(
v
->
pq
>=
9
&&
v
->
overlap
)
{
vc1_overlap_block
(
s
,
s
->
block
[
k
],
k
,
(
s
->
mb_y
||
k
>
1
),
(
s
->
mb_x
||
(
k
!=
0
&&
k
!=
2
)))
;
for
(
j
=
0
;
j
<
64
;
j
++
)
s
->
block
[
k
][
j
]
+=
128
;
}
}
vc1_put_block
(
v
,
s
->
block
);
if
(
v
->
pq
>=
9
&&
v
->
overlap
)
{
/* XXX: do proper overlapping insted of loop filter */
if
(
s
->
mb_y
)
{
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
0
],
s
->
linesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
0
]
+
8
,
s
->
linesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
1
],
s
->
uvlinesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
2
],
s
->
uvlinesize
,
s
->
y_dc_scal
e
);
if
(
!
s
->
first_slice_line
)
{
vc1_v_overlap
(
s
->
dest
[
0
],
s
->
linesiz
e
);
vc1_v_overlap
(
s
->
dest
[
0
]
+
8
,
s
->
linesiz
e
);
vc1_v_overlap
(
s
->
dest
[
1
],
s
->
uvlinesiz
e
);
vc1_v_overlap
(
s
->
dest
[
2
],
s
->
uvlinesiz
e
);
}
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
,
s
->
linesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_v_loop_filter
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
+
8
,
s
->
linesize
,
s
->
y_dc_scal
e
);
vc1_v_overlap
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
,
s
->
linesiz
e
);
vc1_v_overlap
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
+
8
,
s
->
linesiz
e
);
if
(
s
->
mb_x
)
{
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
0
],
s
->
linesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
,
s
->
linesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
1
],
s
->
uvlinesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
2
],
s
->
uvlinesize
,
s
->
y_dc_scal
e
);
vc1_h_overlap
(
s
->
dest
[
0
],
s
->
linesiz
e
);
vc1_h_overlap
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
,
s
->
linesiz
e
);
vc1_h_overlap
(
s
->
dest
[
1
],
s
->
uvlinesiz
e
);
vc1_h_overlap
(
s
->
dest
[
2
],
s
->
uvlinesiz
e
);
}
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
0
]
+
8
,
s
->
linesize
,
s
->
y_dc_scal
e
);
s
->
dsp
.
h263_h_loop_filter
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
+
8
,
s
->
linesize
,
s
->
y_dc_scal
e
);
vc1_h_overlap
(
s
->
dest
[
0
]
+
8
,
s
->
linesiz
e
);
vc1_h_overlap
(
s
->
dest
[
0
]
+
8
*
s
->
linesize
+
8
,
s
->
linesiz
e
);
}
if
(
get_bits_count
(
&
s
->
gb
)
>
v
->
bits
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录