Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
d2779ecd
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,发现更多精彩内容 >>
提交
d2779ecd
编写于
7月 09, 2006
作者:
K
Kostya Shishkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use s->first_slice_line in checks instead of s->mb_y
Originally committed as revision 5684 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
88e2539b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
6 deletion
+8
-6
libavcodec/vc1.c
libavcodec/vc1.c
+8
-6
未找到文件。
libavcodec/vc1.c
浏览文件 @
d2779ecd
...
...
@@ -1698,13 +1698,13 @@ static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
if
(
pq
<
9
||
!
overlap
)
{
/* Set outer values */
if
(
!
s
->
mb_y
&&
(
n
!=
2
&&
n
!=
3
))
b
=
a
=
dcpred
[
scale
];
if
(
s
->
first_slice_line
&&
(
n
!=
2
&&
n
!=
3
))
b
=
a
=
dcpred
[
scale
];
if
(
s
->
mb_x
==
0
&&
(
n
!=
1
&&
n
!=
3
))
b
=
c
=
dcpred
[
scale
];
}
else
{
/* Set outer values */
if
(
!
s
->
mb_y
&&
(
n
!=
2
&&
n
!=
3
))
b
=
a
=
0
;
if
(
s
->
first_slice_line
&&
(
n
!=
2
&&
n
!=
3
))
b
=
a
=
0
;
if
(
s
->
mb_x
==
0
&&
(
n
!=
1
&&
n
!=
3
))
b
=
c
=
0
;
}
...
...
@@ -2438,7 +2438,7 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64])
if
(
s
->
mb_intra
)
{
/* check if prediction blocks A and C are available */
v
->
a_avail
=
v
->
c_avail
=
0
;
if
(
i
==
2
||
i
==
3
||
s
->
mb_y
)
if
(
i
==
2
||
i
==
3
||
!
s
->
first_slice_line
)
v
->
a_avail
=
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
s
->
block_wrap
[
i
]];
if
(
i
==
1
||
i
==
3
||
s
->
mb_x
)
v
->
c_avail
=
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
1
];
...
...
@@ -2515,8 +2515,8 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64])
int
intrapred
=
0
;
for
(
i
=
0
;
i
<
6
;
i
++
)
if
(
is_intra
[
i
])
{
if
(((
s
->
mb_y
||
(
i
==
2
||
i
==
3
))
&&
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
s
->
block_wrap
[
i
]])
||
((
s
->
mb_x
||
(
i
==
1
||
i
==
3
))
&&
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
1
]))
{
if
(((
!
s
->
first_slice_line
||
(
i
==
2
||
i
==
3
))
&&
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
s
->
block_wrap
[
i
]])
||
((
s
->
mb_x
||
(
i
==
1
||
i
==
3
))
&&
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
1
]))
{
intrapred
=
1
;
break
;
}
...
...
@@ -2534,7 +2534,7 @@ static int vc1_decode_p_mb(VC1Context *v, DCTELEM block[6][64])
if
(
is_intra
[
i
])
{
/* check if prediction blocks A and C are available */
v
->
a_avail
=
v
->
c_avail
=
0
;
if
(
i
==
2
||
i
==
3
||
s
->
mb_y
)
if
(
i
==
2
||
i
==
3
||
!
s
->
first_slice_line
)
v
->
a_avail
=
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
s
->
block_wrap
[
i
]];
if
(
i
==
1
||
i
==
3
||
s
->
mb_x
)
v
->
c_avail
=
v
->
mb_type
[
0
][
s
->
block_index
[
i
]
-
1
];
...
...
@@ -2620,6 +2620,7 @@ static void vc1_decode_i_blocks(VC1Context *v)
//do frame decode
s
->
mb_x
=
s
->
mb_y
=
0
;
s
->
mb_intra
=
1
;
s
->
first_slice_line
=
1
;
ff_er_add_slice
(
s
,
0
,
0
,
s
->
mb_width
-
1
,
s
->
mb_height
-
1
,
(
AC_END
|
DC_END
|
MV_END
));
for
(
s
->
mb_y
=
0
;
s
->
mb_y
<
s
->
mb_height
;
s
->
mb_y
++
)
{
for
(
s
->
mb_x
=
0
;
s
->
mb_x
<
s
->
mb_width
;
s
->
mb_x
++
)
{
...
...
@@ -2678,6 +2679,7 @@ static void vc1_decode_i_blocks(VC1Context *v)
}
}
ff_draw_horiz_band
(
s
,
s
->
mb_y
*
16
,
16
);
s
->
first_slice_line
=
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录