generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compile warnings for target=armv7-android-gcc

Browse Source 
Fix compile warnings about implicit type conversion for
target=armv7-android-gcc in vpxenc.c.

BUG=webm:1348

Change-Id: I9fbabd843512f2a1a09f4bb934cd091e834eed9c
This commit is contained in:
Jerome Jiang 2016-12-20 16:49:42 -08:00
parent f27276f44f
commit 380a26112c
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools_common.h
View File

@ -26,11 +26,21 @@
/* MSVS uses _f{seek,tell}i64. */ /* MSVS uses _f{seek,tell}i64. */
#define fseeko _fseeki64 #define fseeko _fseeki64
#define ftello _ftelli64 #define ftello _ftelli64
typedef int64_t FileOffset;
#elif defined(_WIN32) #elif defined(_WIN32)
/* MinGW uses f{seek,tell}o64 for large files. */ /* MinGW uses f{seek,tell}o64 for large files. */
#define fseeko fseeko64 #define fseeko fseeko64
#define ftello ftello64 #define ftello ftello64
#endif /* _WIN32 */ typedef off64_t FileOffset;
#elif CONFIG_OS_SUPPORT
typedef off_t FileOffset;
/* Use 32-bit file operations in WebM file format when building ARM
* executables (.axf) with RVCT. */
#else
#define fseeko fseek
#define ftello ftell
typedef long FileOffset /* NOLINT */
#endif /* CONFIG_OS_SUPPORT */
#if CONFIG_OS_SUPPORT #if CONFIG_OS_SUPPORT
#if defined(_MSC_VER) #if defined(_MSC_VER)
@ -42,13 +52,6 @@
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#endif /* CONFIG_OS_SUPPORT */ #endif /* CONFIG_OS_SUPPORT */
/* Use 32-bit file operations in WebM file format when building ARM
* executables (.axf) with RVCT. */
#if !CONFIG_OS_SUPPORT
#define fseeko fseek
#define ftello ftell
#endif /* CONFIG_OS_SUPPORT */
#define LITERALU64(hi, lo) ((((uint64_t)hi) << 32) | lo) #define LITERALU64(hi, lo) ((((uint64_t)hi) << 32) | lo)
#ifndef PATH_MAX #ifndef PATH_MAX

4
vpxenc.c
View File

@ -1657,7 +1657,7 @@ static void get_cx_data(struct stream_state *stream,
*got_data = 0; *got_data = 0;
while ((pkt = vpx_codec_get_cx_data(&stream->encoder, &iter))) { while ((pkt = vpx_codec_get_cx_data(&stream->encoder, &iter))) {
static size_t fsize = 0; static size_t fsize = 0;
static int64_t ivf_header_pos = 0; static FileOffset ivf_header_pos = 0;
switch (pkt->kind) { switch (pkt->kind) {
case VPX_CODEC_CX_FRAME_PKT: case VPX_CODEC_CX_FRAME_PKT:
@ -1683,7 +1683,7 @@ static void get_cx_data(struct stream_state *stream,
fsize += pkt->data.frame.sz; fsize += pkt->data.frame.sz;
if (!(pkt->data.frame.flags & VPX_FRAME_IS_FRAGMENT)) { if (!(pkt->data.frame.flags & VPX_FRAME_IS_FRAGMENT)) {
const int64_t currpos = ftello(stream->file); const FileOffset currpos = ftello(stream->file);
fseeko(stream->file, ivf_header_pos, SEEK_SET); fseeko(stream->file, ivf_header_pos, SEEK_SET);
ivf_write_frame_size(stream->file, fsize); ivf_write_frame_size(stream->file, fsize);
fseeko(stream->file, currpos, SEEK_SET); fseeko(stream->file, currpos, SEEK_SET);