Skip to content

Commit 5b5856b

Browse files
authored
fix Apple encoder issues (#1731)
* enable check_availability_streaming for apple-hevc * fix VT H264 cannot record to FLV * fix obs exception "Invalid data found when processing inputCouldn't initialize muxer" by returning false since this Apple VT H.264 Hardware Encoder does not record to this format * fix https://app.asana.com/1/1083097041131/project/1207748235152481/task/1215301313110016?focus=true
1 parent 507f7f8 commit 5b5856b

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

obs-studio-server/source/osn-encoders.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const std::vector<osn::EncoderUtils::EncoderSettings> osn::EncoderUtils::videoEn
7070
APPLE_HARDWARE_VIDEO_ENCODER_M1, "", true, true, true, false, true, false, PRESET_APPLE, FAMILY_APPLE},
7171
// get_simple_output_encoder had Apple HEVC so add it here, never used with an advanced name but follow the pattern of M1 above
7272
{"Apple VT HEVC Hardware Encoder", APPLE_HARDWARE_VIDEO_ENCODER_HEVC, "Hardware (Apple, HEVC)", SIMPLE_ENCODER_APPLE_HEVC,
73-
APPLE_HARDWARE_VIDEO_ENCODER_HEVC, "", true, true, true, false, true, false, PRESET_APPLE, FAMILY_APPLE},
73+
APPLE_HARDWARE_VIDEO_ENCODER_HEVC, "", true, true, true, true, true, false, PRESET_APPLE, FAMILY_APPLE},
7474
// AMD HW H.264
7575
{"AMD HW H.264", ADVANCED_ENCODER_AMD, "Hardware (AMD, H.264)", SIMPLE_ENCODER_AMD, ADVANCED_ENCODER_AMD, "", true, true, true, false, true, false,
7676
PRESET_AMD, FAMILY_AMD},
@@ -214,6 +214,9 @@ bool osn::EncoderUtils::isEncoderCompatible(std::string encoderName, obs_service
214214
}
215215
if (!containerSupportsCodec(container, codec))
216216
return false;
217+
if (container == "flv" && videoEncoderOptions[checkIndex].family == FAMILY_APPLE) {
218+
return false;
219+
}
217220
}
218221

219222
return true;

0 commit comments

Comments
 (0)