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

Change semantics of zm_send_packetreceive_frame to return the # of bytes consumed. This is inline with how to old deprecated api used to work. The new api consumes the packet, so just return packet size.

This commit is contained in:
Isaac Connor 2020-04-24 19:05:17 -04:00
parent c6c8a23c02
commit 7a7f366eb1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/zm_ffmpeg.cpp
View File

@ -559,6 +559,8 @@ int zm_send_packet_receive_frame(
} }
return ret; return ret;
} }
// In this api the packet is always consumed, so return packet.bytes
return packet.size;
# else # else
int frameComplete = 0; int frameComplete = 0;
while ( !frameComplete ) { while ( !frameComplete ) {
@ -572,8 +574,8 @@ int zm_send_packet_receive_frame(
return ret; return ret;
} }
} // end while !frameComplete } // end while !frameComplete
return ret;
#endif #endif
return 0;
} // end int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet) } // end int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet)
/* Returns < 0 on error, 0 if codec not ready, 1 on success /* Returns < 0 on error, 0 if codec not ready, 1 on success