Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
256299d3
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,发现更多精彩内容 >>
提交
256299d3
编写于
4月 12, 2009
作者:
M
Michael Niedermayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Factorize field_end() out.
Originally committed as revision 18472 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
7824b129
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
46 addition
and
40 deletion
+46
-40
libavcodec/h264.c
libavcodec/h264.c
+46
-40
未找到文件。
libavcodec/h264.c
浏览文件 @
256299d3
...
...
@@ -3614,6 +3614,51 @@ static void init_scan_tables(H264Context *h){
}
}
static
void
field_end
(
H264Context
*
h
){
MpegEncContext
*
const
s
=
&
h
->
s
;
AVCodecContext
*
const
avctx
=
s
->
avctx
;
s
->
mb_y
=
0
;
s
->
current_picture_ptr
->
qscale_type
=
FF_QSCALE_TYPE_H264
;
s
->
current_picture_ptr
->
pict_type
=
s
->
pict_type
;
if
(
CONFIG_H264_VDPAU_DECODER
&&
s
->
avctx
->
codec
->
capabilities
&
CODEC_CAP_HWACCEL_VDPAU
)
ff_vdpau_h264_set_reference_frames
(
s
);
if
(
!
s
->
dropable
)
{
execute_ref_pic_marking
(
h
,
h
->
mmco
,
h
->
mmco_index
);
h
->
prev_poc_msb
=
h
->
poc_msb
;
h
->
prev_poc_lsb
=
h
->
poc_lsb
;
}
h
->
prev_frame_num_offset
=
h
->
frame_num_offset
;
h
->
prev_frame_num
=
h
->
frame_num
;
if
(
avctx
->
hwaccel
)
{
if
(
avctx
->
hwaccel
->
end_frame
(
avctx
)
<
0
)
av_log
(
avctx
,
AV_LOG_ERROR
,
"hardware accelerator failed to decode picture
\n
"
);
}
if
(
CONFIG_H264_VDPAU_DECODER
&&
s
->
avctx
->
codec
->
capabilities
&
CODEC_CAP_HWACCEL_VDPAU
)
ff_vdpau_h264_picture_complete
(
s
);
/*
* FIXME: Error handling code does not seem to support interlaced
* when slices span multiple rows
* The ff_er_add_slice calls don't work right for bottom
* fields; they cause massive erroneous error concealing
* Error marking covers both fields (top and bottom).
* This causes a mismatched s->error_count
* and a bad error table. Further, the error count goes to
* INT_MAX when called for bottom field, because mb_y is
* past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too.
*/
if
(
!
FIELD_PICTURE
)
ff_er_frame_end
(
s
);
MPV_frame_end
(
s
);
}
/**
* Replicates H264 "master" context to thread contexts.
*/
...
...
@@ -7719,46 +7764,7 @@ static int decode_frame(AVCodecContext *avctx,
Picture
*
cur
=
s
->
current_picture_ptr
;
int
i
,
pics
,
cross_idr
,
out_of_order
,
out_idx
;
s
->
mb_y
=
0
;
s
->
current_picture_ptr
->
qscale_type
=
FF_QSCALE_TYPE_H264
;
s
->
current_picture_ptr
->
pict_type
=
s
->
pict_type
;
if
(
CONFIG_H264_VDPAU_DECODER
&&
s
->
avctx
->
codec
->
capabilities
&
CODEC_CAP_HWACCEL_VDPAU
)
ff_vdpau_h264_set_reference_frames
(
s
);
if
(
!
s
->
dropable
)
{
execute_ref_pic_marking
(
h
,
h
->
mmco
,
h
->
mmco_index
);
h
->
prev_poc_msb
=
h
->
poc_msb
;
h
->
prev_poc_lsb
=
h
->
poc_lsb
;
}
h
->
prev_frame_num_offset
=
h
->
frame_num_offset
;
h
->
prev_frame_num
=
h
->
frame_num
;
if
(
avctx
->
hwaccel
)
{
if
(
avctx
->
hwaccel
->
end_frame
(
avctx
)
<
0
)
av_log
(
avctx
,
AV_LOG_ERROR
,
"hardware accelerator failed to decode picture
\n
"
);
}
if
(
CONFIG_H264_VDPAU_DECODER
&&
s
->
avctx
->
codec
->
capabilities
&
CODEC_CAP_HWACCEL_VDPAU
)
ff_vdpau_h264_picture_complete
(
s
);
/*
* FIXME: Error handling code does not seem to support interlaced
* when slices span multiple rows
* The ff_er_add_slice calls don't work right for bottom
* fields; they cause massive erroneous error concealing
* Error marking covers both fields (top and bottom).
* This causes a mismatched s->error_count
* and a bad error table. Further, the error count goes to
* INT_MAX when called for bottom field, because mb_y is
* past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too.
*/
if
(
!
FIELD_PICTURE
)
ff_er_frame_end
(
s
);
MPV_frame_end
(
s
);
field_end
(
h
);
if
(
cur
->
field_poc
[
0
]
==
INT_MAX
||
cur
->
field_poc
[
1
]
==
INT_MAX
)
{
/* Wait for second field. */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录