Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
199c18a7
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,发现更多精彩内容 >>
提交
199c18a7
编写于
1月 16, 2011
作者:
S
Stefano Sabatini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix weird indent in get_video_frame().
Originally committed as revision 26390 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
df17f6d5
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
39 addition
and
39 deletion
+39
-39
ffplay.c
ffplay.c
+39
-39
未找到文件。
ffplay.c
浏览文件 @
199c18a7
...
...
@@ -1543,53 +1543,53 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
{
int
len1
,
got_picture
,
i
;
if
(
packet_queue_get
(
&
is
->
videoq
,
pkt
,
1
)
<
0
)
return
-
1
;
if
(
pkt
->
data
==
flush_pkt
.
data
){
avcodec_flush_buffers
(
is
->
video_st
->
codec
);
if
(
packet_queue_get
(
&
is
->
videoq
,
pkt
,
1
)
<
0
)
return
-
1
;
SDL_LockMutex
(
is
->
pictq_mutex
);
//Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
for
(
i
=
0
;
i
<
VIDEO_PICTURE_QUEUE_SIZE
;
i
++
){
is
->
pictq
[
i
].
target_clock
=
0
;
}
while
(
is
->
pictq_size
&&
!
is
->
videoq
.
abort_request
)
{
SDL_CondWait
(
is
->
pictq_cond
,
is
->
pictq_mutex
);
}
is
->
video_current_pos
=
-
1
;
SDL_UnlockMutex
(
is
->
pictq_mutex
);
if
(
pkt
->
data
==
flush_pkt
.
data
)
{
avcodec_flush_buffers
(
is
->
video_st
->
codec
);
init_pts_correction
(
&
is
->
pts_ctx
);
is
->
frame_last_pts
=
AV_NOPTS_VALUE
;
is
->
frame_last_delay
=
0
;
is
->
frame_timer
=
(
double
)
av_gettime
()
/
1000000
.
0
;
is
->
skip_frames
=
1
;
is
->
skip_frames_index
=
0
;
return
0
;
SDL_LockMutex
(
is
->
pictq_mutex
);
//Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
for
(
i
=
0
;
i
<
VIDEO_PICTURE_QUEUE_SIZE
;
i
++
)
{
is
->
pictq
[
i
].
target_clock
=
0
;
}
while
(
is
->
pictq_size
&&
!
is
->
videoq
.
abort_request
)
{
SDL_CondWait
(
is
->
pictq_cond
,
is
->
pictq_mutex
);
}
is
->
video_current_pos
=
-
1
;
SDL_UnlockMutex
(
is
->
pictq_mutex
);
/* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */
is
->
video_st
->
codec
->
reordered_opaque
=
pkt
->
pts
;
len1
=
avcodec_decode_video2
(
is
->
video_st
->
codec
,
frame
,
&
got_picture
,
pkt
);
init_pts_correction
(
&
is
->
pts_ctx
);
is
->
frame_last_pts
=
AV_NOPTS_VALUE
;
is
->
frame_last_delay
=
0
;
is
->
frame_timer
=
(
double
)
av_gettime
()
/
1000000
.
0
;
is
->
skip_frames
=
1
;
is
->
skip_frames_index
=
0
;
return
0
;
}
if
(
got_picture
)
{
if
(
decoder_reorder_pts
==
-
1
)
{
*
pts
=
guess_correct_pts
(
&
is
->
pts_ctx
,
frame
->
reordered_opaque
,
pkt
->
dts
);
}
else
if
(
decoder_reorder_pts
)
{
*
pts
=
frame
->
reordered_opaque
;
}
else
{
*
pts
=
pkt
->
dts
;
}
/* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */
is
->
video_st
->
codec
->
reordered_opaque
=
pkt
->
pts
;
len1
=
avcodec_decode_video2
(
is
->
video_st
->
codec
,
frame
,
&
got_picture
,
pkt
);
if
(
*
pts
==
AV_NOPTS_VALUE
)
{
*
pts
=
0
;
}
if
(
got_picture
)
{
if
(
decoder_reorder_pts
==
-
1
)
{
*
pts
=
guess_correct_pts
(
&
is
->
pts_ctx
,
frame
->
reordered_opaque
,
pkt
->
dts
);
}
else
if
(
decoder_reorder_pts
)
{
*
pts
=
frame
->
reordered_opaque
;
}
else
{
*
pts
=
pkt
->
dts
;
}
if
(
*
pts
==
AV_NOPTS_VALUE
)
{
*
pts
=
0
;
}
}
// if (len1 < 0)
// break;
if
(
got_picture
){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录