Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
NotesChapter
ijkplayer
提交
eb742679
I
ijkplayer
项目概览
NotesChapter
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
ijkplayer
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eb742679
编写于
12月 28, 2015
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ff_ffplay: continue statistic after EOF
上级
a0ba47c5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
15 deletion
+25
-15
ijkmedia/ijkplayer/ff_ffplay.c
ijkmedia/ijkplayer/ff_ffplay.c
+24
-15
ijkmedia/ijkplayer/ff_ffplay.h
ijkmedia/ijkplayer/ff_ffplay.h
+1
-0
未找到文件。
ijkmedia/ijkplayer/ff_ffplay.c
浏览文件 @
eb742679
...
...
@@ -2758,6 +2758,7 @@ static int read_thread(void *arg)
ret
=
AVERROR_EOF
;
goto
fail
;
}
else
{
ffp_statistic_l
(
ffp
);
if
(
completed
)
{
av_log
(
ffp
,
AV_LOG_INFO
,
"ffp_toggle_buffering: eof
\n
"
);
SDL_LockMutex
(
wait_mutex
);
...
...
@@ -2841,6 +2842,7 @@ static int read_thread(void *arg)
SDL_LockMutex
(
wait_mutex
);
SDL_CondWaitTimeout
(
is
->
continue_read_thread
,
wait_mutex
,
10
);
SDL_UnlockMutex
(
wait_mutex
);
ffp_statistic_l
(
ffp
);
continue
;
}
else
{
is
->
eof
=
0
;
...
...
@@ -2881,21 +2883,7 @@ static int read_thread(void *arg)
av_free_packet
(
pkt
);
}
ffp
->
stat
.
video_cached_bytes
=
is
->
videoq
.
size
;
ffp
->
stat
.
audio_cached_bytes
=
is
->
audioq
.
size
;
ffp
->
stat
.
video_cached_packets
=
is
->
videoq
.
nb_packets
;
ffp
->
stat
.
audio_cached_packets
=
is
->
audioq
.
nb_packets
;
if
(
is
->
video_st
&&
is
->
video_st
->
time_base
.
den
>
0
&&
is
->
video_st
->
time_base
.
num
>
0
)
{
ffp
->
stat
.
video_cached_duration
=
is
->
videoq
.
duration
*
av_q2d
(
is
->
video_st
->
time_base
)
*
1000
;
}
if
(
is
->
audio_st
&&
is
->
audio_st
->
time_base
.
den
>
0
&&
is
->
audio_st
->
time_base
.
num
>
0
)
{
ffp
->
stat
.
audio_cached_duration
=
is
->
audioq
.
duration
*
av_q2d
(
is
->
audio_st
->
time_base
)
*
1000
;
}
ffp_statistic_l
(
ffp
);
if
(
ffp
->
packet_buffering
)
{
io_tick_counter
=
SDL_GetTickHR
();
...
...
@@ -3699,6 +3687,27 @@ void ffp_toggle_buffering(FFPlayer *ffp, int start_buffering)
SDL_UnlockMutex
(
ffp
->
is
->
play_mutex
);
}
void
ffp_statistic_l
(
FFPlayer
*
ffp
)
{
VideoState
*
is
=
ffp
->
is
;
ffp
->
stat
.
video_cached_bytes
=
is
->
videoq
.
size
;
ffp
->
stat
.
audio_cached_bytes
=
is
->
audioq
.
size
;
ffp
->
stat
.
video_cached_packets
=
is
->
videoq
.
nb_packets
;
ffp
->
stat
.
audio_cached_packets
=
is
->
audioq
.
nb_packets
;
if
(
is
->
video_st
&&
is
->
video_st
->
time_base
.
den
>
0
&&
is
->
video_st
->
time_base
.
num
>
0
)
{
ffp
->
stat
.
video_cached_duration
=
is
->
videoq
.
duration
*
av_q2d
(
is
->
video_st
->
time_base
)
*
1000
;
}
if
(
is
->
audio_st
&&
is
->
audio_st
->
time_base
.
den
>
0
&&
is
->
audio_st
->
time_base
.
num
>
0
)
{
ffp
->
stat
.
audio_cached_duration
=
is
->
audioq
.
duration
*
av_q2d
(
is
->
audio_st
->
time_base
)
*
1000
;
}
}
void
ffp_check_buffering_l
(
FFPlayer
*
ffp
)
{
VideoState
*
is
=
ffp
->
is
;
...
...
ijkmedia/ijkplayer/ff_ffplay.h
浏览文件 @
eb742679
...
...
@@ -91,6 +91,7 @@ double ffp_get_master_clock(VideoState *is);
void
ffp_toggle_buffering_l
(
FFPlayer
*
ffp
,
int
start_buffering
);
void
ffp_toggle_buffering
(
FFPlayer
*
ffp
,
int
start_buffering
);
void
ffp_check_buffering_l
(
FFPlayer
*
ffp
);
void
ffp_statistic_l
(
FFPlayer
*
ffp
);
int
ffp_video_thread
(
FFPlayer
*
ffp
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录