Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cba7b91
Just a test so far
garrettmoon Sep 14, 2017
9290647
Separating GIF and WebP machinery
garrettmoon Sep 17, 2017
929e0ff
It's alive!
garrettmoon Sep 17, 2017
d5f3f01
Use iter width and height instead.
garrettmoon Sep 17, 2017
a705c02
Caching works!
garrettmoon Sep 18, 2017
aef6771
Need 2 frames to keep ahead by one.
garrettmoon Sep 18, 2017
a6ed55e
A bunch of TODO'ns
garrettmoon Sep 20, 2017
332c15e
Ensure CGImageRef isn't released underneath us.
garrettmoon Sep 20, 2017
dd1ccd3
Refactored to make it easier to handle memory warnings in PINCachedAn…
garrettmoon Sep 22, 2017
29860b4
Fix up warnings
garrettmoon Sep 22, 2017
ea2cbf1
Last todos todone.
garrettmoon Sep 22, 2017
ef0f5c9
Update CHANGELOG
garrettmoon Sep 22, 2017
5535bb6
Fix tvOS
garrettmoon Sep 23, 2017
ddbe896
Fix macOS
garrettmoon Sep 23, 2017
da17284
Clean up appleTV project, disable analyzer on webp file.
garrettmoon Sep 23, 2017
a10025a
Fixes a dumb retain cycle
garrettmoon Sep 26, 2017
349be19
Decode frames serially, fix cleaning up frames
garrettmoon Sep 26, 2017
2fc02e3
Now works with non-key frames
garrettmoon Sep 27, 2017
ec99a2d
Remove debugging code
garrettmoon Sep 27, 2017
3225775
Fix test
garrettmoon Sep 28, 2017
3a6d33d
GIFs aren't served decoded :/
garrettmoon Sep 29, 2017
2db40e4
Clear out coverImage on cache clear
garrettmoon Sep 29, 2017
daa3fab
Fix mac support
garrettmoon Sep 29, 2017
4c5ac08
Fix analyzer errors
garrettmoon Sep 30, 2017
d95e7be
Fix up analyzer errors
garrettmoon Oct 2, 2017
9bd4ffa
Clean up. Thanks @nguyenhuy!
garrettmoon Oct 4, 2017
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## master
* Add your own contributions to the next release on the line below this with your name.
- [new] Support for webp and improved support for GIFs. [garrettmoon](https://github.com/garrettmoon)
- [new] Added back tvOS support through a new target [#408](https://github.com/pinterest/PINRemoteImage/pull/408) [jverdi](https://github.com/jverdi)
- [refactor] Refactor out KVO on NSURLSessionTask to avoid Apple crashes. [#410](htts://github.com/garrettmoon)

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1"
git "https://chromium.googlesource.com/webm/libwebp" "v0.6.0"
github "pinterest/PINCache" "3.0.1-beta.5"
github "pinterest/PINOperation"
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "pinterest/PINOperation" "1.0.3"
git "https://chromium.googlesource.com/webm/libwebp" "v0.5.1"
git "https://chromium.googlesource.com/webm/libwebp" "v0.6.0"
github "pinterest/PINCache" "3.0.1-beta.5"
github "pinterest/PINOperation" "1.0.3"
5 changes: 5 additions & 0 deletions Carthage/Checkouts/libwebp/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Makefile.in
examples/anim_diff
examples/[cdv]webp
examples/gif2webp
examples/img2webp
examples/webpmux
src/webp/config.h*
src/webp/stamp-h1
Expand All @@ -34,3 +35,7 @@ src/webp/stamp-h1
CMakeCache.txt
CMakeFiles/
cmake_install.cmake
.gradle
/build
extras/get_disto
extras/webp_quality
1 change: 1 addition & 0 deletions Carthage/Checkouts/libwebp/.mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ Vikas Arora <vikasa@google.com>
<vrabaud@google.com> <vincent.rabaud@gmail.com>
Tamar Levy <tamar.levy@intel.com>
<qrczak@google.com> <qrczak>
Hui Su <huisu@google.com>
3 changes: 3 additions & 0 deletions Carthage/Checkouts/libwebp/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ Contributors:
- Charles Munger (clm at google dot com)
- Christian Duvivier (cduvivier at google dot com)
- Djordje Pesut (djordje dot pesut at imgtec dot com)
- Hui Su (huisu at google dot com)
- James Zern (jzern at google dot com)
- Jan Engelhardt (jengelh at medozas dot de)
- Jehan (jehan at girinstud dot io)
- Johann (johann dot koenig at duck dot com)
- Jovan Zelincevic (jovan dot zelincevic at imgtec dot com)
- Jyrki Alakuijala (jyrki at google dot com)
Expand All @@ -16,6 +18,7 @@ Contributors:
- Mislav Bradac (mislavm at google dot com)
- Nico Weber (thakis at chromium dot org)
- Noel Chromium (noel at chromium dot org)
- Owen Rodley (orodley at google dot com)
- Parag Salasakar (img dot mips1 at gmail dot com)
- Pascal Massimino (pascal dot massimino at gmail dot com)
- Paweł Hajdan, Jr (phajdan dot jr at chromium dot org)
Expand Down
100 changes: 56 additions & 44 deletions Carthage/Checkouts/libwebp/Android.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
LOCAL_PATH := $(call my-dir)

WEBP_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD
WEBP_CFLAGS += -fvisibility=hidden

ifeq ($(APP_OPTIM),release)
WEBP_CFLAGS += -finline-functions -ffast-math \
Expand All @@ -21,16 +22,16 @@ else
endif

dec_srcs := \
src/dec/alpha.c \
src/dec/buffer.c \
src/dec/frame.c \
src/dec/idec.c \
src/dec/io.c \
src/dec/quant.c \
src/dec/tree.c \
src/dec/vp8.c \
src/dec/vp8l.c \
src/dec/webp.c \
src/dec/alpha_dec.c \
src/dec/buffer_dec.c \
src/dec/frame_dec.c \
src/dec/idec_dec.c \
src/dec/io_dec.c \
src/dec/quant_dec.c \
src/dec/tree_dec.c \
src/dec/vp8_dec.c \
src/dec/vp8l_dec.c \
src/dec/webp_dec.c \

demux_srcs := \
src/demux/anim_decode.c \
Expand All @@ -39,6 +40,7 @@ demux_srcs := \
dsp_dec_srcs := \
src/dsp/alpha_processing.c \
src/dsp/alpha_processing_mips_dsp_r2.c \
src/dsp/alpha_processing_neon.$(NEON) \
src/dsp/alpha_processing_sse2.c \
src/dsp/alpha_processing_sse41.c \
src/dsp/argb.c \
Expand All @@ -55,18 +57,23 @@ dsp_dec_srcs := \
src/dsp/dec_sse41.c \
src/dsp/filters.c \
src/dsp/filters_mips_dsp_r2.c \
src/dsp/filters_msa.c \
src/dsp/filters_neon.$(NEON) \
src/dsp/filters_sse2.c \
src/dsp/lossless.c \
src/dsp/lossless_mips_dsp_r2.c \
src/dsp/lossless_msa.c \
src/dsp/lossless_neon.$(NEON) \
src/dsp/lossless_sse2.c \
src/dsp/rescaler.c \
src/dsp/rescaler_mips32.c \
src/dsp/rescaler_mips_dsp_r2.c \
src/dsp/rescaler_msa.c \
src/dsp/rescaler_neon.$(NEON) \
src/dsp/rescaler_sse2.c \
src/dsp/upsampling.c \
src/dsp/upsampling_mips_dsp_r2.c \
src/dsp/upsampling_msa.c \
src/dsp/upsampling_neon.$(NEON) \
src/dsp/upsampling_sse2.c \
src/dsp/yuv.c \
Expand All @@ -83,39 +90,42 @@ dsp_enc_srcs := \
src/dsp/enc_avx2.c \
src/dsp/enc_mips32.c \
src/dsp/enc_mips_dsp_r2.c \
src/dsp/enc_msa.c \
src/dsp/enc_neon.$(NEON) \
src/dsp/enc_sse2.c \
src/dsp/enc_sse41.c \
src/dsp/lossless_enc.c \
src/dsp/lossless_enc_mips32.c \
src/dsp/lossless_enc_mips_dsp_r2.c \
src/dsp/lossless_enc_msa.c \
src/dsp/lossless_enc_neon.$(NEON) \
src/dsp/lossless_enc_sse2.c \
src/dsp/lossless_enc_sse41.c \

enc_srcs := \
src/enc/alpha.c \
src/enc/analysis.c \
src/enc/backward_references.c \
src/enc/config.c \
src/enc/cost.c \
src/enc/delta_palettization.c \
src/enc/filter.c \
src/enc/frame.c \
src/enc/histogram.c \
src/enc/iterator.c \
src/enc/near_lossless.c \
src/enc/picture.c \
src/enc/picture_csp.c \
src/enc/picture_psnr.c \
src/enc/picture_rescale.c \
src/enc/picture_tools.c \
src/enc/quant.c \
src/enc/syntax.c \
src/enc/token.c \
src/enc/tree.c \
src/enc/vp8l.c \
src/enc/webpenc.c \
src/enc/alpha_enc.c \
src/enc/analysis_enc.c \
src/enc/backward_references_enc.c \
src/enc/config_enc.c \
src/enc/cost_enc.c \
src/enc/delta_palettization_enc.c \
src/enc/filter_enc.c \
src/enc/frame_enc.c \
src/enc/histogram_enc.c \
src/enc/iterator_enc.c \
src/enc/near_lossless_enc.c \
src/enc/picture_enc.c \
src/enc/picture_csp_enc.c \
src/enc/picture_psnr_enc.c \
src/enc/picture_rescale_enc.c \
src/enc/picture_tools_enc.c \
src/enc/predictor_enc.c \
src/enc/quant_enc.c \
src/enc/syntax_enc.c \
src/enc/token_enc.c \
src/enc/tree_enc.c \
src/enc/vp8l_enc.c \
src/enc/webp_enc.c \

mux_srcs := \
src/mux/anim_encode.c \
Expand All @@ -124,20 +134,20 @@ mux_srcs := \
src/mux/muxread.c \

utils_dec_srcs := \
src/utils/bit_reader.c \
src/utils/color_cache.c \
src/utils/filters.c \
src/utils/huffman.c \
src/utils/quant_levels_dec.c \
src/utils/random.c \
src/utils/rescaler.c \
src/utils/thread.c \
src/utils/bit_reader_utils.c \
src/utils/color_cache_utils.c \
src/utils/filters_utils.c \
src/utils/huffman_utils.c \
src/utils/quant_levels_dec_utils.c \
src/utils/random_utils.c \
src/utils/rescaler_utils.c \
src/utils/thread_utils.c \
src/utils/utils.c \

utils_enc_srcs := \
src/utils/bit_writer.c \
src/utils/huffman_encode.c \
src/utils/quant_levels.c \
src/utils/bit_writer_utils.c \
src/utils/huffman_encode_utils.c \
src/utils/quant_levels_utils.c \

################################################################################
# libwebpdecoder
Expand Down Expand Up @@ -247,7 +257,9 @@ endif

################################################################################

include $(LOCAL_PATH)/examples/Android.mk
WEBP_SRC_PATH := $(LOCAL_PATH)
include $(WEBP_SRC_PATH)/imageio/Android.mk
include $(WEBP_SRC_PATH)/examples/Android.mk

ifeq ($(USE_CPUFEATURES),yes)
$(call import-module,android/cpufeatures)
Expand Down
Loading