eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2026-01-03 21:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

indenting, handle xrun (correctly?), check on out of sync message, solve chroma leak in chained mixing effects

Browse Source
This commit is contained in:
niels
2015-04-20 20:21:16 +02:00
parent bd61413fb5
commit adbab8607a
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
veejay-current/veejay-server/veejay/liblavplayvj.c
View File

@@ -2336,14 +2336,14 @@ static void veejay_playback_cycle(veejay_t * info)
first_free = stats.nsync;
do {
if (settings->state == LAVPLAY_STATE_STOP) {
if (settings->state == LAVPLAY_STATE_STOP) {
goto FINISH;
}
if (!veejay_mjpeg_sync_buf(info, &bs)) {
if (!veejay_mjpeg_sync_buf(info, &bs)) {
veejay_change_state_save(info, LAVPLAY_STATE_STOP);
goto FINISH;
}
}
frame = bs.frame;
@@ -2386,19 +2386,20 @@ static void veejay_playback_cycle(veejay_t * info)
/* Fill and queue free buffers again */
for (n = first_free; n < stats.nsync;) {
/* Audio/Video sync correction */
skipv = 0;
skipa = 0;
skipi = 0;
skipv = 0;
skipa = 0;
skipi = 0;
if (info->sync_correction) {
if (stats.tdiff > settings->spvf) {
skipa = 1;
if (info->sync_ins_frames && current_speed != 0) {
skipi = 1;
}
nvcorr++;
nvcorr++;
stats.num_corrs_a++;
stats.tdiff -= settings->spvf;
}
if (stats.tdiff < -settings->spvf) {
/* Video is behind audio */
skipv = 1;
@@ -2436,23 +2437,23 @@ static void veejay_playback_cycle(veejay_t * info)
vj_perform_queue_video_frame(info,skipi);
if(!skipi)
vj_perform_queue_frame( info, skipi );
vj_perform_queue_frame(info,skipi);
}
#ifdef HAVE_SDL
te = SDL_GetTicks();
info->real_fps = (int)( te - ts );
info->real_fps = (int)( te - ts );
#else
info->real_fps = 0;
#endif
if( (stats.tdiff > settings->spvf || info->real_fps > (1000 * settings->spvf)) && info->audio == AUDIO_PLAY) {
if( (stats.tdiff > settings->spvf || info->real_fps > (1000 * settings->spvf)) && info->real_fps && info->audio == AUDIO_PLAY) {
veejay_msg(VEEJAY_MSG_WARNING, "Rendering audio/video frame takes too long (measured %ld ms, out of sync by %g). Can't keep pace with audio!", stats.tdiff, info->real_fps);
}
if( skipv ) {
continue;
continue;
}
veejay_mjpeg_queue_buf(info,frame, 1 );

4
veejay-current/veejay-server/veejay/vj-perform.c
View File

@@ -1979,7 +1979,7 @@ static void vj_perform_tag_render_chain_entry(veejay_t *info, int chain_entry)
frames[1]->data[0] = frame_buffer[chain_entry]->Y;
frames[1]->data[1] = frame_buffer[chain_entry]->Cb;
frames[1]->data[2] = frame_buffer[chain_entry]->Cr;
frames[1]->ssm = 0;
//frames[1]->ssm = 0;
int done = 0;
int do_ssm = vj_perform_preprocess_has_ssm( info, sub_id, source);
@@ -2218,7 +2218,7 @@ static void vj_perform_render_chain_entry(veejay_t *info, int chain_entry)
frames[1]->data[0] = frame_buffer[chain_entry]->Y;
frames[1]->data[1] = frame_buffer[chain_entry]->Cb;
frames[1]->data[2] = frame_buffer[chain_entry]->Cr;
frames[1]->ssm = 0;
//frames[1]->ssm = 0;
int done = 0;
int do_ssm = vj_perform_preprocess_has_ssm( info, sub_id, source);
if(do_ssm >= 0 ) {