jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-ffmpeg: Use YVYU for FFmpeg pix fmt YVYU422 

This commit also modifies deps/media-playback and libobs.
master
mvji 2022-04-19 19:39:22 +02:00
parent 5f35e73d8b
commit 93490da4c2
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/media-playback/media-playback/closest-format.h vendored
View File

@ -54,9 +54,11 @@ static enum AVPixelFormat closest_format(enum AVPixelFormat fmt)
return AV_PIX_FMT_YUV422P10LE;
case AV_PIX_FMT_UYVY422:
case AV_PIX_FMT_YVYU422:
return AV_PIX_FMT_UYVY422;
case AV_PIX_FMT_YVYU422:
return AV_PIX_FMT_YVYU422;
case AV_PIX_FMT_NV12:
case AV_PIX_FMT_NV21:
return AV_PIX_FMT_NV12;

2
deps/media-playback/media-playback/media.c vendored
View File

@ -46,6 +46,8 @@ static inline enum video_format convert_pixel_format(int f)
return VIDEO_FORMAT_I412;
case AV_PIX_FMT_UYVY422:
return VIDEO_FORMAT_UYVY;
case AV_PIX_FMT_YVYU422:
return VIDEO_FORMAT_YVYU;
case AV_PIX_FMT_NV12:
return VIDEO_FORMAT_NV12;
case AV_PIX_FMT_RGBA:

3
libobs/media-io/video-scaler-ffmpeg.c
View File

@ -41,6 +41,8 @@ get_ffmpeg_video_format(enum video_format format)
return AV_PIX_FMT_YUYV422;
case VIDEO_FORMAT_UYVY:
return AV_PIX_FMT_UYVY422;
case VIDEO_FORMAT_YVYU:
return AV_PIX_FMT_YVYU422;
case VIDEO_FORMAT_RGBA:
return AV_PIX_FMT_RGBA;
case VIDEO_FORMAT_BGRA:
@ -76,7 +78,6 @@ get_ffmpeg_video_format(enum video_format format)
case VIDEO_FORMAT_P010:
return AV_PIX_FMT_P010LE;
case VIDEO_FORMAT_NONE:
case VIDEO_FORMAT_YVYU:
case VIDEO_FORMAT_AYUV:
/* not supported by FFmpeg */
return AV_PIX_FMT_NONE;

3
plugins/obs-ffmpeg/obs-ffmpeg-formats.h
View File

@ -25,6 +25,8 @@ obs_to_ffmpeg_video_format(enum video_format format)
return AV_PIX_FMT_YUYV422;
case VIDEO_FORMAT_UYVY:
return AV_PIX_FMT_UYVY422;
case VIDEO_FORMAT_YVYU:
return AV_PIX_FMT_YVYU422;
case VIDEO_FORMAT_RGBA:
return AV_PIX_FMT_RGBA;
case VIDEO_FORMAT_BGRA:
@ -56,7 +58,6 @@ obs_to_ffmpeg_video_format(enum video_format format)
case VIDEO_FORMAT_P010:
return AV_PIX_FMT_P010LE;
case VIDEO_FORMAT_NONE:
case VIDEO_FORMAT_YVYU:
case VIDEO_FORMAT_AYUV:
/* not supported by FFmpeg */
return AV_PIX_FMT_NONE;