Fix compilation with -werror
Fix a last few warnings with multithread, arm, 32 bit
Change-Id: Ic7c67616c370d0ff87562a232fb1e5df0702dc86
diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c
index 7cb9687..677e222 100644
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -849,10 +849,10 @@
#endif
#if CONFIG_MULTITHREAD
-
if (pbi->b_multithreaded_rd)
vp8mt_alloc_temp_buffers(pbi, pc->Width, prev_mb_rows);
-
+#else
+ (void)prev_mb_rows;
#endif
frame_size_change = 1;
}
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 968208e..d58e334 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -57,10 +57,6 @@
extern void print_tree_update_probs();
extern void vp8cx_create_encoder_threads(VP8_COMP *cpi);
extern void vp8cx_remove_encoder_threads(VP8_COMP *cpi);
-#if HAVE_NEON
-extern void vp8_yv12_copy_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-extern void vp8_yv12_copy_src_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc, YV12_BUFFER_CONFIG *dst_ybc);
-#endif
int vp8_estimate_entropy_savings(VP8_COMP *cpi);
diff --git a/vpx_scale/arm/neon/yv12extend_arm.c b/vpx_scale/arm/neon/yv12extend_arm.c
index 7529fc6..6f34ce3 100644
--- a/vpx_scale/arm/neon/yv12extend_arm.c
+++ b/vpx_scale/arm/neon/yv12extend_arm.c
@@ -8,16 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "vpx_rtcd.h"
-#include "vpx_scale/yv12config.h"
-#include "vpx_mem/vpx_mem.h"
-#include "vpx_scale/vpxscale.h"
+extern void vp8_yv12_copy_frame_func_neon(struct yv12_buffer_config *src_ybc,
+ struct yv12_buffer_config *dst_ybc);
-extern void vp8_yv12_copy_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc,
- YV12_BUFFER_CONFIG *dst_ybc);
-
-void vp8_yv12_copy_frame_neon(YV12_BUFFER_CONFIG *src_ybc,
- YV12_BUFFER_CONFIG *dst_ybc)
+void vp8_yv12_copy_frame_neon(struct yv12_buffer_config *src_ybc,
+ struct yv12_buffer_config *dst_ybc)
{
vp8_yv12_copy_frame_func_neon(src_ybc, dst_ybc);
diff --git a/vpxenc.c b/vpxenc.c
index be862f6..034644f 100644
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -54,11 +54,7 @@
#define off_t off64_t
#endif
-#if defined(_MSC_VER)
-#define LITERALU64(n) n
-#else
-#define LITERALU64(n) n##LLU
-#endif
+#define LITERALU64(hi,lo) ((((uint64_t)hi)<<32)|lo)
/* We should use 32-bit file operations in WebM file format
* when building ARM executable file (.axf) with RVCT */
@@ -68,6 +64,22 @@
#define ftello ftell
#endif
+/* Swallow warnings about unused results of fread/fwrite */
+static size_t wrap_fread(void *ptr, size_t size, size_t nmemb,
+ FILE *stream)
+{
+ return fread(ptr, size, nmemb, stream);
+}
+#define fread wrap_fread
+
+static size_t wrap_fwrite(const void *ptr, size_t size, size_t nmemb,
+ FILE *stream)
+{
+ return fwrite(ptr, size, nmemb, stream);
+}
+#define fwrite wrap_fwrite
+
+
static const char *exec_name;
static const struct codec_item
@@ -599,7 +611,7 @@
{
/* todo this is always taking 8 bytes, this may need later optimization */
/* this is a key that says length unknown */
- uint64_t unknownLen = 0x01FFFFFFFFFFFFFF;
+ uint64_t unknownLen = LITERALU64(0x01FFFFFF, 0xFFFFFFFF);
Ebml_WriteID(glob, class_id);
*ebmlLoc = ftello(glob->stream);
@@ -617,7 +629,7 @@
/* Calculate the size of this element */
size = pos - *ebmlLoc - 8;
- size |= 0x0100000000000000;
+ size |= LITERALU64(0x01000000,0x00000000);
/* Seek back to the beginning of the element and write the new size */
fseeko(glob->stream, *ebmlLoc, SEEK_SET);
