From f67e63b1c63d71a03e044bf217945cd62d624e32 Mon Sep 17 00:00:00 2001 From: sorayuki Date: Sun, 5 May 2019 16:18:16 +0800 Subject: [PATCH] win-dshow: fix issue decoding some H.264 stream Logitech C920 web camera will output YUVJ420P which is not supported yet. --- plugins/win-dshow/ffmpeg-decode.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/plugins/win-dshow/ffmpeg-decode.c b/plugins/win-dshow/ffmpeg-decode.c index 5fba70014..229cdb814 100644 --- a/plugins/win-dshow/ffmpeg-decode.c +++ b/plugins/win-dshow/ffmpeg-decode.c @@ -63,14 +63,15 @@ void ffmpeg_decode_free(struct ffmpeg_decode *decode) static inline enum video_format convert_pixel_format(int f) { switch (f) { - case AV_PIX_FMT_NONE: return VIDEO_FORMAT_NONE; - case AV_PIX_FMT_YUV420P: return VIDEO_FORMAT_I420; - case AV_PIX_FMT_NV12: return VIDEO_FORMAT_NV12; - case AV_PIX_FMT_YUYV422: return VIDEO_FORMAT_YUY2; - case AV_PIX_FMT_UYVY422: return VIDEO_FORMAT_UYVY; - case AV_PIX_FMT_RGBA: return VIDEO_FORMAT_RGBA; - case AV_PIX_FMT_BGRA: return VIDEO_FORMAT_BGRA; - case AV_PIX_FMT_BGR0: return VIDEO_FORMAT_BGRX; + case AV_PIX_FMT_NONE: return VIDEO_FORMAT_NONE; + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUVJ420P: return VIDEO_FORMAT_I420; + case AV_PIX_FMT_NV12: return VIDEO_FORMAT_NV12; + case AV_PIX_FMT_YUYV422: return VIDEO_FORMAT_YUY2; + case AV_PIX_FMT_UYVY422: return VIDEO_FORMAT_UYVY; + case AV_PIX_FMT_RGBA: return VIDEO_FORMAT_RGBA; + case AV_PIX_FMT_BGRA: return VIDEO_FORMAT_BGRA; + case AV_PIX_FMT_BGR0: return VIDEO_FORMAT_BGRX; default:; }