Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
15675ce6
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,发现更多精彩内容 >>
提交
15675ce6
编写于
2月 13, 2010
作者:
D
David Conrad
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eliminate fragment -> macroblock mapping array
Originally committed as revision 21802 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
ea676144
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
48 deletion
+13
-48
libavcodec/vp3.c
libavcodec/vp3.c
+13
-48
未找到文件。
libavcodec/vp3.c
浏览文件 @
15675ce6
...
...
@@ -53,8 +53,6 @@ typedef struct Coeff {
//FIXME split things out into their own arrays
typedef
struct
Vp3Fragment
{
Coeff
*
next_coeff
;
/* this is the macroblock that the fragment belongs to */
uint16_t
macroblock
;
uint8_t
coding_method
;
int8_t
motion_x
;
int8_t
motion_y
;
...
...
@@ -346,48 +344,6 @@ static int init_block_mapping(Vp3DecodeContext *s)
}
}
/* initialize the macroblock <-> fragment mapping */
current_fragment
=
0
;
current_macroblock
=
0
;
for
(
i
=
0
;
i
<
s
->
fragment_height
;
i
+=
2
)
{
for
(
j
=
0
;
j
<
s
->
fragment_width
;
j
+=
2
)
{
s
->
all_fragments
[
current_fragment
].
macroblock
=
current_macroblock
;
if
(
j
+
1
<
s
->
fragment_width
)
{
s
->
all_fragments
[
current_fragment
+
1
].
macroblock
=
current_macroblock
;
}
if
(
i
+
1
<
s
->
fragment_height
)
{
s
->
all_fragments
[
current_fragment
+
s
->
fragment_width
].
macroblock
=
current_macroblock
;
}
if
((
j
+
1
<
s
->
fragment_width
)
&&
(
i
+
1
<
s
->
fragment_height
))
{
s
->
all_fragments
[
current_fragment
+
s
->
fragment_width
+
1
].
macroblock
=
current_macroblock
;
}
/* C planes */
c_fragment
=
s
->
fragment_start
[
1
]
+
(
i
*
s
->
fragment_width
/
4
)
+
(
j
/
2
);
s
->
all_fragments
[
c_fragment
].
macroblock
=
s
->
macroblock_count
;
c_fragment
=
s
->
fragment_start
[
2
]
+
(
i
*
s
->
fragment_width
/
4
)
+
(
j
/
2
);
s
->
all_fragments
[
c_fragment
].
macroblock
=
s
->
macroblock_count
;
if
(
j
+
2
<=
s
->
fragment_width
)
current_fragment
+=
2
;
else
current_fragment
++
;
current_macroblock
++
;
}
current_fragment
+=
s
->
fragment_width
;
}
return
0
;
/* successful path out */
}
...
...
@@ -623,7 +579,6 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
first_c_fragment_seen
=
1
;
}
s
->
coded_fragment_list_index
++
;
s
->
macroblock_coding
[
s
->
all_fragments
[
current_fragment
].
macroblock
]
=
MODE_INTER_NO_MV
;
}
else
{
/* not coded; copy this fragment from the prior frame */
s
->
all_fragments
[
current_fragment
].
coding_method
=
...
...
@@ -647,7 +602,6 @@ static int unpack_superblocks(Vp3DecodeContext *s, GetBitContext *gb)
first_c_fragment_seen
=
1
;
}
s
->
coded_fragment_list_index
++
;
s
->
macroblock_coding
[
s
->
all_fragments
[
current_fragment
].
macroblock
]
=
MODE_INTER_NO_MV
;
}
}
}
...
...
@@ -720,14 +674,25 @@ static int unpack_modes(Vp3DecodeContext *s, GetBitContext *gb)
for
(
j
=
0
;
j
<
4
;
j
++
)
{
int
mb_x
=
2
*
sb_x
+
(
j
>>
1
);
int
mb_y
=
2
*
sb_y
+
(((
j
>>
1
)
+
j
)
&
1
);
int
frags_coded
=
0
;
current_macroblock
=
mb_y
*
s
->
macroblock_width
+
mb_x
;
if
(
mb_x
>=
s
->
macroblock_width
||
mb_y
>=
s
->
macroblock_height
||
(
s
->
macroblock_coding
[
current_macroblock
]
==
MODE_COPY
))
if
(
mb_x
>=
s
->
macroblock_width
||
mb_y
>=
s
->
macroblock_height
)
continue
;
#define BLOCK_X (2*mb_x + (k&1))
#define BLOCK_Y (2*mb_y + (k>>1))
/* coding modes are only stored if the macroblock has at least one
* luma block coded, otherwise it must be INTER_NO_MV */
for
(
k
=
0
;
k
<
4
;
k
++
)
{
current_fragment
=
BLOCK_Y
*
s
->
fragment_width
+
BLOCK_X
;
if
(
s
->
all_fragments
[
current_fragment
].
coding_method
!=
MODE_COPY
)
break
;
}
if
(
k
==
4
)
{
s
->
macroblock_coding
[
current_macroblock
]
=
MODE_INTER_NO_MV
;
continue
;
}
/* mode 7 means get 3 bits for each coding mode */
if
(
scheme
==
7
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录