mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-02-05 12:31:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow invalid RTSP packets for Wansview K1 support (#394)

Browse Source
This commit is contained in:
Daniel Richard G
2017-06-08 21:53:54 -04:00
parent a801f1958a
commit 4b710e1603
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
netcam_rtsp.c
View File

@@ -95,7 +95,21 @@ static int rtsp_decode_video(AVPacket *packet, AVFrame *frame, AVCodecContext *c
}
retcd = avcodec_receive_frame(ctx_codec, frame);
if (retcd == AVERROR(EAGAIN)) return 0;
/*
* At least one netcam (Wansview K1) is known to always send a bogus
* packet at the start of the stream. Just grin and bear it...
*
* TODO: This error-tolerance should be limited/conditionalized, or
* else Motion could end up accepting bogus video data indefinitely
*/
if (retcd == AVERROR_INVALIDDATA) {
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Ignoring packet with invalid data");
return 0;
}
if (retcd < 0) {
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Error receiving frame from codec: %s", errstr);
@@ -118,11 +132,21 @@ static int rtsp_decode_video(AVPacket *packet, AVFrame *frame, AVCodecContext *c
}
retcd = avcodec_decode_video2(ctx_codec, frame, &check, packet);
/*
* See note above
*/
if (retcd == AVERROR_INVALIDDATA) {
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Ignoring packet with invalid data");
return 0;
}
if (retcd < 0) {
av_strerror(retcd, errstr, sizeof(errstr));
MOTION_LOG(ERR, TYPE_NETCAM, NO_ERRNO, "%s: Error decoding packet: %s",errstr);
return -1;
}
if (check == 0 || retcd == 0) return 0;
return 1;