Skip to content
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

Jump to bottom

Use xcframework distribution of WebP #66

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use xcframework distribution of WebP #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44cf66e
Delete webp target (and libwebp source code)
liamnichols Oct 19, 2021
27bde6a
Remove WebP and WebPDemux frameworks
liamnichols Oct 19, 2021
a7616e3
Support XCFramework for webp
liamnichols Oct 19, 2021
19eeaf3
Update podspec to use .xcframework
liamnichols Oct 19, 2021
5008013
Use official .xcframework binaries from http://storage.googleapis.com…
liamnichols Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 0 additions & 14 deletions Extended/TIPXWebPCodec.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,12 @@

#pragma mark WebP includes

// TODO: remove this pushed diagnostic "ignored" when the modular closure of libwebp framework headers is completely fixed
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"

#if TARGET_OS_MACCATALYST
#import <webp/webp.h>
#if TIPX_WEBP_ANIMATION_DECODING_ENABLED
#define WEBP_HAS_DEMUX 1
#endif
#else
#import <WebP/decode.h>
#import <WebP/encode.h>
#if TIPX_WEBP_ANIMATION_DECODING_ENABLED
#import <WebPDemux/demux.h>
#define WEBP_HAS_DEMUX 1
#endif
#endif

#pragma clang diagnostic pop


NS_ASSUME_NONNULL_BEGIN

