Commit 6291dd4c authored by John Koleszar's avatar John Koleszar

Fix compilation with -werror

Fix a last few warnings with multithread, arm, 32 bit

Change-Id: Ic7c67616c370d0ff87562a232fb1e5df0702dc86
parent 5daaa838
...@@ -849,10 +849,10 @@ int vp8_decode_frame(VP8D_COMP *pbi) ...@@ -849,10 +849,10 @@ int vp8_decode_frame(VP8D_COMP *pbi)
#endif #endif
#if CONFIG_MULTITHREAD #if CONFIG_MULTITHREAD
if (pbi->b_multithreaded_rd) if (pbi->b_multithreaded_rd)
vp8mt_alloc_temp_buffers(pbi, pc->Width, prev_mb_rows); vp8mt_alloc_temp_buffers(pbi, pc->Width, prev_mb_rows);
#else
(void)prev_mb_rows;
#endif #endif
frame_size_change = 1; frame_size_change = 1;
} }
......
...@@ -57,10 +57,6 @@ extern unsigned int vp8_get_processor_freq(); ...@@ -57,10 +57,6 @@ extern unsigned int vp8_get_processor_freq();
extern void print_tree_update_probs(); extern void print_tree_update_probs();
extern void vp8cx_create_encoder_threads(VP8_COMP *cpi); extern void vp8cx_create_encoder_threads(VP8_COMP *cpi);
extern void vp8cx_remove_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); int vp8_estimate_entropy_savings(VP8_COMP *cpi);
......
...@@ -8,16 +8,13 @@ ...@@ -8,16 +8,13 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "vpx_rtcd.h"
#include "vpx_scale/yv12config.h" extern void vp8_yv12_copy_frame_func_neon(struct yv12_buffer_config *src_ybc,
#include "vpx_mem/vpx_mem.h" struct yv12_buffer_config *dst_ybc);
#include "vpx_scale/vpxscale.h"
extern void vp8_yv12_copy_frame_func_neon(YV12_BUFFER_CONFIG *src_ybc, void vp8_yv12_copy_frame_neon(struct yv12_buffer_config *src_ybc,
YV12_BUFFER_CONFIG *dst_ybc); struct yv12_buffer_config *dst_ybc)
void vp8_yv12_copy_frame_neon(YV12_BUFFER_CONFIG *src_ybc,
YV12_BUFFER_CONFIG *dst_ybc)
{ {
vp8_yv12_copy_frame_func_neon(src_ybc, dst_ybc); vp8_yv12_copy_frame_func_neon(src_ybc, dst_ybc);
......
...@@ -54,11 +54,7 @@ typedef __int64 off_t; ...@@ -54,11 +54,7 @@ typedef __int64 off_t;
#define off_t off64_t #define off_t off64_t
#endif #endif
#if defined(_MSC_VER) #define LITERALU64(hi,lo) ((((uint64_t)hi)<<32)|lo)
#define LITERALU64(n) n
#else
#define LITERALU64(n) n##LLU
#endif
/* We should use 32-bit file operations in WebM file format /* We should use 32-bit file operations in WebM file format
* when building ARM executable file (.axf) with RVCT */ * when building ARM executable file (.axf) with RVCT */
...@@ -68,6 +64,22 @@ typedef long off_t; ...@@ -68,6 +64,22 @@ typedef long off_t;
#define ftello ftell #define ftello ftell
#endif #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 char *exec_name;
static const struct codec_item static const struct codec_item
...@@ -599,7 +611,7 @@ Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc, ...@@ -599,7 +611,7 @@ Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc,
{ {
/* todo this is always taking 8 bytes, this may need later optimization */ /* todo this is always taking 8 bytes, this may need later optimization */
/* this is a key that says length unknown */ /* this is a key that says length unknown */
uint64_t unknownLen = 0x01FFFFFFFFFFFFFF; uint64_t unknownLen = LITERALU64(0x01FFFFFF, 0xFFFFFFFF);
Ebml_WriteID(glob, class_id); Ebml_WriteID(glob, class_id);
*ebmlLoc = ftello(glob->stream); *ebmlLoc = ftello(glob->stream);
...@@ -617,7 +629,7 @@ Ebml_EndSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc) ...@@ -617,7 +629,7 @@ Ebml_EndSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc)
/* Calculate the size of this element */ /* Calculate the size of this element */
size = pos - *ebmlLoc - 8; size = pos - *ebmlLoc - 8;
size |= 0x0100000000000000; size |= LITERALU64(0x01000000,0x00000000);
/* Seek back to the beginning of the element and write the new size */ /* Seek back to the beginning of the element and write the new size */
fseeko(glob->stream, *ebmlLoc, SEEK_SET); fseeko(glob->stream, *ebmlLoc, SEEK_SET);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment