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

add missing and mix order of Packet initializers

This commit is contained in:
Isaac Connor 2021-01-07 09:41:02 -05:00
parent ff3bc981de
commit 0d450f4f85
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/zm_packet.cpp
View File

@ -24,38 +24,44 @@
using namespace std; using namespace std;
ZMPacket::ZMPacket() { ZMPacket::ZMPacket() :
keyframe = 0; keyframe(0),
// frame from decoded packet, to be used in generating image // frame from decoded packet, to be used in generating image
in_frame = nullptr; in_frame(nullptr),
out_frame = nullptr; out_frame(nullptr),
image = nullptr; timestamp(nullptr),
buffer = nullptr; buffer(nullptr),
image(nullptr),
analysis_image(nullptr),
score(-1),
codec_type(AVMEDIA_TYPE_UNKNOWN),
image_index(-1),
codec_imgsize(0)
{
av_init_packet(&packet); av_init_packet(&packet);
packet.size = 0; // So we can detect whether it has been filled. packet.size = 0; // So we can detect whether it has been filled.
timestamp = nullptr;
analysis_image = nullptr;
image_index = -1;
score = -1;
codec_imgsize = 0;
} }
ZMPacket::ZMPacket(ZMPacket &p) { ZMPacket::ZMPacket(ZMPacket &p) :
keyframe = 0; keyframe(0),
// frame from decoded packet, to be used in generating image // frame from decoded packet, to be used in generating image
in_frame = nullptr; in_frame(nullptr),
out_frame = nullptr; out_frame(nullptr),
image = nullptr; timestamp(nullptr),
buffer = nullptr; buffer(nullptr),
image(nullptr),
analysis_image(nullptr),
score(-1),
codec_type(AVMEDIA_TYPE_UNKNOWN),
image_index(-1),
codec_imgsize(0)
{
av_init_packet(&packet); av_init_packet(&packet);
if ( zm_av_packet_ref(&packet, &p.packet) < 0 ) { if ( zm_av_packet_ref(&packet, &p.packet) < 0 ) {
Error("error refing packet"); Error("error refing packet");
} }
timestamp = new struct timeval; timestamp = new struct timeval;
*timestamp = *p.timestamp; *timestamp = *p.timestamp;
analysis_image = nullptr;
image_index = -1;
score = -1;
} }
ZMPacket::~ZMPacket() { ZMPacket::~ZMPacket() {