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

Use new get_packet_and_increment_it in decoder. Adjust some debugging levels

This commit is contained in:
Isaac Connor 2021-06-03 18:22:12 -04:00
parent a903ab5d09
commit 85b35cf82c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zm_monitor.cpp
View File

@ -2591,10 +2591,9 @@ int Monitor::Capture() {
} // end Monitor::Capture } // end Monitor::Capture
bool Monitor::Decode() { bool Monitor::Decode() {
ZMLockedPacket *packet_lock = packetqueue.get_packet(decoder_it); ZMLockedPacket *packet_lock = packetqueue.get_packet_and_increment_it(decoder_it);
if (!packet_lock) return false; if (!packet_lock) return false;
std::shared_ptr<ZMPacket> packet = packet_lock->packet_; std::shared_ptr<ZMPacket> packet = packet_lock->packet_;
packetqueue.increment_it(decoder_it);
if (packet->codec_type != AVMEDIA_TYPE_VIDEO) { if (packet->codec_type != AVMEDIA_TYPE_VIDEO) {
Debug(4, "Not video"); Debug(4, "Not video");
packetqueue.unlock(packet_lock); packetqueue.unlock(packet_lock);
@ -2644,13 +2643,16 @@ bool Monitor::Decode() {
delete packet->image; delete packet->image;
packet->image = nullptr; packet->image = nullptr;
} }
Debug(1, "Done assigning about to unref");
av_frame_unref(dest_frame); av_frame_unref(dest_frame);
Debug(1, "Done assigning onde to unref");
} // end if have convert_context } // end if have convert_context
} // end if need transfer to image } // end if need transfer to image
} else { } else {
Debug(1, "No packet.size(%d) or packet->in_frame(%p). Not decoding", packet->packet.size, packet->in_frame); Debug(1, "No packet.size(%d) or packet->in_frame(%p). Not decoding", packet->packet.size, packet->in_frame);
} }
} // end if need_decoding } // end if need_decoding
Image* capture_image = nullptr; Image* capture_image = nullptr;
unsigned int index = image_count % image_buffer_count; unsigned int index = image_count % image_buffer_count;
@ -2690,7 +2692,7 @@ bool Monitor::Decode() {
} }
if (orientation != ROTATE_0) { if (orientation != ROTATE_0) {
Debug(2, "Doing rotation"); Debug(3, "Doing rotation");
switch (orientation) { switch (orientation) {
case ROTATE_0 : case ROTATE_0 :
// No action required // No action required
@ -2713,7 +2715,7 @@ bool Monitor::Decode() {
} }
if (config.timestamp_on_capture) { if (config.timestamp_on_capture) {
Debug(3, "Timestampprivacy"); Debug(3, "Timestamping");
TimestampImage(packet->image, packet->timestamp); TimestampImage(packet->image, packet->timestamp);
} }
@ -2721,7 +2723,7 @@ bool Monitor::Decode() {
shared_timestamps[index] = packet->timestamp; shared_timestamps[index] = packet->timestamp;
} // end if have image } // end if have image
packet->decoded = true; packet->decoded = true;
shared_data->signal = ( capture_image and signal_check_points ) ? CheckSignal(capture_image) : true; shared_data->signal = (capture_image and signal_check_points) ? CheckSignal(capture_image) : true;
shared_data->last_write_index = index; shared_data->last_write_index = index;
shared_data->last_write_time = packet->timestamp.tv_sec; shared_data->last_write_time = packet->timestamp.tv_sec;
packetqueue.unlock(packet_lock); packetqueue.unlock(packet_lock);