Clean up Starboardization from WebP (youtube#3867)

Removes obsolete POEMs and reverts non-functional changes from upstream. Test-On-Device: true b/190053624
kaidokert · Jul 22, 2024 · c94c530 · c94c530
1 parent cec7a29
commit c94c530
Show file tree

Hide file tree

Showing 56 changed files with 12 additions and 210 deletions.
diff --git a/third_party/libwebp/src/dec/alpha_dec.c b/third_party/libwebp/src/dec/alpha_dec.c
@@ -11,10 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <stdlib.h>
 #include "src/dec/alphai_dec.h"
 #include "src/dec/vp8i_dec.h"

diff --git a/third_party/libwebp/src/dec/buffer_dec.c b/third_party/libwebp/src/dec/buffer_dec.c
@@ -11,10 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <stdlib.h>
 
 #include "src/dec/vp8i_dec.h"

diff --git a/third_party/libwebp/src/dec/frame_dec.c b/third_party/libwebp/src/dec/frame_dec.c
@@ -11,10 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <stdlib.h>
 #include "src/dec/vp8i_dec.h"
 #include "src/utils/utils.h"

diff --git a/third_party/libwebp/src/dec/idec_dec.c b/third_party/libwebp/src/dec/idec_dec.c
@@ -11,11 +11,7 @@
 //
 // Author: [email protected] (Somnath Banerjee)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/third_party/libwebp/src/dec/io_dec.c b/third_party/libwebp/src/dec/io_dec.c
@@ -11,11 +11,7 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <stdlib.h>
 #include "src/dec/vp8i_dec.h"
 #include "src/dec/webpi_dec.h"

diff --git a/third_party/libwebp/src/dec/vp8_dec.c b/third_party/libwebp/src/dec/vp8_dec.c
@@ -11,10 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <stdlib.h>
 
 #include "src/dec/alphai_dec.h"

diff --git a/third_party/libwebp/src/dec/vp8i_dec.h b/third_party/libwebp/src/dec/vp8i_dec.h
@@ -14,10 +14,7 @@
 #ifndef WEBP_DEC_VP8I_DEC_H_
 #define WEBP_DEC_VP8I_DEC_H_
 
-#if !defined(STARBOARD)
 #include <string.h>     // for memcpy()
-#endif
-
 #include "src/dec/common_dec.h"
 #include "src/dec/vp8li_dec.h"
 #include "src/utils/bit_reader_utils.h"

diff --git a/third_party/libwebp/src/dec/vp8l_dec.c b/third_party/libwebp/src/dec/vp8l_dec.c
@@ -12,10 +12,6 @@
 // Authors: Vikas Arora ([email protected])
 //          Jyrki Alakuijala ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <stdlib.h>
 
 #include "src/dec/alphai_dec.h"

diff --git a/third_party/libwebp/src/dec/vp8li_dec.h b/third_party/libwebp/src/dec/vp8li_dec.h
@@ -15,9 +15,7 @@
 #ifndef WEBP_DEC_VP8LI_DEC_H_
 #define WEBP_DEC_VP8LI_DEC_H_
 
-#if !defined(STARBOARD)
 #include <string.h>     // for memcpy()
-#endif
 #include "src/dec/webpi_dec.h"
 #include "src/utils/bit_reader_utils.h"
 #include "src/utils/color_cache_utils.h"

diff --git a/third_party/libwebp/src/dec/webp_dec.c b/third_party/libwebp/src/dec/webp_dec.c
@@ -11,10 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <stdlib.h>
 
 #include "src/dec/vp8i_dec.h"

diff --git a/third_party/libwebp/src/demux/anim_decode.c b/third_party/libwebp/src/demux/anim_decode.c
@@ -14,11 +14,7 @@
 #include "src/webp/config.h"
 #endif
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <string.h>
 
 #include "src/utils/utils.h"

diff --git a/third_party/libwebp/src/dsp/cost.c b/third_party/libwebp/src/dsp/cost.c
@@ -9,12 +9,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
-#include <stdlib.h>
-
 #include "src/dsp/dsp.h"
 #include "src/enc/cost_enc.h"
 

diff --git a/third_party/libwebp/src/dsp/cost_mips32.c b/third_party/libwebp/src/dsp/cost_mips32.c
@@ -13,12 +13,6 @@
 
 #if defined(WEBP_USE_MIPS32)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
-#include <stdlib.h>
-
 #include "src/enc/cost_enc.h"
 
 static int GetResidualCost_MIPS32(int ctx0, const VP8Residual* const res) {

diff --git a/third_party/libwebp/src/dsp/cost_mips_dsp_r2.c b/third_party/libwebp/src/dsp/cost_mips_dsp_r2.c
@@ -13,12 +13,6 @@
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
-#include <stdlib.h>
-
 #include "src/enc/cost_enc.h"
 
 static int GetResidualCost_MIPSdspR2(int ctx0, const VP8Residual* const res) {

diff --git a/third_party/libwebp/src/dsp/cost_neon.c b/third_party/libwebp/src/dsp/cost_neon.c
@@ -13,10 +13,6 @@
 
 #if defined(WEBP_USE_NEON)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include "src/dsp/neon.h"
 #include "src/enc/cost_enc.h"
 

diff --git a/third_party/libwebp/src/dsp/cost_sse2.c b/third_party/libwebp/src/dsp/cost_sse2.c
@@ -15,9 +15,6 @@
 
 #if defined(WEBP_USE_SSE2)
 #include <emmintrin.h>
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
 
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"

diff --git a/third_party/libwebp/src/dsp/dec.c b/third_party/libwebp/src/dsp/dec.c
@@ -11,11 +11,8 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
+
 #include "src/dsp/dsp.h"
 #include "src/dec/vp8i_dec.h"
 #include "src/utils/utils.h"

diff --git a/third_party/libwebp/src/dsp/enc.c b/third_party/libwebp/src/dsp/enc.c
@@ -11,11 +11,7 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <stdlib.h>  // for abs()
 
 #include "src/dsp/dsp.h"

diff --git a/third_party/libwebp/src/dsp/enc_mips_dsp_r2.c b/third_party/libwebp/src/dsp/enc_mips_dsp_r2.c
@@ -16,8 +16,6 @@
 
 #if defined(WEBP_USE_MIPS_DSP_R2)
 
-#include <stdlib.h>
-
 #include "src/dsp/mips_macro.h"
 #include "src/enc/cost_enc.h"
 #include "src/enc/vp8i_enc.h"

diff --git a/third_party/libwebp/src/dsp/enc_sse2.c b/third_party/libwebp/src/dsp/enc_sse2.c
@@ -14,13 +14,9 @@
 #include "src/dsp/dsp.h"
 
 #if defined(WEBP_USE_SSE2)
-#include <emmintrin.h>
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <stdlib.h>  // for abs()
+#include <emmintrin.h>
 
 #include "src/dsp/common_sse2.h"
 #include "src/enc/cost_enc.h"

diff --git a/third_party/libwebp/src/dsp/enc_sse41.c b/third_party/libwebp/src/dsp/enc_sse41.c
@@ -15,7 +15,6 @@
 
 #if defined(WEBP_USE_SSE41)
 #include <smmintrin.h>
-
 #include <stdlib.h>  // for abs()
 
 #include "src/dsp/common_sse2.h"

diff --git a/third_party/libwebp/src/dsp/lossless.c b/third_party/libwebp/src/dsp/lossless.c
@@ -15,15 +15,9 @@
 
 #include "src/dsp/dsp.h"
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
 #include <math.h>
-#endif
-
 #include <stdlib.h>
-
 #include "src/dec/vp8li_dec.h"
 #include "src/utils/endian_inl_utils.h"
 #include "src/dsp/lossless.h"

diff --git a/third_party/libwebp/src/dsp/lossless_common.h b/third_party/libwebp/src/dsp/lossless_common.h
@@ -16,10 +16,6 @@
 #ifndef WEBP_DSP_LOSSLESS_COMMON_H_
 #define WEBP_DSP_LOSSLESS_COMMON_H_
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include "src/webp/types.h"
 
 #include "src/utils/utils.h"

diff --git a/third_party/libwebp/src/dsp/lossless_enc_mips32.c b/third_party/libwebp/src/dsp/lossless_enc_mips32.c
@@ -18,12 +18,8 @@
 
 #if defined(WEBP_USE_MIPS32)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
 #include <math.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/third_party/libwebp/src/dsp/rescaler.c b/third_party/libwebp/src/dsp/rescaler.c
@@ -11,11 +11,7 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 
 #include "src/dsp/dsp.h"
 #include "src/utils/rescaler_utils.h"

diff --git a/third_party/libwebp/src/dsp/upsampling_neon.c b/third_party/libwebp/src/dsp/upsampling_neon.c
@@ -16,11 +16,7 @@
 
 #if defined(WEBP_USE_NEON)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <arm_neon.h>
 #include <string.h>
 #include "src/dsp/neon.h"

diff --git a/third_party/libwebp/src/dsp/upsampling_sse2.c b/third_party/libwebp/src/dsp/upsampling_sse2.c
@@ -15,11 +15,7 @@
 
 #if defined(WEBP_USE_SSE2)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <emmintrin.h>
 #include <string.h>
 #include "src/dsp/yuv.h"

diff --git a/third_party/libwebp/src/dsp/upsampling_sse41.c b/third_party/libwebp/src/dsp/upsampling_sse41.c
@@ -15,11 +15,7 @@
 
 #if defined(WEBP_USE_SSE41)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include <smmintrin.h>
 #include <string.h>
 #include "src/dsp/yuv.h"

diff --git a/third_party/libwebp/src/enc/backward_references_enc.h b/third_party/libwebp/src/enc/backward_references_enc.h
@@ -15,10 +15,9 @@
 
 #if defined(STARBOARD)
 #include "starboard/common/log.h"
-#else
+#endif
 #include <assert.h>
 #include <stdlib.h>
-#endif
 #include "src/webp/types.h"
 #include "src/webp/encode.h"
 #include "src/webp/format_constants.h"

diff --git a/third_party/libwebp/src/enc/cost_enc.c b/third_party/libwebp/src/enc/cost_enc.c
@@ -11,8 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#include <stdlib.h>
-
 #include "src/enc/cost_enc.h"
 
 //------------------------------------------------------------------------------

diff --git a/third_party/libwebp/src/enc/cost_enc.h b/third_party/libwebp/src/enc/cost_enc.h
@@ -16,11 +16,9 @@
 
 #if defined(STARBOARD)
 #include "starboard/common/log.h"
-#else
+#endif
 #include <assert.h>
 #include <stdlib.h>
-#endif
-
 #include "src/enc/vp8i_enc.h"
 
 #ifdef __cplusplus

diff --git a/third_party/libwebp/src/enc/filter_enc.c b/third_party/libwebp/src/enc/filter_enc.c
@@ -11,11 +11,7 @@
 //
 // Author: [email protected] (Somnath Banerjee)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <assert.h>
-#endif
 #include "src/enc/vp8i_enc.h"
 #include "src/dsp/dsp.h"
 

diff --git a/third_party/libwebp/src/enc/frame_enc.c b/third_party/libwebp/src/enc/frame_enc.c
@@ -11,10 +11,6 @@
 //
 // Author: Skal ([email protected])
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
-
 #include <string.h>
 #include <math.h>
 

diff --git a/third_party/libwebp/src/enc/histogram_enc.c b/third_party/libwebp/src/enc/histogram_enc.c
@@ -14,11 +14,7 @@
 #endif
 
 #include <float.h>
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
 #include <math.h>
-#endif
 
 #include "src/dsp/lossless.h"
 #include "src/dsp/lossless_common.h"