mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

use new for buf, fix possible memlaek

Browse Source
This commit is contained in:
satbaby
2012-09-18 18:38:03 +02:00
parent ca748c6f48
commit a84ba36e0b
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/streaminfo2.cpp
View File

@@ -776,8 +776,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
/*
* some definition
*/
#define TS_LEN 188
#define TS_BUF_SIZE (TS_LEN * 2048) /* fix dmx buffer size */
static unsigned long timeval_to_ms (const struct timeval *tv)
{
@@ -789,7 +787,6 @@ long delta_time_ms (struct timeval *tv, struct timeval *last_tv)
return timeval_to_ms (tv) - timeval_to_ms (last_tv);
}
uint64_t b_total;
static cDemux * dmx;
int CStreamInfo2::ts_setup ()
@@ -804,13 +801,22 @@ int CStreamInfo2::ts_setup ()
if( !g_RemoteControl->current_PIDs.APIDs.empty() )
apid = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid;
short ret = -1;
if(vpid == 0 && apid == 0)
return -1;
return ret;
dmx = new cDemux(0);
if(!dmx)
return -1;
return ret;
#define TS_LEN 188
#define TS_BUF_SIZE (TS_LEN * 2048) /* fix dmx buffer size */
dmxbuf = new unsigned char[TS_BUF_SIZE];
if(!dmxbuf){
delete dmx;
dmx = NULL;
return ret;
}
dmx->Open(DMX_TP_CHANNEL, NULL, 3 * 3008 * 62);
if(vpid > 0) {
@@ -825,8 +831,8 @@ int CStreamInfo2::ts_setup ()
gettimeofday (&first_tv, NULL);
last_tv.tv_sec = first_tv.tv_sec;
last_tv.tv_usec = first_tv.tv_usec;
b_total = 0;
return 0;
ret = b_total = 0;
return ret;
}
int CStreamInfo2::update_rate ()
@@ -834,8 +840,6 @@ int CStreamInfo2::update_rate ()
if(!dmx)
return 0;
unsigned char buf[TS_BUF_SIZE] = {0};
long b = 0;
int ret = 0;
@@ -843,7 +847,7 @@ int CStreamInfo2::update_rate ()
int timeout = 100;
b_len = dmx->Read(buf, sizeof (buf), timeout);
b_len = dmx->Read(dmxbuf, TS_BUF_SIZE, timeout);
//printf("ts: read %d\n", b_len);
b = b_len;
@@ -881,6 +885,9 @@ int CStreamInfo2::ts_close ()
if(dmx)
delete dmx;
dmx = NULL;
if(dmxbuf)
delete [] dmxbuf;
dmxbuf = NULL;
return 0;
}