Mercurial > libavcodec.hg
comparison h264.c @ 3976:27e90123b346 libavcodec
reverse remainder of the failed attempt to optimize *state=c->mps_state[s]
| author | michael |
|---|---|
| date | Mon, 09 Oct 2006 21:14:16 +0000 |
| parents | f5f1c9af095d |
| children | 72bae00a317f |
comparison
equal
deleted
inserted
replaced
| 3975:6cc9eb5ee5e3 | 3976:27e90123b346 |
|---|---|
| 7399 pre = clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 ); | 7399 pre = clip( ((cabac_context_init_I[i][0] * s->qscale) >>4 ) + cabac_context_init_I[i][1], 1, 126 ); |
| 7400 else | 7400 else |
| 7401 pre = clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 ); | 7401 pre = clip( ((cabac_context_init_PB[h->cabac_init_idc][i][0] * s->qscale) >>4 ) + cabac_context_init_PB[h->cabac_init_idc][i][1], 1, 126 ); |
| 7402 | 7402 |
| 7403 if( pre <= 63 ) | 7403 if( pre <= 63 ) |
| 7404 h->cabac_state[i] = 2 * ( 63 - pre ) + 2; | 7404 h->cabac_state[i] = 2 * ( 63 - pre ) + 0; |
| 7405 else | 7405 else |
| 7406 h->cabac_state[i] = 2 * ( pre - 64 ) + 3; | 7406 h->cabac_state[i] = 2 * ( pre - 64 ) + 1; |
| 7407 } | 7407 } |
| 7408 | 7408 |
| 7409 for(;;){ | 7409 for(;;){ |
| 7410 int ret = decode_mb_cabac(h); | 7410 int ret = decode_mb_cabac(h); |
| 7411 int eos; | 7411 int eos; |