Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
4918f12d
I
ijkplayer
项目概览
qq_25606643
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
4918f12d
编写于
6月 26, 2015
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ff_ffplay: replace ALOG with av_log
上级
eb908554
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
9 deletion
+6
-9
ijkmedia/ijkplayer/ff_ffmsg_queue.h
ijkmedia/ijkplayer/ff_ffmsg_queue.h
+1
-4
ijkmedia/ijkplayer/ijkplayer.c
ijkmedia/ijkplayer/ijkplayer.c
+5
-5
未找到文件。
ijkmedia/ijkplayer/ff_ffmsg_queue.h
浏览文件 @
4918f12d
...
...
@@ -70,13 +70,12 @@ inline static int msg_queue_put_private(MessageQueue *q, AVMessage *msg)
#ifdef FFP_SHOW_MSG_RECYCLE
int
total_count
=
q
->
recycle_count
+
q
->
alloc_count
;
if
(
!
(
total_count
%
10
))
{
ALOGE
(
"msg-recycle
\t
%d +
\t
%d =
\t
%d
\n
"
,
q
->
recycle_count
,
q
->
alloc_count
,
total_count
);
av_log
(
NULL
,
AV_LOG_DEBUG
,
"msg-recycle
\t
%d +
\t
%d =
\t
%d
\n
"
,
q
->
recycle_count
,
q
->
alloc_count
,
total_count
);
}
#endif
#endif
if
(
!
msg1
)
return
-
1
;
// ALOGE("msg-recycle %d, %d, %d\n", msg->what, msg->arg1, msg->arg2);
*
msg1
=
*
msg
;
msg1
->
next
=
NULL
;
...
...
@@ -253,7 +252,6 @@ inline static void msg_queue_remove(MessageQueue *q, int what)
msg
=
*
p_msg
;
if
(
msg
->
what
==
what
)
{
// ALOGE("remove msg %d", msg->what);
*
p_msg
=
msg
->
next
;
p_msg
=
&
msg
->
next
;
#ifdef FFP_MERGE
...
...
@@ -263,7 +261,6 @@ inline static void msg_queue_remove(MessageQueue *q, int what)
q
->
recycle_msg
=
msg
;
#endif
}
else
{
// ALOGE("retain msg %d", msg->what);
last_msg
=
msg
;
p_msg
=
&
msg
->
next
;
}
...
...
ijkmedia/ijkplayer/ijkplayer.c
浏览文件 @
4918f12d
...
...
@@ -656,7 +656,7 @@ int ijkmp_get_msg(IjkMediaPlayer *mp, AVMessage *msg, int block)
ijkmp_change_state_l
(
mp
,
MP_STATE_PREPARED
);
}
else
{
// FIXME: 1: onError() ?
ALOGE
(
"FFP_MSG_PREPARED: expecting mp_state==MP_STATE_ASYNC_PREPARING
\n
"
);
av_log
(
mp
->
ffplayer
,
AV_LOG_DEBUG
,
"FFP_MSG_PREPARED: expecting mp_state==MP_STATE_ASYNC_PREPARING
\n
"
);
}
if
(
ffp_is_paused_l
(
mp
->
ffplayer
))
{
ijkmp_change_state_l
(
mp
,
MP_STATE_PAUSED
);
...
...
@@ -690,19 +690,19 @@ int ijkmp_get_msg(IjkMediaPlayer *mp, AVMessage *msg, int block)
// FIXME: 8 check seekable
if
(
mp
->
mp_state
==
MP_STATE_COMPLETED
)
{
if
(
mp
->
restart_from_beginning
)
{
ALOGD
(
"ijkmp_get_msg: FFP_REQ_START: restart from beginning
\n
"
);
av_log
(
mp
->
ffplayer
,
AV_LOG_DEBUG
,
"ijkmp_get_msg: FFP_REQ_START: restart from beginning
\n
"
);
retval
=
ffp_start_from_l
(
mp
->
ffplayer
,
0
);
if
(
retval
==
0
)
ijkmp_change_state_l
(
mp
,
MP_STATE_STARTED
);
}
else
{
ALOGD
(
"ijkmp_get_msg: FFP_REQ_START: restart from seek pos
\n
"
);
av_log
(
mp
->
ffplayer
,
AV_LOG_DEBUG
,
"ijkmp_get_msg: FFP_REQ_START: restart from seek pos
\n
"
);
retval
=
ffp_start_l
(
mp
->
ffplayer
);
if
(
retval
==
0
)
ijkmp_change_state_l
(
mp
,
MP_STATE_STARTED
);
}
mp
->
restart_from_beginning
=
0
;
}
else
{
ALOGD
(
"ijkmp_get_msg: FFP_REQ_START: start on fly
\n
"
);
av_log
(
mp
->
ffplayer
,
AV_LOG_DEBUG
,
"ijkmp_get_msg: FFP_REQ_START: start on fly
\n
"
);
retval
=
ffp_start_l
(
mp
->
ffplayer
);
if
(
retval
==
0
)
ijkmp_change_state_l
(
mp
,
MP_STATE_STARTED
);
...
...
@@ -730,7 +730,7 @@ int ijkmp_get_msg(IjkMediaPlayer *mp, AVMessage *msg, int block)
pthread_mutex_lock
(
&
mp
->
mutex
);
if
(
0
==
ikjmp_chkst_seek_l
(
mp
->
mp_state
))
{
if
(
0
==
ffp_seek_to_l
(
mp
->
ffplayer
,
msg
->
arg1
))
{
ALOGD
(
"ijkmp_get_msg: FFP_REQ_SEEK: seek to %d
\n
"
,
(
int
)
msg
->
arg1
);
av_log
(
mp
->
ffplayer
,
AV_LOG_DEBUG
,
"ijkmp_get_msg: FFP_REQ_SEEK: seek to %d
\n
"
,
(
int
)
msg
->
arg1
);
mp
->
restart_from_beginning
=
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录