RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 06:42:03 +00:00
Code Issues Releases Wiki Activity

tv: Recognise v4l2 'JPEG' fourcc

Browse Source 
Naturally, there's more than one fourcc that indicates an mjpeg
stream.

I have a particular ancient webcam here (Logitech QuickCam Messanger)
that only supports the single 'JPEG' format, but there are other
devices out there which support both 'JPEG' and 'MJPG' with no visible
differences, and others where the streams are slightly different.

Regardless of those details, it remains correct to treat 'JPEG'
the same as 'MJPG' from a stream consumption perspective.
This commit is contained in:
Philip Langdale 2018-03-03 11:57:41 -08:00 committed by Kevin Mitchell
parent 496b13227b
commit f0223e1b83
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demux/demux_tv.c
View File

@ -85,7 +85,7 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check)
/* get IMAGE FORMAT */
int fourcc;
funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FORMAT, &fourcc);
if (fourcc == MP_FOURCC_MJPEG) {
if (fourcc == MP_FOURCC_MJPEG || fourcc == MP_FOURCC_JPEG) {
sh_v->codec->codec = "mjpeg";
} else {
sh_v->codec->codec = "rawvideo";

1
stream/tv.h
View File

@ -280,5 +280,6 @@ extern const struct m_sub_options tv_params_conf;
#define MP_FOURCC_YUY2 MP_FOURCC('Y', 'U', 'Y', '2')
#define MP_FOURCC_MJPEG MP_FOURCC('M', 'J', 'P', 'G')
#define MP_FOURCC_JPEG MP_FOURCC('J', 'P', 'E', 'G')
#endif /* MPLAYER_TV_H */

1
stream/tvi_def.h
View File

@ -79,6 +79,7 @@ static inline void fill_blank_frame(char* buffer,int len,int fmt){
}
break;
case MP_FOURCC_MJPEG:
case MP_FOURCC_JPEG:
/*
This is compressed format. I don't know yet how to fill such frame with blue color.
Keeping frame unchanged.

7
stream/tvi_v4l2.c
View File

@ -235,7 +235,8 @@ static int fcc_mp2vl(int fcc)
case MP_FOURCC_YUY2: return V4L2_PIX_FMT_YUYV;
case MP_FOURCC_YV12: return V4L2_PIX_FMT_YVU420;
case MP_FOURCC_UYVY: return V4L2_PIX_FMT_UYVY;
case MP_FOURCC_MJPEG: return V4L2_PIX_FMT_MJPEG;
case MP_FOURCC_MJPEG: return V4L2_PIX_FMT_MJPEG;
case MP_FOURCC_JPEG: return V4L2_PIX_FMT_JPEG;
}
return fcc;
}
@ -259,7 +260,8 @@ static int fcc_vl2mp(int fcc)
case V4L2_PIX_FMT_YVU420: return MP_FOURCC_YV12;
case V4L2_PIX_FMT_YUYV: return MP_FOURCC_YUY2;
case V4L2_PIX_FMT_UYVY: return MP_FOURCC_UYVY;
case V4L2_PIX_FMT_MJPEG: return MP_FOURCC_MJPEG;
case V4L2_PIX_FMT_MJPEG: return MP_FOURCC_MJPEG;
case V4L2_PIX_FMT_JPEG: return MP_FOURCC_JPEG;
}
return fcc;
}
@ -298,6 +300,7 @@ static const char *pixfmt2name(char *buf, int pixfmt)
case V4L2_PIX_FMT_HI240: return "HI240";
case V4L2_PIX_FMT_WNVA: return "WNVA";
case V4L2_PIX_FMT_MJPEG: return "MJPEG";
case V4L2_PIX_FMT_JPEG: return "JPEG";
}
sprintf(buf, "unknown (0x%x)", pixfmt);
return buf;