]> granicus.if.org Git - libvpx/commitdiff
vp9: normalize vpx_enc_frame_flags_t usage
authorJames Zern <jzern@google.com>
Fri, 5 Aug 2016 06:24:18 +0000 (23:24 -0700)
committerJames Zern <jzern@google.com>
Fri, 5 Aug 2016 06:37:49 +0000 (23:37 -0700)
quiets -Wshorten-64-to-32 warnings

Change-Id: Ice037acb675d1d81bfedf2dfcfa91a8a29a19dfd

vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.h
vp9/encoder/vp9_lookahead.c
vp9/encoder/vp9_lookahead.h

index 6de366c5bcf6ac780243ab76ff838d6efb8ac44c..421fcd11560793caaf431cfad8a67c471f822ecd 100644 (file)
@@ -4051,7 +4051,7 @@ static void check_initial_width(VP9_COMP *cpi,
   }
 }
 
-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;
index b6d7cabade63d003d64fd126f11bb0f2ee81b26a..1abfaced6423f87a85e828123e0a40615a340f2b 100644 (file)
@@ -602,7 +602,7 @@ void vp9_change_config(VP9_COMP *cpi, const VP9EncoderConfig *oxcf);
 
 // 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);
 
index bfcb2ae8538f6b202b2912a0f1ad0b048d1f2773..392cd5d418a15ef298da08d5db01c47cea6fa7f9 100644 (file)
@@ -87,7 +87,7 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
 #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;
index 413c894d798f74775b02d77c6172b52cc1e34795..88be0ffcd58fffe24a600013e982b8143716ad9b 100644 (file)
 #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 @@ struct lookahead_entry {
   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 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
 #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
  *