vlc | branch: master | Ilkka Ollakka <[email protected]> | Sun Jan 29 13:17:58 2012 +0200| [2b60e75b567d3aa9e980fe099c33ff1a033797dd] | committer: Ilkka Ollakka
transcode: add likely/unlikely in video process > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b60e75b567d3aa9e980fe099c33ff1a033797dd --- modules/stream_out/transcode/video.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c index db115c7..15c4ef4 100644 --- a/modules/stream_out/transcode/video.c +++ b/modules/stream_out/transcode/video.c @@ -579,7 +579,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, picture_t *p_pic, *p_pic2 = NULL; *out = NULL; - if( in == NULL ) + if( unlikely( in == NULL ) ) { if( p_sys->i_threads == 0 ) { @@ -606,7 +606,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, if( p_stream->p_sout->i_out_pace_nocontrol && p_sys->b_hurry_up ) { mtime_t current_date = mdate(); - if( current_date + 50000 > p_pic->date ) + if( unlikely( current_date + 50000 > p_pic->date ) ) { msg_Dbg( p_stream, "late picture skipped (%"PRId64")", current_date + 50000 - p_pic->date ); @@ -622,8 +622,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, mtime_t i_pts; i_pts = date_Get( &id->interpolated_pts ) + 1; - if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT - || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) + if ( unlikely( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT + || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) ) { msg_Dbg( p_stream, "drift is too high, resetting master sync" ); date_Set( &id->interpolated_pts, p_pic->date ); @@ -635,7 +635,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, /* Set the pts of the frame being encoded */ p_pic->date = i_pts; - if( i_video_drift < (i_master_drift - 50000) ) + if( unlikely( i_video_drift < (i_master_drift - 50000) ) ) { #if 0 msg_Dbg( p_stream, "dropping frame (%i)", @@ -644,7 +644,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, picture_Release( p_pic ); continue; } - else if( i_video_drift > (i_master_drift + 50000) ) + else if( unlikely( i_video_drift > (i_master_drift + 50000) ) ) { #if 0 msg_Dbg( p_stream, "adding frame (%i)", @@ -703,16 +703,16 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, { /* We can't modify the picture, we need to duplicate it */ picture_t *p_tmp = video_new_buffer_decoder( id->p_decoder ); - if( p_tmp ) + if( likely( p_tmp ) ) { picture_Copy( p_tmp, p_pic ); picture_Release( p_pic ); p_pic = p_tmp; } } - if( !p_sys->p_spu_blend ) + if( unlikely( !p_sys->p_spu_blend ) ) p_sys->p_spu_blend = filter_NewBlend( VLC_OBJECT( p_sys->p_spu ), &fmt ); - if( p_sys->p_spu_blend ) + if( likely( p_sys->p_spu_blend ) ) picture_BlendSubpicture( p_pic, p_sys->p_spu_blend, p_subpic ); subpicture_Delete( p_subpic ); } @@ -729,8 +729,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, if( p_sys->b_master_sync ) { mtime_t i_pts = date_Get( &id->interpolated_pts ) + 1; - if ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT - || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) + if (unlikely ( p_pic->date - i_pts > MASTER_SYNC_MAX_DRIFT + || p_pic->date - i_pts < -MASTER_SYNC_MAX_DRIFT ) ) { msg_Dbg( p_stream, "drift is too high, resetting master sync" ); date_Set( &id->interpolated_pts, p_pic->date ); @@ -745,7 +745,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, { /* We can't modify the picture, we need to duplicate it */ p_pic2 = video_new_buffer_decoder( id->p_decoder ); - if( p_pic2 != NULL ) + if( unlikely( p_pic2 != NULL ) ) { picture_Copy( p_pic2, p_pic ); p_pic2->date = i_pts; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
