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

Remove the decoding code, just populate the av_packet. This fixes rtsp decoding because we weren't copying the decoded frame to shm raw image.

This commit is contained in:
Isaac Connor 2022-01-25 14:24:52 -05:00
parent 26ae5052f4
commit cf82d767de
2 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dep/RtspServer

@ -1 +1 @@
Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878 Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f

54
src/zm_remote_camera_rtsp.cpp
View File

@ -168,8 +168,10 @@ int RemoteCameraRtsp::PrimeCapture() {
} }
} // end foreach stream } // end foreach stream
if ( mVideoStreamId == -1 ) if ( mVideoStreamId == -1 ) {
Fatal("Unable to locate video stream"); Error("Unable to locate video stream");
return -1;
}
if ( mAudioStreamId == -1 ) if ( mAudioStreamId == -1 )
Debug(3, "Unable to locate audio stream"); Debug(3, "Unable to locate audio stream");
@ -179,17 +181,22 @@ int RemoteCameraRtsp::PrimeCapture() {
// Find the decoder for the video stream // Find the decoder for the video stream
AVCodec *codec = avcodec_find_decoder(mVideoCodecContext->codec_id); AVCodec *codec = avcodec_find_decoder(mVideoCodecContext->codec_id);
if ( codec == nullptr ) if ( codec == nullptr ) {
Panic("Unable to locate codec %d decoder", mVideoCodecContext->codec_id); Error("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
return -1;
}
// Open codec // Open codec
if ( avcodec_open2(mVideoCodecContext, codec, nullptr) < 0 ) if ( avcodec_open2(mVideoCodecContext, codec, nullptr) < 0 ) {
Panic("Can't open codec"); Error("Can't open codec");
return -1;
}
int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1); int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
if ( (unsigned int)pSize != imagesize ) { if ( (unsigned int)pSize != imagesize ) {
Fatal("Image size mismatch. Required: %d Available: %llu", pSize, imagesize); Error("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
return -1;
} }
return 1; return 1;
@ -208,11 +215,6 @@ int RemoteCameraRtsp::PreCapture() {
int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) { int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
int frameComplete = false; int frameComplete = false;
AVPacket *packet = &zm_packet->packet; AVPacket *packet = &zm_packet->packet;
if ( !zm_packet->image ) {
Debug(1, "Allocating image %dx%d %d colours %d", width, height, colours, subpixelorder);
zm_packet->image = new Image(width, height, colours, subpixelorder);
}
while (!frameComplete) { while (!frameComplete) {
buffer.clear(); buffer.clear();
@ -254,36 +256,20 @@ int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
//while ( (!frameComplete) && (buffer.size() > 0) ) { //while ( (!frameComplete) && (buffer.size() > 0) ) {
if ( buffer.size() > 0 ) { if ( buffer.size() > 0 ) {
packet->data = buffer.head(); packet->data = (uint8_t*)av_malloc(buffer.size());
memcpy(packet->data, buffer.head(), buffer.size());
//packet->data = buffer.head();
packet->size = buffer.size(); packet->size = buffer.size();
bytes += packet->size; bytes += packet->size;
buffer -= packet->size;
struct timeval now; struct timeval now;
gettimeofday(&now, NULL); gettimeofday(&now, nullptr);
packet->pts = packet->dts = now.tv_sec*1000000+now.tv_usec; packet->pts = packet->dts = now.tv_sec*1000000+now.tv_usec;
int bytes_consumed = zm_packet->decode(mVideoCodecContext);
if ( bytes_consumed < 0 ) {
Error("Error while decoding frame %d", frameCount);
//Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
}
buffer -= packet->size;
if ( bytes_consumed ) {
zm_dump_video_frame(zm_packet->in_frame, "remote_rtsp_decode");
if (!mVideoStream->codecpar->width) {
zm_dump_codec(mVideoCodecContext);
zm_dump_codecpar(mVideoStream->codecpar);
mVideoStream->codecpar->width = zm_packet->in_frame->width;
mVideoStream->codecpar->height = zm_packet->in_frame->height;
zm_dump_codecpar(mVideoStream->codecpar);
}
zm_packet->codec_type = mVideoCodecContext->codec_type; zm_packet->codec_type = mVideoCodecContext->codec_type;
zm_packet->stream = mVideoStream; zm_packet->stream = mVideoStream;
frameComplete = true; frameComplete = true;
Debug(2, "Frame: %d - %d/%d", frameCount, bytes_consumed, buffer.size()); Debug(2, "Frame: %d - %d/%d", frameCount, packet->size, buffer.size());
packet->data = nullptr;
packet->size = 0;
}
} }
} /* getFrame() */ } /* getFrame() */
} // end while true } // end while true