diff options
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encoder.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_lookahead.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_lookahead.h | 6 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 9 |
5 files changed, 15 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 6de366c5b..421fcd115 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -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; diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index b6d7cabad..1abfaced6 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -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); diff --git a/vp9/encoder/vp9_lookahead.c b/vp9/encoder/vp9_lookahead.c index bfcb2ae85..392cd5d41 100644 --- a/vp9/encoder/vp9_lookahead.c +++ b/vp9/encoder/vp9_lookahead.c @@ -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; diff --git a/vp9/encoder/vp9_lookahead.h b/vp9/encoder/vp9_lookahead.h index 413c894d7..88be0ffcd 100644 --- 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 @@ 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 * diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index a3ef5e5db..707dd5bfb 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1958,6 +1958,10 @@ static int64_t rd_pick_best_sub8x8_mode( MV mvp_full; int max_mv; int cost_list[5]; + int tmp_col_min = x->mv_col_min; + int tmp_col_max = x->mv_col_max; + int tmp_row_min = x->mv_row_min; + int tmp_row_max = x->mv_row_max; /* Is the best so far sufficiently good that we cant justify doing * and new motion search. */ @@ -2005,6 +2009,11 @@ static int64_t rd_pick_best_sub8x8_mode( sf->mv.subpel_search_method != SUBPEL_TREE ? cost_list : NULL, &bsi->ref_mv[0]->as_mv, new_mv, INT_MAX, 1); + x->mv_col_min = tmp_col_min; + x->mv_col_max = tmp_col_max; + x->mv_row_min = tmp_row_min; + x->mv_row_max = tmp_row_max; + if (bestsme < UINT_MAX) { uint32_t distortion; cpi->find_fractional_mv_step( |