stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

if reconfiguration of the muxer fails, restart recording to a new file

Browse source
This commit is contained in:
John Törnblom 2012-11-26 11:37:27 +01:00
parent d9b9b26fd9
commit 575f516ad5
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dvr/dvr_rec.c
View file

@ -458,17 +458,25 @@ dvr_thread(void *aux)
break;
case SMT_START:
if(started &&
muxer_reconfigure(de->de_mux, sm->sm_data) < 0) {
tvhlog(LOG_WARNING,
"dvr", "Unable to reconfigure \"%s\"",
de->de_filename ?: lang_str_get(de->de_title, NULL));
// Try to restart the recording if the muxer doesn't
// support reconfiguration of the streams.
dvr_thread_epilog(de);
started = 0;
}
if(!started) {
pthread_mutex_lock(&global_lock);
dvr_rec_set_state(de, DVR_RS_WAIT_PROGRAM_START, 0);
if(dvr_rec_start(de, sm->sm_data) == 0)
started = 1;
pthread_mutex_unlock(&global_lock);
} else if(muxer_reconfigure(de->de_mux, sm->sm_data) < 0) {
tvhlog(LOG_WARNING,
"dvr", "Unable to reconfigure the recording \"%s\"",
de->de_filename ?: lang_str_get(de->de_title, NULL));
}
}
break;
case SMT_STOP:
@ -479,7 +487,6 @@ dvr_thread(void *aux)
// Recording is completed
de->de_last_error = 0;
tvhlog(LOG_INFO,
"dvr", "Recording completed: \"%s\"",
de->de_filename ?: lang_str_get(de->de_title, NULL));