diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-13 16:42:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-13 16:42:54 -0800 |
| commit | 64cf3987131bf7ad1b19b7eb10cd2ceb5b0b7a1f (patch) | |
| tree | 4ecdc19554b14e6eb55d47be88865fadad5e7f95 /vp9/common | |
| parent | 33df4f04836545531be97f02542e5e03a424b86e (diff) | |
| parent | 25da21b14e83329a34bf8ebd1211be634ea9dd85 (diff) | |
| download | libvpx-64cf3987131bf7ad1b19b7eb10cd2ceb5b0b7a1f.tar libvpx-64cf3987131bf7ad1b19b7eb10cd2ceb5b0b7a1f.tar.gz libvpx-64cf3987131bf7ad1b19b7eb10cd2ceb5b0b7a1f.tar.bz2 libvpx-64cf3987131bf7ad1b19b7eb10cd2ceb5b0b7a1f.zip | |
Merge "Using MV struct instead of int_mv union in encoder."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_mv.h | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_rtcd_defs.sh | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/vp9/common/vp9_mv.h b/vp9/common/vp9_mv.h index 31a79b984..155c3f12e 100644 --- a/vp9/common/vp9_mv.h +++ b/vp9/common/vp9_mv.h @@ -15,7 +15,7 @@ #include "vp9/common/vp9_common.h" -typedef struct { +typedef struct mv { int16_t row; int16_t col; } MV; @@ -25,7 +25,7 @@ typedef union int_mv { MV as_mv; } int_mv; /* facilitates faster equality tests and copies */ -typedef struct { +typedef struct mv32 { int32_t row; int32_t col; } MV32; diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index 19d5fc37d..727f5c437 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -14,6 +14,7 @@ struct macroblock; struct vp9_variance_vtable; #define DEC_MVCOSTS int *mvjcost, int *mvcost[2] +struct mv; union int_mv; struct yv12_buffer_config; EOF @@ -736,20 +737,20 @@ specialize vp9_fdct32x32_rd sse2 avx2 # # Motion search # -prototype int vp9_full_search_sad "struct macroblock *x, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv, int n" +prototype int vp9_full_search_sad "struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv, int n" specialize vp9_full_search_sad sse3 sse4_1 vp9_full_search_sad_sse3=vp9_full_search_sadx3 vp9_full_search_sad_sse4_1=vp9_full_search_sadx8 -prototype int vp9_refining_search_sad "struct macroblock *x, union int_mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" +prototype int vp9_refining_search_sad "struct macroblock *x, struct mv *ref_mv, int sad_per_bit, int distance, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv" specialize vp9_refining_search_sad sse3 vp9_refining_search_sad_sse3=vp9_refining_search_sadx4 -prototype int vp9_diamond_search_sad "struct macroblock *x, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" +prototype int vp9_diamond_search_sad "struct macroblock *x, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv" specialize vp9_diamond_search_sad sse3 vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4 -prototype int vp9_full_range_search "struct macroblock *x, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" +prototype int vp9_full_range_search "struct macroblock *x, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, struct vp9_variance_vtable *fn_ptr, DEC_MVCOSTS, const struct mv *center_mv" specialize vp9_full_range_search prototype void vp9_temporal_filter_apply "uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count" |