提交 4918f12d 编写于 作者: Z Zhang Rui

ff_ffplay: replace ALOG with av_log

上级 eb908554
......@@ -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;
}
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册