scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 17:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lavc: ignore error when there are more slices

Browse Source 
Libav reports errors when decoding JPEG with multiple slices even
though it decodes is correctly (not an issue with FFMPEG).
This commit is contained in:
Martin Pulec
2016-02-18 18:31:56 +01:00
parent 2c6a6f1354
commit 4bebd18762
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/video_decompress/libavcodec.c
View File

@@ -453,7 +453,7 @@ static int libavcodec_decompress(void *state, unsigned char *dst, unsigned char
unsigned int src_len, int frame_seq)
{
struct state_libavcodec_decompress *s = (struct state_libavcodec_decompress *) state;
int len, got_frame;
int len, got_frame = 0;
int res = FALSE;
s->pkt.size = src_len;
@@ -463,23 +463,18 @@ static int libavcodec_decompress(void *state, unsigned char *dst, unsigned char
len = avcodec_decode_video2(s->codec_ctx, s->frame, &got_frame, &s->pkt);
/*
* Hack: libavcodec does not correctly support JPEG with more than one reset
* segment. It returns error although it is actually able to decompress frame
* correctly. So we assume that the decompression went good even with the
* reported error.
* Hack: Some libavcodec versions (typically found in Libav)
* do not correctly support JPEG with more than one reset
* segment (GPUJPEG) or more than one slices (compressed with
* libavcodec). It returns error although it is actually able
* to decompress the frame correctly. So we assume that the
* decompression went good even with the reported error.
*/
if (len < 0) {
if (s->in_codec == JPEG) {
// this hack doesn;t seem to work in recent Libav versions
#if 0
return change_pixfmt(s->frame, dst, s->codec_ctx->pix_fmt,
s->out_codec, s->width, s->height, s->pitch);
#else
log_msg(LOG_LEVEL_WARNING, "[lavd] Perhaps JPEG restart interval >0 set? (Not supported by lavd, try '-c JPEG:90:0' on sender).\n");
#endif
} else if (s->in_codec == MJPG) {
log_msg(LOG_LEVEL_WARNING, "[lavd] Perhaps old libavcodec without slices support? (Try '-c libavcodec:codec=MJPEG:threads=no' on sender).\n");
return FALSE;
} else {
log_msg(LOG_LEVEL_WARNING, "[lavd] Error while decoding frame.\n");
return FALSE;