diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-03 13:30:50 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-03 13:30:50 -0500 |
| commit | 5e76dfcc70527b05c5106aef9b8aeffd64d21a17 (patch) | |
| tree | a0d40b33592af5aecc4f68fc0ab7b1acdee392db /vp8/encoder/onyx_int.h | |
| parent | 9c8ad79fdc8af25988dd071703a51d379f2849ce (diff) | |
| parent | 8d0f7a01e6727253df0d3c8625568bc39e83b6f4 (diff) | |
| download | libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.tar libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.tar.gz libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.tar.bz2 libvpx-5e76dfcc70527b05c5106aef9b8aeffd64d21a17.zip | |
Merge 'Add simple version of activity masking.'
Merge commit 'refs/changes/79/779/2' of
https://review.webmproject.org/p/libvpx
Conflicts:
vp8/encoder/encodeintra.c
vp8/encoder/encodemb.c
Change-Id: Id607063fabe92d99eeb3c380e8ca670b01bfb3ef
Diffstat (limited to 'vp8/encoder/onyx_int.h')
| -rw-r--r-- | vp8/encoder/onyx_int.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index 0eaba0017..1471c1dd0 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -321,6 +321,7 @@ typedef struct int mvcostmultiplier; int subseqblockweight; int errthresh; + unsigned int activity_avg; int RDMULT; int RDDIV ; @@ -676,6 +677,8 @@ void vp8_encode_frame(VP8_COMP *cpi); void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size); +unsigned int vp8_activity_masking(VP8_COMP *cpi, MACROBLOCK *x); + int rd_cost_intra_mb(MACROBLOCKD *x); void vp8_tokenize_mb(VP8_COMP *, MACROBLOCKD *, TOKENEXTRA **); |