diff --git a/CMakeLists.txt b/CMakeLists.txt index c858866..450297b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,6 +272,8 @@ set(PROJECT_PRIVATE "${PROJECT_SOURCE_DIR}/source/codecs/hevc.cpp" "${PROJECT_SOURCE_DIR}/source/codecs/h264.hpp" "${PROJECT_SOURCE_DIR}/source/codecs/h264.cpp" + "${PROJECT_SOURCE_DIR}/source/codecs/prores.hpp" + "${PROJECT_SOURCE_DIR}/source/codecs/prores.cpp" "${PROJECT_SOURCE_DIR}/source/ffmpeg/avframe-queue.cpp" "${PROJECT_SOURCE_DIR}/source/ffmpeg/avframe-queue.hpp" "${PROJECT_SOURCE_DIR}/source/ffmpeg/swscale.hpp" diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 7703d73..ff02301 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -48,20 +48,6 @@ KeyFrames.IntervalType.Frames="Frames" KeyFrames.IntervalType.Seconds="Seconds" KeyFrames.Interval="Interval" -# Apple ProRes -AppleProRes.Profile="Profile" -AppleProRes.Profile.APCO="Proxy" -AppleProRes.Profile.APCS="LT" -AppleProRes.Profile.APCN="Standard Definition" -AppleProRes.Profile.APCH="High Quality" -AppleProRes.Profile.AP4H="4444" - -# ProRes -ProRes.Profile.Proxy="Proxy (PXY)" -ProRes.Profile.Light="Light (LT)" -ProRes.Profile.Standard="Standard" -ProRes.Profile.HighQuality="High Quality (HQ)" - # Codec: H264 Codec.H264="H264" Codec.H264.Profile="Profile" @@ -82,6 +68,15 @@ Codec.HEVC.Tier.main="Main" Codec.HEVC.Tier.high="High" Codec.HEVC.Level="Level" +# Codec: Apple ProRes +Codec.ProRes.Profile="Profile" +Codec.ProRes.Profile.APCO="422 Proxy/PXY (APCO)" +Codec.ProRes.Profile.APCS="422 Light/LT (APCS)" +Codec.ProRes.Profile.APCN="422 Standard (APCN)" +Codec.ProRes.Profile.APCH="422 High Quality/HQ (APCH)" +Codec.ProRes.Profile.AP4H="4444 Standard (AP4H)" +Codec.ProRes.Profile.AP4X="4444 Extra Quality/XQ (AP4X)" + # NVENC NVENC.Preset="Preset" NVENC.Preset.Default="Default" diff --git a/source/codecs/prores.cpp b/source/codecs/prores.cpp new file mode 100644 index 0000000..f80f586 --- /dev/null +++ b/source/codecs/prores.cpp @@ -0,0 +1,22 @@ +// FFMPEG Video Encoder Integration for OBS Studio +// Copyright (c) 2019 Michael Fabian Dirks +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#include "prores.hpp" diff --git a/source/codecs/prores.hpp b/source/codecs/prores.hpp new file mode 100644 index 0000000..b9a1f37 --- /dev/null +++ b/source/codecs/prores.hpp @@ -0,0 +1,32 @@ +// FFMPEG Video Encoder Integration for OBS Studio +// Copyright (c) 2019 Michael Fabian Dirks +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +#pragma once + +// Codec: ProRes +#define P_PRORES "Codec.ProRes" +#define P_PRORES_PROFILE "Codec.ProRes.Profile" +#define P_PRORES_PROFILE_APCS "Codec.ProRes.Profile.APCS" +#define P_PRORES_PROFILE_APCO "Codec.ProRes.Profile.APCO" +#define P_PRORES_PROFILE_APCN "Codec.ProRes.Profile.APCN" +#define P_PRORES_PROFILE_APCH "Codec.ProRes.Profile.APCH" +#define P_PRORES_PROFILE_AP4H "Codec.ProRes.Profile.AP4H" +#define P_PRORES_PROFILE_AP4X "Codec.ProRes.Profile.AP4X"