diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-02-02 13:40:08 -0500 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2012-02-02 13:40:08 -0500 |
| commit | d8ebdcd89d5d19d283a73a2a81d3909b172e7e2d (patch) | |
| tree | de61d3dbebd989fd68d3154bfb0651d9171a2f26 /vp8/encoder/encodeframe.c | |
| parent | 11c706488b8d457cb808a8a7ff1358ae55d36649 (diff) | |
| download | libvpx-d8ebdcd89d5d19d283a73a2a81d3909b172e7e2d.tar libvpx-d8ebdcd89d5d19d283a73a2a81d3909b172e7e2d.tar.gz libvpx-d8ebdcd89d5d19d283a73a2a81d3909b172e7e2d.tar.bz2 libvpx-d8ebdcd89d5d19d283a73a2a81d3909b172e7e2d.zip | |
Moved ref_frame_cost from MACROBLOCKD to MACROBLOCK
Change-Id: I05788522e9cde4322cfb12032483bdbf184bdf0b
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index e762d2591..10f56078b 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -629,18 +629,18 @@ void init_encode_frame_mb_context(VP8_COMP *cpi) // Special case treatment when GF and ARF are not sensible options for reference if (cpi->ref_frame_flags == VP8_LAST_FLAG) - vp8_calc_ref_frame_costs(xd->ref_frame_cost, + vp8_calc_ref_frame_costs(x->ref_frame_cost, cpi->prob_intra_coded,255,128); else if ((cpi->oxcf.number_of_layers > 1) && (cpi->ref_frame_flags == VP8_GOLD_FLAG)) - vp8_calc_ref_frame_costs(xd->ref_frame_cost, + vp8_calc_ref_frame_costs(x->ref_frame_cost, cpi->prob_intra_coded,1,255); else if ((cpi->oxcf.number_of_layers > 1) && (cpi->ref_frame_flags == VP8_ALT_FLAG)) - vp8_calc_ref_frame_costs(xd->ref_frame_cost, + vp8_calc_ref_frame_costs(x->ref_frame_cost, cpi->prob_intra_coded,1,1); else - vp8_calc_ref_frame_costs(xd->ref_frame_cost, + vp8_calc_ref_frame_costs(x->ref_frame_cost, cpi->prob_intra_coded, cpi->prob_last_coded, cpi->prob_gf_coded); |