shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9: normalize vpx_enc_frame_flags_t usage

quiets -Wshorten-64-to-32 warnings

Change-Id: Ice037acb675d1d81bfedf2dfcfa91a8a29a19dfd

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -4051,7 +4051,7 @@

   }

 }

-int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags,

+int vp9_receive_raw_frame(VP9_COMP *cpi, vpx_enc_frame_flags_t frame_flags,

                           YV12_BUFFER_CONFIG *sd, int64_t time_stamp,

                           int64_t end_time) {

   VP9_COMMON *const cm = &cpi->common;

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -602,7 +602,7 @@

 // receive a frames worth of data. caller can assume that a copy of this

 // frame is made and not just a copy of the pointer..

-int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags,

+int vp9_receive_raw_frame(VP9_COMP *cpi, vpx_enc_frame_flags_t frame_flags,

                           YV12_BUFFER_CONFIG *sd, int64_t time_stamp,

                           int64_t end_time_stamp);

--- a/vp9/encoder/vp9_lookahead.c

+++ b/vp9/encoder/vp9_lookahead.c

@@ -87,7 +87,7 @@

 #if CONFIG_VP9_HIGHBITDEPTH

                        int use_highbitdepth,

 #endif

-                       unsigned int flags) {

+                       vpx_enc_frame_flags_t flags) {

   struct lookahead_entry *buf;

 #if USE_PARTIAL_COPY

   int row, col, active_end;

--- a/vp9/encoder/vp9_lookahead.h

+++ b/vp9/encoder/vp9_lookahead.h

@@ -12,11 +12,11 @@

 #define VP9_ENCODER_VP9_LOOKAHEAD_H_

 #include "vpx_scale/yv12config.h"

+#include "vpx/vpx_encoder.h"

 #include "vpx/vpx_integer.h"

 #if CONFIG_SPATIAL_SVC

 #include "vpx/vp8cx.h"

-#include "vpx/vpx_encoder.h"

 #endif

 #ifdef __cplusplus

@@ -29,7 +29,7 @@

   YV12_BUFFER_CONFIG img;

   int64_t ts_start;

   int64_t ts_end;

-  unsigned int flags;

+  vpx_enc_frame_flags_t flags;

 };

 // The max of past frames we want to keep in the queue.

@@ -81,7 +81,7 @@

 #if CONFIG_VP9_HIGHBITDEPTH

                        int use_highbitdepth,

 #endif

-                       unsigned int flags);

+                       vpx_enc_frame_flags_t flags);

 /**\brief Get the next source buffer to encode

  *