eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-18 05:40:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

video_frames -1 = total_frames

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1033 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2007-12-05 19:35:13 +00:00
parent 379432980f
commit fe81b7e4d5
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
veejay-1.1/veejay-server/veejay/vj-perform.c
View File

@@ -207,7 +207,7 @@ static int vj_perform_increase_tag_frame(veejay_t * info, long num)
} }
return -1; return -1;
} }
if (settings->current_frame_num > settings->max_frame_num) { if (settings->current_frame_num >= settings->max_frame_num) {
settings->current_frame_num = settings->min_frame_num; settings->current_frame_num = settings->min_frame_num;
return -1; return -1;
} }
@@ -236,12 +236,13 @@ static int vj_perform_increase_plain_frame(veejay_t * info, long num)
return 0; return 0;
} }
if (settings->current_frame_num > settings->max_frame_num) { if (settings->current_frame_num >= settings->max_frame_num) {
if(!info->continuous) if(!info->continuous)
{ {
veejay_msg(VEEJAY_MSG_DEBUG, "Reached end of video - Ending veejay session ... "); veejay_msg(VEEJAY_MSG_DEBUG, "Reached end of video - Ending veejay session ... ");
veejay_change_state(info, LAVPLAY_STATE_STOP); veejay_change_state(info, LAVPLAY_STATE_STOP);
} }
settings->current_frame_num = settings->max_frame_num;
return 0; return 0;
} }
return 0; return 0;
@@ -391,8 +392,10 @@ static int vj_perform_increase_sample_frame(veejay_t * info, long num)
int num = end - ((int) ( (double)range*rand()/(RAND_MAX))); int num = end - ((int) ( (double)range*rand()/(RAND_MAX)));
settings->current_frame_num = num; settings->current_frame_num = num;
} }
#ifdef STRICT_CHECKING
if (settings->current_frame_num < start || settings->current_frame_num > end || settings->current_frame_num < 0) { assert( settings->current_frame_num >= 0 );
#endif
if (settings->current_frame_num < start || settings->current_frame_num >= end ) {
switch (looptype) { switch (looptype) {
case 2: case 2:
info->uc->direction = 1; info->uc->direction = 1;
@@ -2748,16 +2751,6 @@ static int vj_perform_render_magic( veejay_t *info, video_playback_setup *settin
//@ Render any subtitles in sample/stream (Leaves FX chain supersampled) //@ Render any subtitles in sample/stream (Leaves FX chain supersampled)
vj_perform_render_font( info, settings ); vj_perform_render_font( info, settings );
//@ record frame before rendering viewport (default)
//if( settings->vp_rec == 0 && pvar_.enc_active )
//{
// vj_perform_record_frame(info );
//}
//@ Render viewport
// if(info->use_vp && info->frontback==0)
// deep = vj_perform_render_viewport( info, settings );
//@ record frame //@ record frame
if( pvar_.enc_active ) if( pvar_.enc_active )
{ {