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

Let the muxer deref packets all the time. If there is an error, the packet will be droped.

Browse source
This commit is contained in:
John Törnblom 2012-10-18 17:42:04 +02:00
parent 0d4c30b7da
commit 77a6f4df8d
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dvr/dvr_rec.c
View file

@ -445,8 +445,8 @@ dvr_thread(void *aux)
if(dispatch_clock > de->de_start - (60 * de->de_start_extra)) { if(dispatch_clock > de->de_start - (60 * de->de_start_extra)) {
dvr_rec_set_state(de, DVR_RS_RUNNING, 0); dvr_rec_set_state(de, DVR_RS_RUNNING, 0);
if(!muxer_write_pkt(de->de_mux, sm->sm_data)) muxer_write_pkt(de->de_mux, sm->sm_data);
sm->sm_data = NULL; sm->sm_data = NULL;
} }
break; break;

3
src/dvr/mkmux.c
View file

@ -899,8 +899,7 @@ mk_mux_write_pkt(mk_mux_t *mkm, struct th_pkt *pkt)
mk_write_frame_i(mkm, t, pkt); mk_write_frame_i(mkm, t, pkt);
} }
if(!mkm->error) pkt_ref_dec(pkt);
pkt_ref_dec(pkt);
return mkm->error; return mkm->error;
} }

3
src/muxer_pass.c
View file

@ -231,8 +231,7 @@ pass_muxer_write_pkt(muxer_t *m, void *data)
break; break;
} }
if(!pm->pm_error) pktbuf_ref_dec(pb);
pktbuf_ref_dec(pb);
return pm->pm_error; return pm->pm_error;
} }

5
src/webui/webui.c
View file

@ -199,9 +199,8 @@ http_stream_run(http_connection_t *hc, streaming_queue_t *sq,
switch(sm->sm_type) { switch(sm->sm_type) {
case SMT_MPEGTS: case SMT_MPEGTS:
case SMT_PACKET: case SMT_PACKET:
if(!muxer_write_pkt(mux, sm->sm_data)) muxer_write_pkt(mux, sm->sm_data);
sm->sm_data = NULL; sm->sm_data = NULL;
break; break;
case SMT_START: case SMT_START: