OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-04 10:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac-videotoolbox: Differentiate unsupported format and range errors

Browse source
This commit is contained in:
gxalpha 2023-04-27 20:34:40 +02:00 committed by Jim
parent 4a8e8644e0
commit 1c15066cc4
2 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/mac-videotoolbox/data/locale/en-US.ini
View file

@ -16,6 +16,7 @@ Profile="Profile"
UseBFrames="Use B-Frames"
RateControl="Rate Control"
ColorFormatUnsupported="The selected color format is not supported by the selected Apple VT encoder. Select a compatible color format in Settings -> Advanced or use a different encoder."
FullRangeUnsupported="Full range color is not supported by 16-bit Apple VT encoders. Select limited range color in Settings -> Advanced."
ProResCodec="ProRes Codec"
ProRes4444XQ="ProRes 4444 XQ"
ProRes4444="ProRes 4444"

38
plugins/mac-videotoolbox/encoder.c
View file

@ -752,8 +752,15 @@ static void dump_encoder_info(struct vt_encoder *enc)
codec_type_to_print_fmt(enc->codec_type));
}
static bool set_video_format(struct vt_encoder *enc, enum video_format format,
enum video_range_type range)
typedef enum {
kResultSuccess = 0,
kResultColorFormatUnsupported = 1,
kResultFullRangeUnsupported = 2,
} SetVideoFormatResult;
static SetVideoFormatResult set_video_format(struct vt_encoder *enc,
enum video_format format,
enum video_range_type range)
{
bool full_range = range == VIDEO_RANGE_FULL;
switch (format) {
@ -762,40 +769,44 @@ static bool set_video_format(struct vt_encoder *enc, enum video_format format,
full_range
? kCVPixelFormatType_420YpCbCr8PlanarFullRange
: kCVPixelFormatType_420YpCbCr8Planar;
return true;
return kResultSuccess;
case VIDEO_FORMAT_NV12:
enc->vt_pix_fmt =
full_range
? kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
: kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
return true;
return kResultSuccess;
case VIDEO_FORMAT_P010:
if (enc->codec_type == kCMVideoCodecType_HEVC) {
enc->vt_pix_fmt =
full_range
? kCVPixelFormatType_420YpCbCr10BiPlanarFullRange
: kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
return true;
return kResultSuccess;
}
break;
case VIDEO_FORMAT_P216:
if (!full_range) {
enc->vt_pix_fmt =
kCVPixelFormatType_422YpCbCr16BiPlanarVideoRange;
return true;
return kResultSuccess;
} else {
return kResultFullRangeUnsupported;
}
break;
case VIDEO_FORMAT_P416:
if (!full_range) {
enc->vt_pix_fmt =
kCVPixelFormatType_444YpCbCr16BiPlanarVideoRange;
return true;
return kResultSuccess;
} else {
return kResultFullRangeUnsupported;
}
break;
default:
return false;
return kResultColorFormatUnsupported;
}
return false;
return kResultColorFormatUnsupported;
}
static bool update_params(struct vt_encoder *enc, obs_data_t *settings)
@ -817,12 +828,19 @@ static bool update_params(struct vt_encoder *enc, obs_data_t *settings)
settings, "codec_type");
}
if (!set_video_format(enc, voi->format, voi->range)) {
SetVideoFormatResult res =
set_video_format(enc, voi->format, voi->range);
if (res == kResultColorFormatUnsupported) {
obs_encoder_set_last_error(
enc->encoder,
obs_module_text("ColorFormatUnsupported"));
VT_BLOG(LOG_WARNING, "Unsupported color format selected");
return false;
} else if (res == kResultFullRangeUnsupported) {
obs_encoder_set_last_error(
enc->encoder, obs_module_text("FullRangeUnsupported"));
VT_BLOG(LOG_WARNING, "Unsupported color range (full) selected");
return false;
}
enc->colorspace = voi->colorspace;
enc->width = obs_encoder_get_width(enc->encoder);