Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-09-17 08:02:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MediaCapture: Warning fix

Browse source
This commit is contained in:
Stenzek 2024-08-11 23:46:44 +10:00
parent af47eb6956
commit 62eb557832
No known key found for this signature in database
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/settings.cpp
View file

@ -86,7 +86,7 @@ float SettingInfo::FloatStepValue() const
#if defined(_WIN32) #if defined(_WIN32)
const MediaCaptureBackend Settings::DEFAULT_MEDIA_CAPTURE_BACKEND = MediaCaptureBackend::MediaFoundation; const MediaCaptureBackend Settings::DEFAULT_MEDIA_CAPTURE_BACKEND = MediaCaptureBackend::MediaFoundation;
#elif !defined(__ANDROID__) #elif !defined(__ANDROID__)
const MediaCaptureBackend Settings::DEFAULT_MEDIA_CAPTURE_BACKEND = MediaCaptureBackend::FFMPEG; const MediaCaptureBackend Settings::DEFAULT_MEDIA_CAPTURE_BACKEND = MediaCaptureBackend::FFmpeg;
#endif #endif
Settings::Settings() Settings::Settings()

21
src/util/media_capture.cpp
View file

@ -621,9 +621,9 @@ struct MediaFoundationCodec
bool require_hardware; bool require_hardware;
}; };
static constexpr const MediaFoundationCodec s_media_foundation_audio_codecs[] = { static constexpr const MediaFoundationCodec s_media_foundation_audio_codecs[] = {
{"aac", "Advanced Audio Coding", MFAudioFormat_AAC}, {"aac", "Advanced Audio Coding", MFAudioFormat_AAC, false},
{"mp3", "MPEG-2 Audio Layer III", MFAudioFormat_MP3}, {"mp3", "MPEG-2 Audio Layer III", MFAudioFormat_MP3, false},
{"pcm", "Uncompressed PCM", MFAudioFormat_PCM}, {"pcm", "Uncompressed PCM", MFAudioFormat_PCM, false},
}; };
static constexpr const MediaFoundationCodec s_media_foundation_video_codecs[] = { static constexpr const MediaFoundationCodec s_media_foundation_video_codecs[] = {
{"h264", "H.264 with Software Encoding", MFVideoFormat_H264, false}, {"h264", "H.264 with Software Encoding", MFVideoFormat_H264, false},
@ -1609,8 +1609,8 @@ MediaCapture::ContainerList MediaCapture::GetContainerList(MediaCaptureBackend b
break; break;
#endif #endif
#ifndef __ANDROID__ #ifndef __ANDROID__
case MediaCaptureBackend::FFMPEG: case MediaCaptureBackend::FFmpeg:
// ret = MediaCaptureFFMPEG::GetContainerList(); // ret = MediaCaptureFFmpeg::GetContainerList();
break; break;
#endif #endif
default: default:
@ -1630,8 +1630,8 @@ MediaCapture::CodecList MediaCapture::GetVideoCodecList(MediaCaptureBackend back
break; break;
#endif #endif
#ifndef __ANDROID__ #ifndef __ANDROID__
case MediaCaptureBackend::FFMPEG: case MediaCaptureBackend::FFmpeg:
// ret = MediaCaptureFFMPEG::GetVideoCodecList(container); // ret = MediaCaptureFFmpeg::GetVideoCodecList(container);
break; break;
#endif #endif
default: default:
@ -1651,8 +1651,8 @@ MediaCapture::CodecList MediaCapture::GetAudioCodecList(MediaCaptureBackend back
break; break;
#endif #endif
#ifndef __ANDROID__ #ifndef __ANDROID__
case MediaCaptureBackend::FFMPEG: case MediaCaptureBackend::FFmpeg:
// ret = MediaCaptureFFMPEG::GetAudioCodecList(container); // ret = MediaCaptureFFmpeg::GetAudioCodecList(container);
break; break;
#endif #endif
default: default:
@ -1670,7 +1670,8 @@ std::unique_ptr<MediaCapture> MediaCapture::Create(MediaCaptureBackend backend,
return MediaCaptureMF::Create(error); return MediaCaptureMF::Create(error);
#endif #endif
#ifndef __ANDROID__ #ifndef __ANDROID__
case MediaCaptureBackend::FFMPEG: case MediaCaptureBackend::FFmpeg:
// return MediaCaptureFFmpeg::Create(error);
return nullptr; return nullptr;
#endif #endif
default: default:

2
src/util/media_capture.h
View file

@ -20,7 +20,7 @@ enum class MediaCaptureBackend : u8
MediaFoundation, MediaFoundation,
#endif #endif
#ifndef __ANDROID__ #ifndef __ANDROID__
FFMPEG, FFmpeg,
#endif #endif
MaxCount, MaxCount,
}; };