Commit 30c93dea authored by Ilkka Ollakka's avatar Ilkka Ollakka

x264.c: use pf_log to get x264 log messages

parent 860a7e5c
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
*****************************************************************************/ *****************************************************************************/
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close( vlc_object_t * ); static void Close( vlc_object_t * );
static void x264_log( void *, int i_level, const char *psz, va_list );
/* Frame-type options */ /* Frame-type options */
...@@ -1235,6 +1236,8 @@ static int Open ( vlc_object_t *p_this ) ...@@ -1235,6 +1236,8 @@ static int Open ( vlc_object_t *p_this )
p_sys->param.rc.b_stat_read = i_val & 2; p_sys->param.rc.b_stat_read = i_val & 2;
} }
p_sys->param.pf_log = x264_log;
p_sys->param.p_log_private = p_enc;
/* We need to initialize pthreadw32 before we open the encoder, /* We need to initialize pthreadw32 before we open the encoder,
but only once for the whole application. Since pthreadw32 but only once for the whole application. Since pthreadw32
doesn't keep a refcount, do it ourselves. */ doesn't keep a refcount, do it ourselves. */
...@@ -1315,6 +1318,30 @@ static int Open ( vlc_object_t *p_this ) ...@@ -1315,6 +1318,30 @@ static int Open ( vlc_object_t *p_this )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/****************************************************************************
* Logging
****************************************************************************/
static void x264_log( void *data, int i_level, const char *psz, va_list args)
{
encoder_t *p_enc = (encoder_t *)data;
switch( i_level )
{
case X264_LOG_ERROR:
i_level = VLC_MSG_ERR;
break;
case X264_LOG_WARNING:
i_level = VLC_MSG_WARN;
case X264_LOG_INFO:
case X264_LOG_DEBUG:
i_level = VLC_MSG_DBG;
default:
i_level = VLC_MSG_DBG;
}
msg_GenericVa( p_enc, i_level, MODULE_STRING, psz, args );
};
/**************************************************************************** /****************************************************************************
* Encode: * Encode:
****************************************************************************/ ****************************************************************************/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment