diff options
Diffstat (limited to 'vp10/common/entropy.c')
| -rw-r--r-- | vp10/common/entropy.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vp10/common/entropy.c b/vp10/common/entropy.c index 56dd73a4a..16765061b 100644 --- a/vp10/common/entropy.c +++ b/vp10/common/entropy.c @@ -403,7 +403,6 @@ const vpx_prob vp10_pareto8_full[COEFF_PROB_MODELS][MODEL_NODES] = { {255, 241, 243, 255, 236, 255, 252, 254}, {255, 243, 245, 255, 237, 255, 252, 254}, {255, 246, 247, 255, 239, 255, 253, 255}, - {255, 246, 247, 255, 239, 255, 253, 255}, }; static const vp10_coeff_probs_model default_coef_probs_4x4[PLANE_TYPES] = { @@ -743,14 +742,16 @@ static const vp10_coeff_probs_model default_coef_probs_32x32[PLANE_TYPES] = { }; static void extend_to_full_distribution(vpx_prob *probs, vpx_prob p) { - memcpy(probs, vp10_pareto8_full[p = 0 ? 0 : p - 1], - MODEL_NODES * sizeof(vpx_prob)); + memcpy(probs, vp10_pareto8_full[p - 1], MODEL_NODES * sizeof(vpx_prob)); } void vp10_model_to_full_probs(const vpx_prob *model, vpx_prob *full) { if (full != model) memcpy(full, model, sizeof(vpx_prob) * UNCONSTRAINED_NODES); - extend_to_full_distribution(&full[UNCONSTRAINED_NODES], model[PIVOT_NODE]); + // TODO(aconverse): model[PIVOT_NODE] should never be zero. + // https://code.google.com/p/webm/issues/detail?id=1089 + if (model[PIVOT_NODE] != 0) + extend_to_full_distribution(&full[UNCONSTRAINED_NODES], model[PIVOT_NODE]); } void vp10_default_coef_probs(VP10_COMMON *cm) { |