source/libvpx/vp9/encoder/vp9_mcomp.h - Issue 168343002: libvpx: Pull from upstream

Unified Diff: source/libvpx/vp9/encoder/vp9_mcomp.h

Issue 168343002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/

Patch Set: libvpx: Pull from upstream Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/libvpx/vp9/encoder/vp9_mcomp.h

===================================================================

--- source/libvpx/vp9/encoder/vp9_mcomp.h (revision 251189)

+++ source/libvpx/vp9/encoder/vp9_mcomp.h (working copy)

@@ -45,10 +45,10 @@

int vp9_full_pixel_diamond(struct VP9_COMP *cpi, MACROBLOCK *x,

MV *mvp_full, int step_param,

int sadpb, int further_steps, int do_refine,

- vp9_variance_fn_ptr_t *fn_ptr,

- const MV *ref_mv, int_mv *dst_mv);

+ const vp9_variance_fn_ptr_t *fn_ptr,

+ const MV *ref_mv, MV *dst_mv);

-int vp9_hex_search(MACROBLOCK *x,

+int vp9_hex_search(const MACROBLOCK *x,

MV *ref_mv,

int search_param,

int error_per_bit,

@@ -57,7 +57,7 @@

int use_mvcost,

const MV *center_mv,

MV *best_mv);

-int vp9_bigdia_search(MACROBLOCK *x,

+int vp9_bigdia_search(const MACROBLOCK *x,

MV *ref_mv,

int search_param,

int error_per_bit,

@@ -66,7 +66,7 @@

int use_mvcost,

const MV *center_mv,

MV *best_mv);

-int vp9_square_search(MACROBLOCK *x,

+int vp9_square_search(const MACROBLOCK *x,

MV *ref_mv,

int search_param,

int error_per_bit,

@@ -77,7 +77,7 @@

MV *best_mv);

typedef int (fractional_mv_step_fp) (

- MACROBLOCK *x,

+ const MACROBLOCK *x,

MV *bestmv, const MV *ref_mv,

int allow_hp,

int error_per_bit,

@@ -92,7 +92,7 @@

extern fractional_mv_step_fp vp9_find_best_sub_pixel_tree;

typedef int (fractional_mv_step_comp_fp) (

- MACROBLOCK *x,

+ const MACROBLOCK *x,

MV *bestmv, const MV *ref_mv,

int allow_hp,

int error_per_bit,

@@ -106,30 +106,32 @@

extern fractional_mv_step_comp_fp vp9_find_best_sub_pixel_comp_tree;

-typedef int (*vp9_full_search_fn_t)(MACROBLOCK *x,

- MV *ref_mv, int sad_per_bit,

- int distance, vp9_variance_fn_ptr_t *fn_ptr,

+typedef int (*vp9_full_search_fn_t)(const MACROBLOCK *x,

+ const MV *ref_mv, int sad_per_bit,

+ int distance,

+ const vp9_variance_fn_ptr_t *fn_ptr,

int *mvjcost, int *mvcost[2],

const MV *center_mv, int n);

typedef int (*vp9_refining_search_fn_t)(const MACROBLOCK *x,

MV *ref_mv, int sad_per_bit,

int distance,

- vp9_variance_fn_ptr_t *fn_ptr,

+ const vp9_variance_fn_ptr_t *fn_ptr,

int *mvjcost, int *mvcost[2],

const MV *center_mv);

-typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x,

+typedef int (*vp9_diamond_search_fn_t)(const MACROBLOCK *x,

MV *ref_mv, MV *best_mv,

int search_param, int sad_per_bit,

int *num00,

- vp9_variance_fn_ptr_t *fn_ptr,

+ const vp9_variance_fn_ptr_t *fn_ptr,

int *mvjcost, int *mvcost[2],

const MV *center_mv);

int vp9_refining_search_8p_c(const MACROBLOCK *x,

MV *ref_mv, int error_per_bit,

- int search_range, vp9_variance_fn_ptr_t *fn_ptr,

+ int search_range,

+ const vp9_variance_fn_ptr_t *fn_ptr,

int *mvjcost, int *mvcost[2],

const MV *center_mv, const uint8_t *second_pred,

int w, int h);

« no previous file with comments | « source/libvpx/vp9/encoder/vp9_mbgraph.c ('k') | source/libvpx/vp9/encoder/vp9_mcomp.c » ('j') | no next file with comments »