Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
3574a85c
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,发现更多精彩内容 >>
提交
3574a85c
编写于
3月 04, 2012
作者:
A
Alex Converse
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace computations of remaining bits with calls to get_bits_left().
上级
b70feb40
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
18 addition
and
19 deletion
+18
-19
libavcodec/escape124.c
libavcodec/escape124.c
+1
-1
libavcodec/h261dec.c
libavcodec/h261dec.c
+1
-1
libavcodec/h263dec.c
libavcodec/h263dec.c
+1
-1
libavcodec/h264.c
libavcodec/h264.c
+3
-3
libavcodec/h264_ps.c
libavcodec/h264_ps.c
+2
-2
libavcodec/h264_sei.c
libavcodec/h264_sei.c
+1
-1
libavcodec/huffyuv.c
libavcodec/huffyuv.c
+2
-2
libavcodec/ituh263dec.c
libavcodec/ituh263dec.c
+2
-2
libavcodec/mjpegdec.c
libavcodec/mjpegdec.c
+4
-5
libavcodec/vp6.c
libavcodec/vp6.c
+1
-1
未找到文件。
libavcodec/escape124.c
浏览文件 @
3574a85c
...
...
@@ -49,7 +49,7 @@ typedef struct Escape124Context {
}
Escape124Context
;
static
int
can_safely_read
(
GetBitContext
*
gb
,
int
bits
)
{
return
get_bits_
count
(
gb
)
+
bits
<=
gb
->
size_in_
bits
;
return
get_bits_
left
(
gb
)
>=
bits
;
}
/**
...
...
libavcodec/h261dec.c
浏览文件 @
3574a85c
...
...
@@ -265,7 +265,7 @@ static int h261_decode_mb(H261Context *h){
while
(
h
->
mba_diff
==
MBA_STUFFING
);
// stuffing
if
(
h
->
mba_diff
<
0
){
if
(
get_bits_count
(
&
s
->
gb
)
+
7
>=
s
->
gb
.
size_in_bits
)
if
(
get_bits_left
(
&
s
->
gb
)
<=
7
)
return
SLICE_END
;
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"illegal mba at %d %d
\n
"
,
s
->
mb_x
,
s
->
mb_y
);
...
...
libavcodec/h263dec.c
浏览文件 @
3574a85c
...
...
@@ -650,7 +650,7 @@ retry:
ret
=
decode_slice
(
s
);
while
(
s
->
mb_y
<
s
->
mb_height
){
if
(
s
->
msmpeg4_version
){
if
(
s
->
slice_height
==
0
||
s
->
mb_x
!=
0
||
(
s
->
mb_y
%
s
->
slice_height
)
!=
0
||
get_bits_
count
(
&
s
->
gb
)
>
s
->
gb
.
size_in_bits
)
if
(
s
->
slice_height
==
0
||
s
->
mb_x
!=
0
||
(
s
->
mb_y
%
s
->
slice_height
)
!=
0
||
get_bits_
left
(
&
s
->
gb
)
<
0
)
break
;
}
else
{
int
prev_x
=
s
->
mb_x
,
prev_y
=
s
->
mb_y
;
...
...
libavcodec/h264.c
浏览文件 @
3574a85c
...
...
@@ -3667,7 +3667,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
if
(
s
->
mb_y
>=
s
->
mb_height
){
tprintf
(
s
->
avctx
,
"slice end %d %d
\n
"
,
get_bits_count
(
&
s
->
gb
),
s
->
gb
.
size_in_bits
);
if
(
get_bits_count
(
&
s
->
gb
)
==
s
->
gb
.
size_in_bits
)
{
if
(
get_bits_left
(
&
s
->
gb
)
==
0
)
{
ff_er_add_slice
(
s
,
s
->
resync_mb_x
,
s
->
resync_mb_y
,
s
->
mb_x
-
1
,
s
->
mb_y
,
ER_MB_END
&
part_mask
);
return
0
;
...
...
@@ -3679,9 +3679,9 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
}
}
if
(
get_bits_count
(
&
s
->
gb
)
>=
s
->
gb
.
size_in_bits
&&
s
->
mb_skip_run
<=
0
){
if
(
get_bits_left
(
&
s
->
gb
)
<=
0
&&
s
->
mb_skip_run
<=
0
){
tprintf
(
s
->
avctx
,
"slice end %d %d
\n
"
,
get_bits_count
(
&
s
->
gb
),
s
->
gb
.
size_in_bits
);
if
(
get_bits_count
(
&
s
->
gb
)
==
s
->
gb
.
size_in_bits
)
{
if
(
get_bits_left
(
&
s
->
gb
)
==
0
)
{
ff_er_add_slice
(
s
,
s
->
resync_mb_x
,
s
->
resync_mb_y
,
s
->
mb_x
-
1
,
s
->
mb_y
,
ER_MB_END
&
part_mask
);
if
(
s
->
mb_x
>
lf_x_start
)
loop_filter
(
h
,
lf_x_start
,
s
->
mb_x
);
...
...
libavcodec/h264_ps.c
浏览文件 @
3574a85c
...
...
@@ -227,8 +227,8 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
sps
->
num_reorder_frames
=
get_ue_golomb
(
&
s
->
gb
);
get_ue_golomb
(
&
s
->
gb
);
/*max_dec_frame_buffering*/
if
(
s
->
gb
.
size_in_bits
<
get_bits_count
(
&
s
->
gb
))
{
av_log
(
h
->
s
.
avctx
,
AV_LOG_ERROR
,
"Overread VUI by %d bits
\n
"
,
get_bits_count
(
&
s
->
gb
)
-
s
->
gb
.
size_in_bits
);
if
(
get_bits_left
(
&
s
->
gb
)
<
0
)
{
av_log
(
h
->
s
.
avctx
,
AV_LOG_ERROR
,
"Overread VUI by %d bits
\n
"
,
-
get_bits_left
(
&
s
->
gb
)
);
sps
->
num_reorder_frames
=
0
;
sps
->
bitstream_restriction_flag
=
0
;
}
...
...
libavcodec/h264_sei.c
浏览文件 @
3574a85c
...
...
@@ -164,7 +164,7 @@ static int decode_buffering_period(H264Context *h){
int
ff_h264_decode_sei
(
H264Context
*
h
){
MpegEncContext
*
const
s
=
&
h
->
s
;
while
(
get_bits_count
(
&
s
->
gb
)
+
16
<
s
->
gb
.
size_in_bits
)
{
while
(
get_bits_left
(
&
s
->
gb
)
>
16
)
{
int
size
,
type
;
type
=
0
;
...
...
libavcodec/huffyuv.c
浏览文件 @
3574a85c
...
...
@@ -718,7 +718,7 @@ static void decode_422_bitstream(HYuvContext *s, int count){
count
/=
2
;
if
(
count
>=
(
get_bits_left
(
&
s
->
gb
))
/
(
31
*
4
)){
for
(
i
=
0
;
i
<
count
&&
get_bits_count
(
&
s
->
gb
)
<
s
->
gb
.
size_in_bits
;
i
++
)
{
for
(
i
=
0
;
i
<
count
&&
get_bits_left
(
&
s
->
gb
)
>
0
;
i
++
)
{
READ_2PIX
(
s
->
temp
[
0
][
2
*
i
],
s
->
temp
[
1
][
i
],
1
);
READ_2PIX
(
s
->
temp
[
0
][
2
*
i
+
1
],
s
->
temp
[
2
][
i
],
2
);
}
...
...
@@ -736,7 +736,7 @@ static void decode_gray_bitstream(HYuvContext *s, int count){
count
/=
2
;
if
(
count
>=
(
get_bits_left
(
&
s
->
gb
))
/
(
31
*
2
)){
for
(
i
=
0
;
i
<
count
&&
get_bits_count
(
&
s
->
gb
)
<
s
->
gb
.
size_in_bits
;
i
++
)
{
for
(
i
=
0
;
i
<
count
&&
get_bits_left
(
&
s
->
gb
)
>
0
;
i
++
)
{
READ_2PIX
(
s
->
temp
[
0
][
2
*
i
],
s
->
temp
[
0
][
2
*
i
+
1
],
0
);
}
}
else
{
...
...
libavcodec/ituh263dec.c
浏览文件 @
3574a85c
...
...
@@ -852,8 +852,8 @@ end:
{
int
v
=
show_bits
(
&
s
->
gb
,
16
);
if
(
get_bits_count
(
&
s
->
gb
)
+
16
>
s
->
gb
.
size_in_bits
)
{
v
>>=
get_bits_count
(
&
s
->
gb
)
+
16
-
s
->
gb
.
size_in_bits
;
if
(
get_bits_left
(
&
s
->
gb
)
<
16
)
{
v
>>=
16
-
get_bits_left
(
&
s
->
gb
)
;
}
if
(
v
==
0
)
...
...
libavcodec/mjpegdec.c
浏览文件 @
3574a85c
...
...
@@ -854,9 +854,9 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
if
(
s
->
restart_interval
&&
!
s
->
restart_count
)
s
->
restart_count
=
s
->
restart_interval
;
if
(
get_bits_
count
(
&
s
->
gb
)
>
s
->
gb
.
size_in_bits
)
{
if
(
get_bits_
left
(
&
s
->
gb
)
<
0
)
{
av_log
(
s
->
avctx
,
AV_LOG_ERROR
,
"overread %d
\n
"
,
get_bits_count
(
&
s
->
gb
)
-
s
->
gb
.
size_in_bits
);
-
get_bits_left
(
&
s
->
gb
)
);
return
-
1
;
}
for
(
i
=
0
;
i
<
nb_components
;
i
++
)
{
...
...
@@ -1147,7 +1147,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
len
=
get_bits
(
&
s
->
gb
,
16
);
if
(
len
<
5
)
return
-
1
;
if
(
8
*
len
+
get_bits_count
(
&
s
->
gb
)
>
s
->
gb
.
size_in_bits
)
if
(
8
*
len
>
get_bits_left
(
&
s
->
gb
)
)
return
-
1
;
id
=
get_bits_long
(
&
s
->
gb
,
32
);
...
...
@@ -1288,8 +1288,7 @@ out:
static
int
mjpeg_decode_com
(
MJpegDecodeContext
*
s
)
{
int
len
=
get_bits
(
&
s
->
gb
,
16
);
if
(
len
>=
2
&&
8
*
len
-
16
+
get_bits_count
(
&
s
->
gb
)
<=
s
->
gb
.
size_in_bits
)
{
if
(
len
>=
2
&&
8
*
len
-
16
<=
get_bits_left
(
&
s
->
gb
))
{
char
*
cbuf
=
av_malloc
(
len
-
1
);
if
(
cbuf
)
{
int
i
;
...
...
libavcodec/vp6.c
浏览文件 @
3574a85c
...
...
@@ -387,7 +387,7 @@ static void vp6_parse_coeff_huffman(VP56Context *s)
if
(
coeff_idx
)
break
;
}
else
{
if
(
get_bits_
count
(
&
s
->
gb
)
>=
s
->
gb
.
size_in_bits
)
if
(
get_bits_
left
(
&
s
->
gb
)
<=
0
)
return
;
coeff
=
get_vlc2
(
&
s
->
gb
,
vlc_coeff
->
table
,
9
,
3
);
if
(
coeff
==
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录