diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-12-04 00:05:07 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-12-04 00:05:08 -0500 |
| commit | 16724b7c9387e227e1c5020d2bcf833d303806f0 (patch) | |
| tree | 745d7738bb650285f63b0860f5f02836f4350c24 /vp8/encoder/onyx_int.h | |
| parent | ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c (diff) | |
| parent | 5e76dfcc70527b05c5106aef9b8aeffd64d21a17 (diff) | |
| download | libvpx-16724b7c9387e227e1c5020d2bcf833d303806f0.tar libvpx-16724b7c9387e227e1c5020d2bcf833d303806f0.tar.gz libvpx-16724b7c9387e227e1c5020d2bcf833d303806f0.tar.bz2 libvpx-16724b7c9387e227e1c5020d2bcf833d303806f0.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I11cd10dba54d0f3f96640dadc97199e5733f1888
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 **); |