Skip to content
Snippets Groups Projects
Commit e15797f7 authored by Silas Della Contrada's avatar Silas Della Contrada
Browse files

Finished and tested QSV decoder

parent c9f749d0
No related branches found
No related tags found
1 merge request!2Resolve "QSV Decoder"
...@@ -20,10 +20,7 @@ endif () ...@@ -20,10 +20,7 @@ endif ()
# -O3) # -O3)
#endif () #endif ()
add_library( set(SOURCES
AVQt
STATIC
resources.qrc resources.qrc
AVQt AVQt
...@@ -77,7 +74,11 @@ add_library( ...@@ -77,7 +74,11 @@ add_library(
output/OpenALAudioOutput.h output/OpenALAudioOutput.h
output/private/OpenALAudioOutput_p.h output/private/OpenALAudioOutput_p.h
output/OpenALAudioOutput.cpp output/OpenALAudioOutput.cpp
) )
add_library(AVQt SHARED ${SOURCES})
add_library(AVQtStatic STATIC ${SOURCES})
set_target_properties(AVQtStatic PROPERTIES OUTPUT_NAME AVQt_static)
target_compile_options(AVQt PRIVATE target_compile_options(AVQt PRIVATE
-std=c++20 -std=c++20
...@@ -112,6 +113,49 @@ target_compile_options(AVQt PRIVATE ...@@ -112,6 +113,49 @@ target_compile_options(AVQt PRIVATE
-Weffc++ -Weffc++
# -fno-common # each global variable is only declared once.
# -fmerge-all-constants
# -ffunction-sections
# -fdata-sections
# -fno-use-cxa-atexit
# -fverbose-asm
# -fstrict-enums
-Wstack-protector
-Wdouble-promotion
)
target_compile_options(AVQtStatic PRIVATE
-std=c++20
-Werror=all
-Werror=extra
-Werror=pedantic
-ansi
-Werror=init-self
-Werror=old-style-cast
-Werror=overloaded-virtual
-Werror=uninitialized
-Werror=missing-declarations
-Werror=init-self
# -Wall -Wextra
-Wno-error=non-virtual-dtor
# -Wno-unused-result
#-Wpedantic
-Wshadow
-Wfatal-errors
-Wundef
-Wuninitialized
-Winit-self
-Wconversion
-Wfloat-equal
-Wstrict-aliasing
-Wtrigraphs
-Wodr # one definition rule
-Wzero-as-null-pointer-constant
-Wsizeof-array-argument
-Winline
-Wcast-qual
-Weffc++
# -fno-common # each global variable is only declared once. # -fno-common # each global variable is only declared once.
# -fmerge-all-constants # -fmerge-all-constants
# -ffunction-sections # -ffunction-sections
...@@ -124,4 +168,5 @@ target_compile_options(AVQt PRIVATE ...@@ -124,4 +168,5 @@ target_compile_options(AVQt PRIVATE
) )
target_link_libraries(AVQt Qt6::Core Qt6::Gui Qt6::Concurrent Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets avformat avfilter avutil avcodec avdevice swscale swresample GL openal) target_link_libraries(AVQt Qt6::Core Qt6::Gui Qt6::Concurrent Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets avformat avfilter avutil avcodec avdevice swscale swresample GL openal)
target_link_libraries(AVQtStatic Qt6::Core Qt6::Gui Qt6::Concurrent Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets avformat avfilter avutil avcodec avdevice swscale swresample GL openal)
#target_link_libraries(AVQt Qt5::Core Qt5::Gui Qt5::Concurrent Qt5::Widgets Qt5::OpenGL avformat avfilter avutil avcodec avdevice swscale swresample GL openal) #target_link_libraries(AVQt Qt5::Core Qt5::Gui Qt5::Concurrent Qt5::Widgets Qt5::OpenGL avformat avfilter avutil avcodec avdevice swscale swresample GL openal)
\ No newline at end of file
...@@ -67,7 +67,7 @@ int main(int argc, char *argv[]) { ...@@ -67,7 +67,7 @@ int main(int argc, char *argv[]) {
AVQt::IDecoder *videoDecoder; AVQt::IDecoder *videoDecoder;
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
videoDecoder = new AVQt::DecoderVAAPI; videoDecoder = new AVQt::DecoderQSV;
#elif defined(Q_OS_WINDOWS) #elif defined(Q_OS_WINDOWS)
videoDecoder = new AVQt::DecoderDXVA2(); videoDecoder = new AVQt::DecoderDXVA2();
#else #else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment