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

rework getting second packet for de-interlace. Pass notesetmap by reference

This commit is contained in:
Isaac Connor 2022-01-09 14:42:15 -05:00
parent 1f6874dd53
commit 21762585d9
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/zm_monitor.cpp
View File

@ -2675,23 +2675,21 @@ bool Monitor::Decode() {
} else if (deinterlacing_value == 3) { } else if (deinterlacing_value == 3) {
capture_image->Deinterlace_Blend(); capture_image->Deinterlace_Blend();
} else if (deinterlacing_value == 4) { } else if (deinterlacing_value == 4) {
ZMLockedPacket *deinterlace_packet_lock = nullptr;
while (!zm_terminate) { while (!zm_terminate) {
ZMLockedPacket *second_packet_lock = packetqueue.get_packet(decoder_it); ZMLockedPacket *deinterlace_packet_lock = packetqueue.get_packet(decoder_it);
if (!second_packet_lock) { if (!deinterlace_packet_lock) {
packetqueue.unlock(packet_lock); packetqueue.unlock(packet_lock);
return false; return false;
} }
if (second_packet_lock->packet_->codec_type == packet->codec_type) { if (deinterlace_packet_lock->packet_->codec_type == packet->codec_type) {
deinterlace_packet_lock = second_packet_lock; capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
packetqueue.unlock(deinterlace_packet_lock);
break; break;
} }
packetqueue.unlock(second_packet_lock); packetqueue.unlock(deinterlace_packet_lock);
packetqueue.increment_it(decoder_it); packetqueue.increment_it(decoder_it);
} }
if (zm_terminate) return false; if (zm_terminate) return false;
capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
packetqueue.unlock(deinterlace_packet_lock);
} else if (deinterlacing_value == 5) { } else if (deinterlacing_value == 5) {
capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff); capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff);
} }
@ -2786,7 +2784,7 @@ void Monitor::TimestampImage(Image *ts_image, SystemTimePoint ts_time) const {
Event * Monitor::openEvent( Event * Monitor::openEvent(
const std::shared_ptr<ZMPacket> &snap, const std::shared_ptr<ZMPacket> &snap,
const std::string &cause, const std::string &cause,
const Event::StringSetMap noteSetMap) { const Event::StringSetMap &noteSetMap) {
// FIXME this iterator is not protected from invalidation // FIXME this iterator is not protected from invalidation
packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it( packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(

2
src/zm_monitor.h
View File

@ -632,7 +632,7 @@ public:
Event *openEvent( Event *openEvent(
const std::shared_ptr<ZMPacket> &snap, const std::shared_ptr<ZMPacket> &snap,
const std::string &cause, const std::string &cause,
const Event::StringSetMap noteSetMap); const Event::StringSetMap &noteSetMap);
void closeEvent(); void closeEvent();
void Reload(); void Reload();