Browse Source
Merge branch 'yuzu-emu:master' into new-shortcut
pull/15/merge
Franco M
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
1 additions and
10 deletions
-
src/input_common/drivers/udp_client.cpp
-
src/video_core/host1x/codecs/codec.cpp
|
|
|
@ -338,6 +338,7 @@ void UDPClient::StartCommunication(std::size_t client, const std::string& host, |
|
|
|
for (std::size_t index = 0; index < PADS_PER_CLIENT; ++index) { |
|
|
|
const PadIdentifier identifier = GetPadIdentifier(client * PADS_PER_CLIENT + index); |
|
|
|
PreSetController(identifier); |
|
|
|
PreSetMotion(identifier, 0); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -137,16 +137,6 @@ bool Codec::CreateGpuAvDevice() { |
|
|
|
break; |
|
|
|
} |
|
|
|
if ((config->methods & HW_CONFIG_METHOD) != 0 && config->device_type == type) { |
|
|
|
#if defined(__unix__)
|
|
|
|
// Some linux decoding backends are reported to crash with this config method
|
|
|
|
// TODO(ameerj): Properly support this method
|
|
|
|
if ((config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX) != 0) { |
|
|
|
// skip zero-copy decoders, we don't currently support them
|
|
|
|
LOG_DEBUG(Service_NVDRV, "Skipping decoder {} with unsupported capability {}.", |
|
|
|
av_hwdevice_get_type_name(type), config->methods); |
|
|
|
continue; |
|
|
|
} |
|
|
|
#endif
|
|
|
|
LOG_INFO(Service_NVDRV, "Using {} GPU decoder", av_hwdevice_get_type_name(type)); |
|
|
|
av_codec_ctx->pix_fmt = config->pix_fmt; |
|
|
|
return true; |
|
|
|
|