Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
1848a154
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,发现更多精彩内容 >>
提交
1848a154
编写于
3月 23, 2016
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
svq3: stop using H264Context.gb
上级
ea6ab02a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
31 addition
and
30 deletion
+31
-30
libavcodec/svq3.c
libavcodec/svq3.c
+31
-30
未找到文件。
libavcodec/svq3.c
浏览文件 @
1848a154
...
...
@@ -79,6 +79,7 @@ typedef struct SVQ3Context {
H264Picture
*
next_pic
;
H264Picture
*
last_pic
;
GetBitContext
gb
;
GetBitContext
gb_slice
;
uint8_t
*
slice_buf
;
int
slice_size
;
int
halfpel_flag
;
...
...
@@ -527,8 +528,8 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode,
if
(
mode
==
PREDICT_MODE
)
{
dx
=
dy
=
0
;
}
else
{
dy
=
svq3_get_se_golomb
(
&
h
->
gb
);
dx
=
svq3_get_se_golomb
(
&
h
->
gb
);
dy
=
svq3_get_se_golomb
(
&
s
->
gb_slice
);
dx
=
svq3_get_se_golomb
(
&
s
->
gb_slice
);
if
(
dx
==
INVALID_VLC
||
dy
==
INVALID_VLC
)
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"invalid MV vlc
\n
"
);
...
...
@@ -736,10 +737,10 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
mb_type
=
MB_TYPE_16x16
;
}
}
else
if
(
mb_type
<
8
)
{
/* INTER */
if
(
s
->
thirdpel_flag
&&
s
->
halfpel_flag
==
!
get_bits1
(
&
h
->
gb
))
if
(
s
->
thirdpel_flag
&&
s
->
halfpel_flag
==
!
get_bits1
(
&
s
->
gb_slice
))
mode
=
THIRDPEL_MODE
;
else
if
(
s
->
halfpel_flag
&&
s
->
thirdpel_flag
==
!
get_bits1
(
&
h
->
gb
))
s
->
thirdpel_flag
==
!
get_bits1
(
&
s
->
gb_slice
))
mode
=
HALFPEL_MODE
;
else
mode
=
FULLPEL_MODE
;
...
...
@@ -841,7 +842,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
/* decode prediction codes for luma blocks */
for
(
i
=
0
;
i
<
16
;
i
+=
2
)
{
vlc
=
svq3_get_ue_golomb
(
&
h
->
gb
);
vlc
=
svq3_get_ue_golomb
(
&
s
->
gb_slice
);
if
(
vlc
>=
25
)
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
...
...
@@ -919,7 +920,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
if
(
!
IS_INTRA16x16
(
mb_type
)
&&
(
!
IS_SKIP
(
mb_type
)
||
s
->
pict_type
==
AV_PICTURE_TYPE_B
))
{
if
((
vlc
=
svq3_get_ue_golomb
(
&
h
->
gb
))
>=
48
)
{
if
((
vlc
=
svq3_get_ue_golomb
(
&
s
->
gb_slice
))
>=
48
)
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"cbp_vlc=%"
PRIu32
"
\n
"
,
vlc
);
return
-
1
;
}
...
...
@@ -929,7 +930,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
}
if
(
IS_INTRA16x16
(
mb_type
)
||
(
s
->
pict_type
!=
AV_PICTURE_TYPE_I
&&
s
->
adaptive_quant
&&
cbp
))
{
s
->
qscale
+=
svq3_get_se_golomb
(
&
h
->
gb
);
s
->
qscale
+=
svq3_get_se_golomb
(
&
s
->
gb_slice
);
if
(
s
->
qscale
>
31u
)
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"qscale:%d
\n
"
,
s
->
qscale
);
...
...
@@ -939,7 +940,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
if
(
IS_INTRA16x16
(
mb_type
))
{
AV_ZERO128
(
s
->
mb_luma_dc
[
0
]
+
0
);
AV_ZERO128
(
s
->
mb_luma_dc
[
0
]
+
8
);
if
(
svq3_decode_block
(
&
h
->
gb
,
s
->
mb_luma_dc
[
0
],
0
,
1
))
{
if
(
svq3_decode_block
(
&
s
->
gb_slice
,
s
->
mb_luma_dc
[
0
],
0
,
1
))
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"error while decoding intra luma dc
\n
"
);
return
-
1
;
...
...
@@ -958,7 +959,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
:
(
4
*
i
+
j
);
s
->
non_zero_count_cache
[
scan8
[
k
]]
=
1
;
if
(
svq3_decode_block
(
&
h
->
gb
,
&
s
->
mb
[
16
*
k
],
index
,
type
))
{
if
(
svq3_decode_block
(
&
s
->
gb_slice
,
&
s
->
mb
[
16
*
k
],
index
,
type
))
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"error while decoding block
\n
"
);
return
-
1
;
...
...
@@ -968,7 +969,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
if
((
cbp
&
0x30
))
{
for
(
i
=
1
;
i
<
3
;
++
i
)
if
(
svq3_decode_block
(
&
h
->
gb
,
&
s
->
mb
[
16
*
16
*
i
],
0
,
3
))
{
if
(
svq3_decode_block
(
&
s
->
gb_slice
,
&
s
->
mb
[
16
*
16
*
i
],
0
,
3
))
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"error while decoding chroma dc block
\n
"
);
return
-
1
;
...
...
@@ -980,7 +981,7 @@ static int svq3_decode_mb(SVQ3Context *s, unsigned int mb_type)
k
=
16
*
i
+
j
;
s
->
non_zero_count_cache
[
scan8
[
k
]]
=
1
;
if
(
svq3_decode_block
(
&
h
->
gb
,
&
s
->
mb
[
16
*
k
],
1
,
1
))
{
if
(
svq3_decode_block
(
&
s
->
gb_slice
,
&
s
->
mb
[
16
*
k
],
1
,
1
))
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"error while decoding chroma ac block
\n
"
);
return
-
1
;
...
...
@@ -1036,11 +1037,11 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
memcpy
(
s
->
slice_buf
,
s
->
gb
.
buffer
+
s
->
gb
.
index
/
8
,
slice_bytes
);
init_get_bits
(
&
h
->
gb
,
s
->
slice_buf
,
slice_bits
);
init_get_bits
(
&
s
->
gb_slice
,
s
->
slice_buf
,
slice_bits
);
if
(
s
->
watermark_key
)
{
uint32_t
header
=
AV_RL32
(
&
h
->
gb
.
buffer
[
1
]);
AV_WL32
(
&
h
->
gb
.
buffer
[
1
],
header
^
s
->
watermark_key
);
uint32_t
header
=
AV_RL32
(
&
s
->
gb_slice
.
buffer
[
1
]);
AV_WL32
(
&
s
->
gb_slice
.
buffer
[
1
],
header
^
s
->
watermark_key
);
}
if
(
length
>
0
)
{
memcpy
(
s
->
slice_buf
,
&
s
->
slice_buf
[
slice_length
],
length
-
1
);
...
...
@@ -1048,7 +1049,7 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
skip_bits_long
(
&
s
->
gb
,
slice_bytes
*
8
);
}
if
((
slice_id
=
svq3_get_ue_golomb
(
&
h
->
gb
))
>=
3
)
{
if
((
slice_id
=
svq3_get_ue_golomb
(
&
s
->
gb_slice
))
>=
3
)
{
av_log
(
h
->
avctx
,
AV_LOG_ERROR
,
"illegal slice type %u
\n
"
,
slice_id
);
return
-
1
;
}
...
...
@@ -1057,26 +1058,26 @@ static int svq3_decode_slice_header(AVCodecContext *avctx)
if
((
header
&
0x9F
)
==
2
)
{
i
=
(
s
->
mb_num
<
64
)
?
6
:
(
1
+
av_log2
(
s
->
mb_num
-
1
));
get_bits
(
&
h
->
gb
,
i
);
get_bits
(
&
s
->
gb_slice
,
i
);
}
else
{
skip_bits1
(
&
h
->
gb
);
skip_bits1
(
&
s
->
gb_slice
);
}
s
->
slice_num
=
get_bits
(
&
h
->
gb
,
8
);
s
->
qscale
=
get_bits
(
&
h
->
gb
,
5
);
s
->
adaptive_quant
=
get_bits1
(
&
h
->
gb
);
s
->
slice_num
=
get_bits
(
&
s
->
gb_slice
,
8
);
s
->
qscale
=
get_bits
(
&
s
->
gb_slice
,
5
);
s
->
adaptive_quant
=
get_bits1
(
&
s
->
gb_slice
);
/* unknown fields */
skip_bits1
(
&
h
->
gb
);
skip_bits1
(
&
s
->
gb_slice
);
if
(
s
->
unknown_flag
)
skip_bits1
(
&
h
->
gb
);
skip_bits1
(
&
s
->
gb_slice
);
skip_bits1
(
&
h
->
gb
);
skip_bits
(
&
h
->
gb
,
2
);
skip_bits1
(
&
s
->
gb_slice
);
skip_bits
(
&
s
->
gb_slice
,
2
);
while
(
get_bits1
(
&
h
->
gb
))
skip_bits
(
&
h
->
gb
,
8
);
while
(
get_bits1
(
&
s
->
gb_slice
))
skip_bits
(
&
s
->
gb_slice
,
8
);
/* reset intra predictors and invalidate motion vector references */
if
(
s
->
mb_x
>
0
)
{
...
...
@@ -1508,9 +1509,9 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
unsigned
mb_type
;
s
->
mb_xy
=
s
->
mb_x
+
s
->
mb_y
*
s
->
mb_stride
;
if
((
get_bits_left
(
&
h
->
gb
))
<=
7
)
{
if
(((
get_bits_count
(
&
h
->
gb
)
&
7
)
==
0
||
show_bits
(
&
h
->
gb
,
get_bits_left
(
&
h
->
gb
)
&
7
)
==
0
))
{
if
((
get_bits_left
(
&
s
->
gb_slice
))
<=
7
)
{
if
(((
get_bits_count
(
&
s
->
gb_slice
)
&
7
)
==
0
||
show_bits
(
&
s
->
gb_slice
,
get_bits_left
(
&
s
->
gb_slice
)
&
7
)
==
0
))
{
if
(
svq3_decode_slice_header
(
avctx
))
return
-
1
;
...
...
@@ -1518,7 +1519,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
/* TODO: support s->mb_skip_run */
}
mb_type
=
svq3_get_ue_golomb
(
&
h
->
gb
);
mb_type
=
svq3_get_ue_golomb
(
&
s
->
gb_slice
);
if
(
s
->
pict_type
==
AV_PICTURE_TYPE_I
)
mb_type
+=
8
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录