ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete packet_lock if failed trylock

This commit is contained in:
Isaac Connor 2021-03-30 16:14:38 -04:00
parent 649f7906de
commit a1364a2b2b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/zm_packetqueue.cpp
View File

@ -42,16 +42,16 @@ PacketQueue::PacketQueue():
*/ */
int PacketQueue::addStream() { int PacketQueue::addStream() {
deleting = false; deleting = false;
if ( max_stream_id == -1 ) { if (max_stream_id == -1) {
video_stream_id = 0; video_stream_id = 0;
max_stream_id = 0; max_stream_id = 0;
} else { } else {
max_stream_id ++; max_stream_id ++;
} }
if ( packet_counts ) delete[] packet_counts; if (packet_counts) delete[] packet_counts;
packet_counts = new int[max_stream_id+1]; packet_counts = new int[max_stream_id+1];
for ( int i=0; i <= max_stream_id; ++i ) for (int i=0; i <= max_stream_id; ++i)
packet_counts[i] = 0; packet_counts[i] = 0;
return max_stream_id; return max_stream_id;
} }
@ -98,7 +98,7 @@ bool PacketQueue::queuePacket(ZMPacket* add_packet) {
ZMLockedPacket *lp = new ZMLockedPacket(zm_packet); ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
if (!lp->trylock()) { if (!lp->trylock()) {
Debug(1, "Found locked packet when trying to free up video packets. Can't continue"); Debug(1, "Found locked packet when trying to free up video packets. Can't continue");
//delete lp; delete lp;
break; break;
} }
delete lp; delete lp;
@ -539,10 +539,11 @@ ZMLockedPacket *PacketQueue::get_packet(packetqueue_iterator *it) {
Debug(4, "get_packet using it %p queue end? %d, packet %p", Debug(4, "get_packet using it %p queue end? %d, packet %p",
*it, (*it == pktQueue.end()), *(*it)); *it, (*it == pktQueue.end()), *(*it));
ZMPacket *p = *(*it); ZMPacket *p = *(*it);
if ( !p ) { if (!p) {
Error("Null p?!"); Error("Null p?!");
return nullptr; return nullptr;
} }
ZMLockedPacket *lp = new ZMLockedPacket(p); ZMLockedPacket *lp = new ZMLockedPacket(p);
Debug(3, "get_packet %p image_index: %d, about to lock packet", p, p->image_index); Debug(3, "get_packet %p image_index: %d, about to lock packet", p, p->image_index);
while (!(zm_terminate or deleting) and !lp->trylock()) { while (!(zm_terminate or deleting) and !lp->trylock()) {