Skip to content

Support reading image using WIC on Windows #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support reading image using WIC on Windows #529

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167969c
Support reading image using WIC on Windows
tongyuantongyu Feb 23, 2021
26aa2bf
small fixes
tongyuantongyu Feb 27, 2021
c1faa8f
Correct function parameters when WIC is not available.
tongyuantongyu Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,25 +453,42 @@ if(AVIF_BUILD_APPS)
find_package(PNG REQUIRED)
find_package(JPEG REQUIRED)

set(AVIF_APP_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY} ${JPEG_LIBRARY})
set(AVIF_APP_DEFINITIONS "")

if(WIN32)
include(CheckIncludeFiles)
check_include_files("windows.h;wincodec.h" AVIF_HAVE_WINCODEC)
if(AVIF_HAVE_WINCODEC)
message(STATUS "libavif: wincodec found, reading from wincodec enabled.")
set(AVIF_APP_DEFINITIONS ${AVIF_APP_DEFINITIONS} -DAVIF_WINCODEC_ENABLED=1)
set(AVIF_APP_LIBRARIES ${AVIF_APP_LIBRARIES} windowscodecs)
else()
message(STATUS "libavif: wincodec not found, reading from wincodec disabled.")
endif()
endif()

add_executable(avifenc
apps/avifenc.c

apps/shared/avifjpeg.c
apps/shared/iccjpeg.c
apps/shared/avifpng.c
apps/shared/avifwic.c
apps/shared/avifutil.c
apps/shared/y4m.c
)
if(AVIF_LOCAL_LIBGAV1)
set_target_properties(avifenc PROPERTIES LINKER_LANGUAGE "CXX")
endif()
target_link_libraries(avifenc avif ${AVIF_PLATFORM_LIBRARIES} ${PNG_LIBRARY} ${ZLIB_LIBRARY} ${JPEG_LIBRARY})
target_link_libraries(avifenc avif ${AVIF_PLATFORM_LIBRARIES} ${AVIF_APP_LIBRARIES})
target_include_directories(avifenc
PRIVATE
$<TARGET_PROPERTY:avif,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/apps/shared
${PNG_PNG_INCLUDE_DIR}
${JPEG_INCLUDE_DIR})
target_compile_definitions(avifenc PRIVATE ${AVIF_APP_DEFINITIONS})
add_executable(avifdec
apps/avifdec.c

Expand All @@ -484,13 +501,14 @@ if(AVIF_BUILD_APPS)
if(AVIF_LOCAL_LIBGAV1)
set_target_properties(avifdec PROPERTIES LINKER_LANGUAGE "CXX")
endif()
target_link_libraries(avifdec avif ${AVIF_PLATFORM_LIBRARIES} ${PNG_LIBRARY} ${ZLIB_LIBRARY} ${JPEG_LIBRARY})
target_link_libraries(avifdec avif ${AVIF_PLATFORM_LIBRARIES} ${AVIF_APP_LIBRARIES})
target_include_directories(avifdec
PRIVATE
$<TARGET_PROPERTY:avif,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/apps/shared
${PNG_PNG_INCLUDE_DIR}
${JPEG_INCLUDE_DIR})
target_compile_definitions(avifdec PRIVATE ${AVIF_APP_DEFINITIONS})

if(NOT SKIP_INSTALL_APPS AND NOT SKIP_INSTALL_ALL)
install(TARGETS avifenc avifdec
Expand Down
9 changes: 7 additions & 2 deletions apps/avifenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "avifjpeg.h"
#include "avifpng.h"
#include "avifwic.h"
#include "avifutil.h"
#include "y4m.h"

Expand Down Expand Up @@ -247,8 +248,12 @@ static avifAppFileFormat avifInputReadImage(avifInput * input, avifImage * image
return AVIF_APP_FILE_FORMAT_UNKNOWN;
}
} else {
fprintf(stderr, "Unrecognized file format: %s\n", input->files[input->fileIndex].filename);
return AVIF_APP_FILE_FORMAT_UNKNOWN;
if (avifWICRead(input->files[input->fileIndex].filename, image, input->requestedFormat, input->requestedDepth, outDepth)) {
nextInputFormat = AVIF_APP_FILE_FORMAT_ANY;
} else {
fprintf(stderr, "Unrecognized file format: %s\n", input->files[input->fileIndex].filename);
return AVIF_APP_FILE_FORMAT_UNKNOWN;
}
}

if (!input->frameIter) {
Expand Down
4 changes: 3 additions & 1 deletion apps/shared/avifutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ typedef enum avifAppFileFormat
AVIF_APP_FILE_FORMAT_AVIF,
AVIF_APP_FILE_FORMAT_JPEG,
AVIF_APP_FILE_FORMAT_PNG,
AVIF_APP_FILE_FORMAT_Y4M
AVIF_APP_FILE_FORMAT_Y4M,

AVIF_APP_FILE_FORMAT_ANY = 1000 // an arbitrary format for decoders that support many formats
} avifAppFileFormat;

avifAppFileFormat avifGuessFileFormat(const char * filename);
Expand Down
Loading