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

mac-vth264: Fix video info set logic

Browse Source 
In the vt_h264_video_info function, the format of the video to be encoded is
always being set to VIDEO_FORMAT_NV12, dispite the presence of code to set
the video format to VIDEO_FORMAT_I420 or VIDEO_FORMAT_I444. This commit fixes
that function to respect the video format choice of the user.

In addition, whilst testing this fix initially, I also discovered that the
4:4:4 colour format is not supported by the VideoToolbox H264 encoder.
Looking at the VideoToolbox code in ffmpeg as a reference, the ffmpeg code
errors out if a color format other than NV12 or I420 is set. Therefore, this
commit also logs a warning about I444 not being supported, and uses the NV12
default.
This commit is contained in:
Luke Yelavich 2018-03-07 09:30:44 +11:00
parent 24d2346a1c
commit 2667ae3fc5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/mac-vth264/encoder.c
View File

@ -424,11 +424,12 @@ static void vt_h264_video_info(void *data, struct video_scale_info *info)
enc->vt_pix_fmt = enc->fullrange ?
kCVPixelFormatType_420YpCbCr8PlanarFullRange
: kCVPixelFormatType_420YpCbCr8Planar;
} else if (info->format == VIDEO_FORMAT_I444) {
enc->obs_pix_fmt = info->format;
enc->vt_pix_fmt = kCVPixelFormatType_444YpCbCr10;
return;
}
if (info->format == VIDEO_FORMAT_I444)
VT_BLOG(LOG_WARNING, "I444 color format not supported");
// Anything else, return default
enc->obs_pix_fmt = VIDEO_FORMAT_NV12;
enc->vt_pix_fmt = enc->fullrange ?