Expand Down
Binary file removed Extended/WebP.framework/WebP
View file
Open in desktop
Binary file not shown.
79 changes: 79 additions & 0 deletions Extended/WebP.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>AvailableLibraries</key>
<array>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>libwebp.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_i386_x86_64-simulator</string>
<key>LibraryPath</key>
<string>libwebp.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>i386</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7_armv7s</string>
<key>LibraryPath</key>
<string>libwebp.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>armv7s</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
</dict>
<dict>
<key>HeadersPath</key>
<string>Headers</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-maccatalyst</string>
<key>LibraryPath</key>
<string>libwebp.a</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>maccatalyst</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Extended/WebP.framework/Headers/decode.h → ...-arm64_armv7_armv7s/Headers/WebP/decode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ WEBP_EXTERN uint8_t* WebPDecodeBGR(const uint8_t* data, size_t data_size,
// Upon return, the Y buffer has a stride returned as '*stride', while U and V
// have a common stride returned as '*uv_stride'.
// Return NULL in case of error.
// (*) Also named Y'CbCr. See: http://en.wikipedia.org/wiki/YCbCr
// (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr
WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
int* width, int* height,
uint8_t** u, uint8_t** v,
Expand Down Expand Up @@ -453,7 +453,7 @@ struct WebPDecoderOptions {
int scaled_width, scaled_height; // final resolution
int use_threads; // if true, use multi-threaded decoding
int dithering_strength; // dithering strength (0=Off, 100=full)
int flip; // flip output vertically
int flip; // if true, flip output vertically
int alpha_dithering_strength; // alpha dithering strength in [0..100]

uint32_t pad[5]; // padding for later use
Expand Down
4 changes: 2 additions & 2 deletions Extended/libwebp/src/webp/demux.h → ...s-arm64_armv7_armv7s/Headers/WebP/demux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
#ifndef WEBP_WEBP_DEMUX_H_
#define WEBP_WEBP_DEMUX_H_

#import <webp/decode.h> // for WEBP_CSP_MODE
#import <webp/mux_types.h>
#include "./decode.h" // for WEBP_CSP_MODE
#include "./mux_types.h"

#ifdef __cplusplus
extern "C" {
Expand Down
8 changes: 7 additions & 1 deletion Extended/WebP.framework/Headers/encode.h → ...-arm64_armv7_armv7s/Headers/WebP/encode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ struct WebPConfig {
int use_delta_palette; // reserved for future lossless feature
int use_sharp_yuv; // if needed, use sharp (and slow) RGB->YUV conversion

uint32_t pad[2]; // padding for later use
int qmin; // minimum permissible quality factor
int qmax; // maximum permissible quality factor
};

// Enumerate some predefined settings for WebPConfig, depending on the type
Expand Down Expand Up @@ -291,6 +292,11 @@ typedef enum WebPEncodingError {
#define WEBP_MAX_DIMENSION 16383

// Main exchange structure (input samples, output bytes, statistics)
//
// Once WebPPictureInit() has been called, it's ok to make all the INPUT fields
// (use_argb, y/u/v, argb, ...) point to user-owned data, even if
// WebPPictureAlloc() has been called. Depending on the value use_argb,
// it's guaranteed that either *argb or *y/*u/*v content will be kept untouched.
struct WebPPicture {
// INPUT
//////////////
Expand Down
2 changes: 1 addition & 1 deletion Extended/libwebp/src/webp/mux.h → ...ios-arm64_armv7_armv7s/Headers/WebP/mux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef WEBP_WEBP_MUX_H_
#define WEBP_WEBP_MUX_H_

#import <webp/mux_types.h>
#include "./mux_types.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion Extended/libwebp/src/webp/mux_types.h → ...m64_armv7_armv7s/Headers/WebP/mux_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define WEBP_WEBP_MUX_TYPES_H_

#include <string.h> // memset()
#import <webp/types.h>
#include "./types.h"

#ifdef __cplusplus
extern "C" {
Expand Down
0 Extended/WebP.framework/Headers/types.h → ...s-arm64_armv7_armv7s/Headers/WebP/types.h
View file
Open in desktop
File renamed without changes.
Binary file added Extended/WebP.xcframework/ios-arm64_armv7_armv7s/libwebp.a
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...nded/WebPDemux.framework/Headers/decode.h → ...86_x86_64-simulator/Headers/WebP/decode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ WEBP_EXTERN uint8_t* WebPDecodeBGR(const uint8_t* data, size_t data_size,
// Upon return, the Y buffer has a stride returned as '*stride', while U and V
// have a common stride returned as '*uv_stride'.
// Return NULL in case of error.
// (*) Also named Y'CbCr. See: http://en.wikipedia.org/wiki/YCbCr
// (*) Also named Y'CbCr. See: https://en.wikipedia.org/wiki/YCbCr
WEBP_EXTERN uint8_t* WebPDecodeYUV(const uint8_t* data, size_t data_size,
int* width, int* height,
uint8_t** u, uint8_t** v,
Expand Down Expand Up @@ -453,7 +453,7 @@ struct WebPDecoderOptions {
int scaled_width, scaled_height; // final resolution
int use_threads; // if true, use multi-threaded decoding
int dithering_strength; // dithering strength (0=Off, 100=full)
int flip; // flip output vertically
int flip; // if true, flip output vertically
int alpha_dithering_strength; // alpha dithering strength in [0..100]

uint32_t pad[5]; // padding for later use
Expand Down
4 changes: 2 additions & 2 deletions Extended/WebPDemux.framework/Headers/demux.h → ...386_x86_64-simulator/Headers/WebP/demux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
#ifndef WEBP_WEBP_DEMUX_H_
#define WEBP_WEBP_DEMUX_H_

#import <WebP/decode.h> // for WEBP_CSP_MODE
#import <WebPDemux/mux_types.h>
#include "./decode.h" // for WEBP_CSP_MODE
#include "./mux_types.h"

#ifdef __cplusplus
extern "C" {
Expand Down
10 changes: 8 additions & 2 deletions Extended/libwebp/src/webp/encode.h → ...86_x86_64-simulator/Headers/WebP/encode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef WEBP_WEBP_ENCODE_H_
#define WEBP_WEBP_ENCODE_H_

#import <webp/types.h>
#include "./types.h"

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -148,7 +148,8 @@ struct WebPConfig {
int use_delta_palette; // reserved for future lossless feature
int use_sharp_yuv; // if needed, use sharp (and slow) RGB->YUV conversion

uint32_t pad[2]; // padding for later use
int qmin; // minimum permissible quality factor
int qmax; // maximum permissible quality factor
};

// Enumerate some predefined settings for WebPConfig, depending on the type
Expand Down Expand Up @@ -291,6 +292,11 @@ typedef enum WebPEncodingError {
#define WEBP_MAX_DIMENSION 16383

// Main exchange structure (input samples, output bytes, statistics)
//
// Once WebPPictureInit() has been called, it's ok to make all the INPUT fields
// (use_argb, y/u/v, argb, ...) point to user-owned data, even if
// WebPPictureAlloc() has been called. Depending on the value use_argb,
// it's guaranteed that either *argb or *y/*u/*v content will be kept untouched.
struct WebPPicture {
// INPUT
//////////////
Expand Down
Loading