Skip to content

F
ffmpeg.wasm-core
Commit 6ddda83c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '64bb3fa6' 

* commit '64bb3fa6':
  cavs: cosmetics, reformat top part
  cavsdec: cosmetics, reformat
  libavcodec/utils: Add braces to shut up gcc warnings

Conflicts:
	libavcodec/cavsdec.c
	libavcodec/utils.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 87350d6b 64bb3fa6
Hide whitespace changes
Inline Side-by-side
Showing with 764 additions and 733 deletions
libavcodec/cavs.c
View file @ 6ddda83c
...@@ -67,27 +67,28 @@ static const int8_t top_modifier_c[7] = { 4, 1, -1, -1, 4, 6, 6 }; ...@@ -67,27 +67,28 @@ static const int8_t top_modifier_c[7] = { 4, 1, -1, -1, 4, 6, 6 };
* *
****************************************************************************/ ****************************************************************************/
static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b) { static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b)
if((mvP->ref == REF_INTRA) || (mvQ->ref == REF_INTRA)) {
if ((mvP->ref == REF_INTRA) || (mvQ->ref == REF_INTRA))
return 2; return 2;
if( (abs(mvP->x - mvQ->x) >= 4) || (abs(mvP->y - mvQ->y) >= 4) ) if ((abs(mvP->x - mvQ->x) >= 4) || (abs(mvP->y - mvQ->y) >= 4))
return 1; return 1;
if(b){ if (b) {
mvP += MV_BWD_OFFS; mvP += MV_BWD_OFFS;
mvQ += MV_BWD_OFFS; mvQ += MV_BWD_OFFS;
if( (abs(mvP->x - mvQ->x) >= 4) || (abs(mvP->y - mvQ->y) >= 4) ) if ((abs(mvP->x - mvQ->x) >= 4) || (abs(mvP->y - mvQ->y) >= 4))
return 1; return 1;
}else{ } else {
if(mvP->ref != mvQ->ref) if (mvP->ref != mvQ->ref)
return 1; return 1;
} }
return 0; return 0;
} }
#define SET_PARAMS \ #define SET_PARAMS \
alpha = alpha_tab[av_clip(qp_avg + h->alpha_offset,0,63)]; \ alpha = alpha_tab[av_clip(qp_avg + h->alpha_offset, 0, 63)]; \
beta = beta_tab[av_clip(qp_avg + h->beta_offset, 0,63)]; \ beta = beta_tab[av_clip(qp_avg + h->beta_offset, 0, 63)]; \
tc = tc_tab[av_clip(qp_avg + h->alpha_offset,0,63)]; tc = tc_tab[av_clip(qp_avg + h->alpha_offset, 0, 63)];
/** /**
* in-loop deblocking filter for a single macroblock * in-loop deblocking filter for a single macroblock
...@@ -101,35 +102,36 @@ static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b) { ...@@ -101,35 +102,36 @@ static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b) {
* --------- * ---------
* *
*/ */
void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) { void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type)
{
uint8_t bs[8]; uint8_t bs[8];
int qp_avg, alpha, beta, tc; int qp_avg, alpha, beta, tc;
int i; int i;
/* save un-deblocked lines */ /* save un-deblocked lines */
h->topleft_border_y = h->top_border_y[h->mbx*16+15]; h->topleft_border_y = h->top_border_y[h->mbx * 16 + 15];
h->topleft_border_u = h->top_border_u[h->mbx*10+8]; h->topleft_border_u = h->top_border_u[h->mbx * 10 + 8];
h->topleft_border_v = h->top_border_v[h->mbx*10+8]; h->topleft_border_v = h->top_border_v[h->mbx * 10 + 8];
memcpy(&h->top_border_y[h->mbx*16], h->cy + 15* h->l_stride,16); memcpy(&h->top_border_y[h->mbx * 16], h->cy + 15 * h->l_stride, 16);
memcpy(&h->top_border_u[h->mbx*10+1], h->cu + 7* h->c_stride,8); memcpy(&h->top_border_u[h->mbx * 10 + 1], h->cu + 7 * h->c_stride, 8);
memcpy(&h->top_border_v[h->mbx*10+1], h->cv + 7* h->c_stride,8); memcpy(&h->top_border_v[h->mbx * 10 + 1], h->cv + 7 * h->c_stride, 8);
for(i=0;i<8;i++) { for (i = 0; i < 8; i++) {
h->left_border_y[i*2+1] = *(h->cy + 15 + (i*2+0)*h->l_stride); h->left_border_y[i * 2 + 1] = *(h->cy + 15 + (i * 2 + 0) * h->l_stride);
h->left_border_y[i*2+2] = *(h->cy + 15 + (i*2+1)*h->l_stride); h->left_border_y[i * 2 + 2] = *(h->cy + 15 + (i * 2 + 1) * h->l_stride);
h->left_border_u[i+1] = *(h->cu + 7 + i*h->c_stride); h->left_border_u[i + 1] = *(h->cu + 7 + i * h->c_stride);
h->left_border_v[i+1] = *(h->cv + 7 + i*h->c_stride); h->left_border_v[i + 1] = *(h->cv + 7 + i * h->c_stride);
} }
if(!h->loop_filter_disable) { if (!h->loop_filter_disable) {
/* determine bs */ /* determine bs */
if(mb_type == I_8X8) if (mb_type == I_8X8)
memset(bs,2,8); memset(bs, 2, 8);
else{ else{
memset(bs,0,8); memset(bs, 0, 8);
if(ff_cavs_partition_flags[mb_type] & SPLITV){ if (ff_cavs_partition_flags[mb_type] & SPLITV) {
bs[2] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X1], mb_type > P_8X8); bs[2] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X1], mb_type > P_8X8);
bs[3] = get_bs(&h->mv[MV_FWD_X2], &h->mv[MV_FWD_X3], mb_type > P_8X8); bs[3] = get_bs(&h->mv[MV_FWD_X2], &h->mv[MV_FWD_X3], mb_type > P_8X8);
} }
if(ff_cavs_partition_flags[mb_type] & SPLITH){ if (ff_cavs_partition_flags[mb_type] & SPLITH) {
bs[6] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X2], mb_type > P_8X8); bs[6] = get_bs(&h->mv[MV_FWD_X0], &h->mv[MV_FWD_X2], mb_type > P_8X8);
bs[7] = get_bs(&h->mv[MV_FWD_X1], &h->mv[MV_FWD_X3], mb_type > P_8X8); bs[7] = get_bs(&h->mv[MV_FWD_X1], &h->mv[MV_FWD_X3], mb_type > P_8X8);
} }
...@@ -138,30 +140,29 @@ void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) { ...@@ -138,30 +140,29 @@ void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) {
bs[4] = get_bs(&h->mv[MV_FWD_B2], &h->mv[MV_FWD_X0], mb_type > P_8X8); bs[4] = get_bs(&h->mv[MV_FWD_B2], &h->mv[MV_FWD_X0], mb_type > P_8X8);
bs[5] = get_bs(&h->mv[MV_FWD_B3], &h->mv[MV_FWD_X1], mb_type > P_8X8); bs[5] = get_bs(&h->mv[MV_FWD_B3], &h->mv[MV_FWD_X1], mb_type > P_8X8);
} }
if(AV_RN64(bs)) { if (AV_RN64(bs)) {
if(h->flags & A_AVAIL) { if (h->flags & A_AVAIL) {
qp_avg = (h->qp + h->left_qp + 1) >> 1; qp_avg = (h->qp + h->left_qp + 1) >> 1;
SET_PARAMS; SET_PARAMS;
h->cdsp.cavs_filter_lv(h->cy,h->l_stride,alpha,beta,tc,bs[0],bs[1]); h->cdsp.cavs_filter_lv(h->cy, h->l_stride, alpha, beta, tc, bs[0], bs[1]);
h->cdsp.cavs_filter_cv(h->cu,h->c_stride,alpha,beta,tc,bs[0],bs[1]); h->cdsp.cavs_filter_cv(h->cu, h->c_stride, alpha, beta, tc, bs[0], bs[1]);
h->cdsp.cavs_filter_cv(h->cv,h->c_stride,alpha,beta,tc,bs[0],bs[1]); h->cdsp.cavs_filter_cv(h->cv, h->c_stride, alpha, beta, tc, bs[0], bs[1]);
} }
qp_avg = h->qp; qp_avg = h->qp;
SET_PARAMS; SET_PARAMS;
h->cdsp.cavs_filter_lv(h->cy + 8,h->l_stride,alpha,beta,tc,bs[2],bs[3]); h->cdsp.cavs_filter_lv(h->cy + 8, h->l_stride, alpha, beta, tc, bs[2], bs[3]);
h->cdsp.cavs_filter_lh(h->cy + 8*h->l_stride,h->l_stride,alpha,beta,tc, h->cdsp.cavs_filter_lh(h->cy + 8 * h->l_stride, h->l_stride, alpha, beta, tc, bs[6], bs[7]);
bs[6],bs[7]);
if(h->flags & B_AVAIL) { if (h->flags & B_AVAIL) {
qp_avg = (h->qp + h->top_qp[h->mbx] + 1) >> 1; qp_avg = (h->qp + h->top_qp[h->mbx] + 1) >> 1;
SET_PARAMS; SET_PARAMS;
h->cdsp.cavs_filter_lh(h->cy,h->l_stride,alpha,beta,tc,bs[4],bs[5]); h->cdsp.cavs_filter_lh(h->cy, h->l_stride, alpha, beta, tc, bs[4], bs[5]);
h->cdsp.cavs_filter_ch(h->cu,h->c_stride,alpha,beta,tc,bs[4],bs[5]); h->cdsp.cavs_filter_ch(h->cu, h->c_stride, alpha, beta, tc, bs[4], bs[5]);
h->cdsp.cavs_filter_ch(h->cv,h->c_stride,alpha,beta,tc,bs[4],bs[5]); h->cdsp.cavs_filter_ch(h->cv, h->c_stride, alpha, beta, tc, bs[4], bs[5]);
} }
} }
} }
h->left_qp = h->qp; h->left_qp = h->qp;
h->top_qp[h->mbx] = h->qp; h->top_qp[h->mbx] = h->qp;
} }
...@@ -174,155 +175,166 @@ void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) { ...@@ -174,155 +175,166 @@ void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type) {
****************************************************************************/ ****************************************************************************/
void ff_cavs_load_intra_pred_luma(AVSContext *h, uint8_t *top, void ff_cavs_load_intra_pred_luma(AVSContext *h, uint8_t *top,
uint8_t **left, int block) { uint8_t **left, int block)
{
int i; int i;
switch(block) { switch (block) {
case 0: case 0:
*left = h->left_border_y; *left = h->left_border_y;
h->left_border_y[0] = h->left_border_y[1]; h->left_border_y[0] = h->left_border_y[1];
memset(&h->left_border_y[17],h->left_border_y[16],9); memset(&h->left_border_y[17], h->left_border_y[16], 9);
memcpy(&top[1],&h->top_border_y[h->mbx*16],16); memcpy(&top[1], &h->top_border_y[h->mbx * 16], 16);
top[17] = top[16]; top[17] = top[16];
top[0] = top[1]; top[0] = top[1];
if((h->flags & A_AVAIL) && (h->flags & B_AVAIL)) if ((h->flags & A_AVAIL) && (h->flags & B_AVAIL))
h->left_border_y[0] = top[0] = h->topleft_border_y; h->left_border_y[0] = top[0] = h->topleft_border_y;
break; break;
case 1: case 1:
*left = h->intern_border_y; *left = h->intern_border_y;
for(i=0;i<8;i++) for (i = 0; i < 8; i++)
h->intern_border_y[i+1] = *(h->cy + 7 + i*h->l_stride); h->intern_border_y[i + 1] = *(h->cy + 7 + i * h->l_stride);
memset(&h->intern_border_y[9],h->intern_border_y[8],9); memset(&h->intern_border_y[9], h->intern_border_y[8], 9);
h->intern_border_y[0] = h->intern_border_y[1]; h->intern_border_y[0] = h->intern_border_y[1];
memcpy(&top[1],&h->top_border_y[h->mbx*16+8],8); memcpy(&top[1], &h->top_border_y[h->mbx * 16 + 8], 8);
if(h->flags & C_AVAIL) if (h->flags & C_AVAIL)
memcpy(&top[9],&h->top_border_y[(h->mbx + 1)*16],8); memcpy(&top[9], &h->top_border_y[(h->mbx + 1) * 16], 8);
else else
memset(&top[9],top[8],9); memset(&top[9], top[8], 9);
top[17] = top[16]; top[17] = top[16];
top[0] = top[1]; top[0] = top[1];
if(h->flags & B_AVAIL) if (h->flags & B_AVAIL)
h->intern_border_y[0] = top[0] = h->top_border_y[h->mbx*16+7]; h->intern_border_y[0] = top[0] = h->top_border_y[h->mbx * 16 + 7];
break; break;
case 2: case 2:
*left = &h->left_border_y[8]; *left = &h->left_border_y[8];
memcpy(&top[1],h->cy + 7*h->l_stride,16); memcpy(&top[1], h->cy + 7 * h->l_stride, 16);
top[17] = top[16]; top[17] = top[16];
top[0] = top[1]; top[0] = top[1];
if(h->flags & A_AVAIL) if (h->flags & A_AVAIL)
top[0] = h->left_border_y[8]; top[0] = h->left_border_y[8];
break; break;
case 3: case 3:
*left = &h->intern_border_y[8]; *left = &h->intern_border_y[8];
for(i=0;i<8;i++) for (i = 0; i < 8; i++)
h->intern_border_y[i+9] = *(h->cy + 7 + (i+8)*h->l_stride); h->intern_border_y[i + 9] = *(h->cy + 7 + (i + 8) * h->l_stride);
memset(&h->intern_border_y[17],h->intern_border_y[16],9); memset(&h->intern_border_y[17], h->intern_border_y[16], 9);
memcpy(&top[0],h->cy + 7 + 7*h->l_stride,9); memcpy(&top[0], h->cy + 7 + 7 * h->l_stride, 9);
memset(&top[9],top[8],9); memset(&top[9], top[8], 9);
break; break;
} }
} }
void ff_cavs_load_intra_pred_chroma(AVSContext *h) { void ff_cavs_load_intra_pred_chroma(AVSContext *h)
{
/* extend borders by one pixel */ /* extend borders by one pixel */
h->left_border_u[9] = h->left_border_u[8]; h->left_border_u[9] = h->left_border_u[8];
h->left_border_v[9] = h->left_border_v[8]; h->left_border_v[9] = h->left_border_v[8];
h->top_border_u[h->mbx*10+9] = h->top_border_u[h->mbx*10+8]; h->top_border_u[h->mbx * 10 + 9] = h->top_border_u[h->mbx * 10 + 8];
h->top_border_v[h->mbx*10+9] = h->top_border_v[h->mbx*10+8]; h->top_border_v[h->mbx * 10 + 9] = h->top_border_v[h->mbx * 10 + 8];
if(h->mbx && h->mby) { if (h->mbx && h->mby) {
h->top_border_u[h->mbx*10] = h->left_border_u[0] = h->topleft_border_u; h->top_border_u[h->mbx * 10] = h->left_border_u[0] = h->topleft_border_u;
h->top_border_v[h->mbx*10] = h->left_border_v[0] = h->topleft_border_v; h->top_border_v[h->mbx * 10] = h->left_border_v[0] = h->topleft_border_v;
} else { } else {
h->left_border_u[0] = h->left_border_u[1]; h->left_border_u[0] = h->left_border_u[1];
h->left_border_v[0] = h->left_border_v[1]; h->left_border_v[0] = h->left_border_v[1];
h->top_border_u[h->mbx*10] = h->top_border_u[h->mbx*10+1]; h->top_border_u[h->mbx * 10] = h->top_border_u[h->mbx * 10 + 1];
h->top_border_v[h->mbx*10] = h->top_border_v[h->mbx*10+1]; h->top_border_v[h->mbx * 10] = h->top_border_v[h->mbx * 10 + 1];
} }
} }
static void intra_pred_vert(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_vert(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
{
int y; int y;
uint64_t a = AV_RN64(&top[1]); uint64_t a = AV_RN64(&top[1]);
for(y=0;y<8;y++) { for (y = 0; y < 8; y++) {
*((uint64_t *)(d+y*stride)) = a; *((uint64_t *)(d + y * stride)) = a;
} }
} }
static void intra_pred_horiz(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_horiz(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
{
int y; int y;
uint64_t a; uint64_t a;
for(y=0;y<8;y++) { for (y = 0; y < 8; y++) {
a = left[y+1] * 0x0101010101010101ULL; a = left[y + 1] * 0x0101010101010101ULL;
*((uint64_t *)(d+y*stride)) = a; *((uint64_t *)(d + y * stride)) = a;
} }
} }
static void intra_pred_dc_128(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_dc_128(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
{
int y; int y;
uint64_t a = 0x8080808080808080ULL; uint64_t a = 0x8080808080808080ULL;
for(y=0;y<8;y++) for (y = 0; y < 8; y++)
*((uint64_t *)(d+y*stride)) = a; *((uint64_t *)(d + y * stride)) = a;
} }
static void intra_pred_plane(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_plane(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
int x,y,ia; {
int x, y, ia;
int ih = 0; int ih = 0;
int iv = 0; int iv = 0;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
for(x=0; x<4; x++) { for (x = 0; x < 4; x++) {
ih += (x+1)*(top[5+x]-top[3-x]); ih += (x + 1) * (top [5 + x] - top [3 - x]);
iv += (x+1)*(left[5+x]-left[3-x]); iv += (x + 1) * (left[5 + x] - left[3 - x]);
} }
ia = (top[8]+left[8])<<4; ia = (top[8] + left[8]) << 4;
ih = (17*ih+16)>>5; ih = (17 * ih + 16) >> 5;
iv = (17*iv+16)>>5; iv = (17 * iv + 16) >> 5;
for(y=0; y<8; y++) for (y = 0; y < 8; y++)
for(x=0; x<8; x++) for (x = 0; x < 8; x++)
d[y*stride+x] = cm[(ia+(x-3)*ih+(y-3)*iv+16)>>5]; d[y * stride + x] = cm[(ia + (x - 3) * ih + (y - 3) * iv + 16) >> 5];
} }
#define LOWPASS(ARRAY,INDEX) \ #define LOWPASS(ARRAY,INDEX) \
(( ARRAY[(INDEX)-1] + 2*ARRAY[(INDEX)] + ARRAY[(INDEX)+1] + 2) >> 2) ((ARRAY[(INDEX) - 1] + 2 * ARRAY[(INDEX)] + ARRAY[(INDEX) + 1] + 2) >> 2)
static void intra_pred_lp(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_lp(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
int x,y; {
for(y=0; y<8; y++) int x, y;
for(x=0; x<8; x++) for (y = 0; y < 8; y++)
d[y*stride+x] = (LOWPASS(top,x+1) + LOWPASS(left,y+1)) >> 1; for (x = 0; x < 8; x++)
d[y * stride + x] = (LOWPASS(top, x + 1) + LOWPASS(left, y + 1)) >> 1;
} }
static void intra_pred_down_left(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_down_left(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
int x,y; {
for(y=0; y<8; y++) int x, y;
for(x=0; x<8; x++) for (y = 0; y < 8; y++)
d[y*stride+x] = (LOWPASS(top,x+y+2) + LOWPASS(left,x+y+2)) >> 1; for (x = 0; x < 8; x++)
d[y * stride + x] = (LOWPASS(top, x + y + 2) + LOWPASS(left, x + y + 2)) >> 1;
} }
static void intra_pred_down_right(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_down_right(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
int x,y; {
for(y=0; y<8; y++) int x, y;
for(x=0; x<8; x++) for (y = 0; y < 8; y++)
if(x==y) for (x = 0; x < 8; x++)
d[y*stride+x] = (left[1]+2*top[0]+top[1]+2)>>2; if (x == y)
else if(x>y) d[y * stride + x] = (left[1] + 2 * top[0] + top[1] + 2) >> 2;
d[y*stride+x] = LOWPASS(top,x-y); else if (x > y)
d[y * stride + x] = LOWPASS(top, x - y);
else else
d[y*stride+x] = LOWPASS(left,y-x); d[y * stride + x] = LOWPASS(left, y - x);
} }
static void intra_pred_lp_left(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_lp_left(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
int x,y; {
for(y=0; y<8; y++) int x, y;
for(x=0; x<8; x++) for (y = 0; y < 8; y++)
d[y*stride+x] = LOWPASS(left,y+1); for (x = 0; x < 8; x++)
d[y * stride + x] = LOWPASS(left, y + 1);
} }
static void intra_pred_lp_top(uint8_t *d,uint8_t *top,uint8_t *left,int stride) { static void intra_pred_lp_top(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
int x,y; {
for(y=0; y<8; y++) int x, y;
for(x=0; x<8; x++) for (y = 0; y < 8; y++)
d[y*stride+x] = LOWPASS(top,x+1); for (x = 0; x < 8; x++)
d[y * stride + x] = LOWPASS(top, x + 1);
} }
#undef LOWPASS #undef LOWPASS
...@@ -330,26 +342,27 @@ static void intra_pred_lp_top(uint8_t *d,uint8_t *top,uint8_t *left,int stride) ...@@ -330,26 +342,27 @@ static void intra_pred_lp_top(uint8_t *d,uint8_t *top,uint8_t *left,int stride)
static inline void modify_pred(const int8_t *mod_table, int *mode) static inline void modify_pred(const int8_t *mod_table, int *mode)
{ {
*mode = mod_table[*mode]; *mode = mod_table[*mode];
if(*mode < 0) { if (*mode < 0) {
av_log(NULL, AV_LOG_ERROR, "Illegal intra prediction mode\n"); av_log(NULL, AV_LOG_ERROR, "Illegal intra prediction mode\n");
*mode = 0; *mode = 0;
} }
} }
void ff_cavs_modify_mb_i(AVSContext *h, int *pred_mode_uv) { void ff_cavs_modify_mb_i(AVSContext *h, int *pred_mode_uv)
{
/* save pred modes before they get modified */ /* save pred modes before they get modified */
h->pred_mode_Y[3] = h->pred_mode_Y[5]; h->pred_mode_Y[3] = h->pred_mode_Y[5];
h->pred_mode_Y[6] = h->pred_mode_Y[8]; h->pred_mode_Y[6] = h->pred_mode_Y[8];
h->top_pred_Y[h->mbx*2+0] = h->pred_mode_Y[7]; h->top_pred_Y[h->mbx * 2 + 0] = h->pred_mode_Y[7];
h->top_pred_Y[h->mbx*2+1] = h->pred_mode_Y[8]; h->top_pred_Y[h->mbx * 2 + 1] = h->pred_mode_Y[8];
/* modify pred modes according to availability of neighbour samples */ /* modify pred modes according to availability of neighbour samples */
if(!(h->flags & A_AVAIL)) { if (!(h->flags & A_AVAIL)) {
modify_pred(left_modifier_l, &h->pred_mode_Y[4]); modify_pred(left_modifier_l, &h->pred_mode_Y[4]);
modify_pred(left_modifier_l, &h->pred_mode_Y[7]); modify_pred(left_modifier_l, &h->pred_mode_Y[7]);
modify_pred(left_modifier_c, pred_mode_uv); modify_pred(left_modifier_c, pred_mode_uv);
} }
if(!(h->flags & B_AVAIL)) { if (!(h->flags & B_AVAIL)) {
modify_pred(top_modifier_l, &h->pred_mode_Y[4]); modify_pred(top_modifier_l, &h->pred_mode_Y[4]);
modify_pred(top_modifier_l, &h->pred_mode_Y[5]); modify_pred(top_modifier_l, &h->pred_mode_Y[5]);
modify_pred(top_modifier_c, pred_mode_uv); modify_pred(top_modifier_c, pred_mode_uv);
......
libavcodec/cavsdec.c
View file @ 6ddda83c
...@@ -33,425 +33,422 @@ ...@@ -33,425 +33,422 @@
#include "internal.h" #include "internal.h"
static const uint8_t mv_scan[4] = { static const uint8_t mv_scan[4] = {
MV_FWD_X0,MV_FWD_X1, MV_FWD_X0, MV_FWD_X1,
MV_FWD_X2,MV_FWD_X3 MV_FWD_X2, MV_FWD_X3
}; };
static const uint8_t cbp_tab[64][2] = { static const uint8_t cbp_tab[64][2] = {
{63, 0},{15,15},{31,63},{47,31},{ 0,16},{14,32},{13,47},{11,13}, { 63, 0 }, { 15, 15 }, { 31, 63 }, { 47, 31 }, { 0, 16 }, { 14, 32 }, { 13, 47 }, { 11, 13 },
{ 7,14},{ 5,11},{10,12},{ 8, 5},{12,10},{61, 7},{ 4,48},{55, 3}, { 7, 14 }, { 5, 11 }, { 10, 12 }, { 8, 5 }, { 12, 10 }, { 61, 7 }, { 4, 48 }, { 55, 3 },
{ 1, 2},{ 2, 8},{59, 4},{ 3, 1},{62,61},{ 9,55},{ 6,59},{29,62}, { 1, 2 }, { 2, 8 }, { 59, 4 }, { 3, 1 }, { 62, 61 }, { 9, 55 }, { 6, 59 }, { 29, 62 },
{45,29},{51,27},{23,23},{39,19},{27,30},{46,28},{53, 9},{30, 6}, { 45, 29 }, { 51, 27 }, { 23, 23 }, { 39, 19 }, { 27, 30 }, { 46, 28 }, { 53, 9 }, { 30, 6 },
{43,60},{37,21},{60,44},{16,26},{21,51},{28,35},{19,18},{35,20}, { 43, 60 }, { 37, 21 }, { 60, 44 }, { 16, 26 }, { 21, 51 }, { 28, 35 }, { 19, 18 }, { 35, 20 },
{42,24},{26,53},{44,17},{32,37},{58,39},{24,45},{20,58},{17,43}, { 42, 24 }, { 26, 53 }, { 44, 17 }, { 32, 37 }, { 58, 39 }, { 24, 45 }, { 20, 58 }, { 17, 43 },
{18,42},{48,46},{22,36},{33,33},{25,34},{49,40},{40,52},{36,49}, { 18, 42 }, { 48, 46 }, { 22, 36 }, { 33, 33 }, { 25, 34 }, { 49, 40 }, { 40, 52 }, { 36, 49 },
{34,50},{50,56},{52,25},{54,22},{41,54},{56,57},{38,41},{57,38} { 34, 50 }, { 50, 56 }, { 52, 25 }, { 54, 22 }, { 41, 54 }, { 56, 57 }, { 38, 41 }, { 57, 38 }
}; };
static const uint8_t scan3x3[4] = { 4, 5, 7, 8 }; static const uint8_t scan3x3[4] = { 4, 5, 7, 8 };
static const uint8_t cavs_chroma_qp[64] = { static const uint8_t cavs_chroma_qp[64] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
32,33,34,35,36,37,38,39,40,41,42,42,43,43,44,44, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 42, 43, 43, 44, 44,
45,45,46,46,47,47,48,48,48,49,49,49,50,50,50,51 45, 45, 46, 46, 47, 47, 48, 48, 48, 49, 49, 49, 50, 50, 50, 51
}; };
static const uint8_t dequant_shift[64] = { static const uint8_t dequant_shift[64] = {
14,14,14,14,14,14,14,14, 14, 14, 14, 14, 14, 14, 14, 14,
13,13,13,13,13,13,13,13, 13, 13, 13, 13, 13, 13, 13, 13,
13,12,12,12,12,12,12,12, 13, 12, 12, 12, 12, 12, 12, 12,
11,11,11,11,11,11,11,11, 11, 11, 11, 11, 11, 11, 11, 11,
11,10,10,10,10,10,10,10, 11, 10, 10, 10, 10, 10, 10, 10,
10, 9, 9, 9, 9, 9, 9, 9, 10, 9, 9, 9, 9, 9, 9, 9,
9, 8, 8, 8, 8, 8, 8, 8, 9, 8, 8, 8, 8, 8, 8, 8,
7, 7, 7, 7, 7, 7, 7, 7 7, 7, 7, 7, 7, 7, 7, 7
}; };
static const uint16_t dequant_mul[64] = { static const uint16_t dequant_mul[64] = {
32768,36061,38968,42495,46341,50535,55437,60424, 32768, 36061, 38968, 42495, 46341, 50535, 55437, 60424,
32932,35734,38968,42495,46177,50535,55109,59933, 32932, 35734, 38968, 42495, 46177, 50535, 55109, 59933,
65535,35734,38968,42577,46341,50617,55027,60097, 65535, 35734, 38968, 42577, 46341, 50617, 55027, 60097,
32809,35734,38968,42454,46382,50576,55109,60056, 32809, 35734, 38968, 42454, 46382, 50576, 55109, 60056,
65535,35734,38968,42495,46320,50515,55109,60076, 65535, 35734, 38968, 42495, 46320, 50515, 55109, 60076,
65535,35744,38968,42495,46341,50535,55099,60087, 65535, 35744, 38968, 42495, 46341, 50535, 55099, 60087,
65535,35734,38973,42500,46341,50535,55109,60097, 65535, 35734, 38973, 42500, 46341, 50535, 55109, 60097,
32771,35734,38965,42497,46341,50535,55109,60099 32771, 35734, 38965, 42497, 46341, 50535, 55109, 60099
}; };
#define EOB 0,0,0 #define EOB 0, 0, 0
static const struct dec_2dvlc intra_dec[7] = { static const struct dec_2dvlc intra_dec[7] = {
{ {
{ //level / run / table_inc { //level / run / table_inc
{ 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, { 1, 1, 1 }, { -1, 1, 1 }, { 1, 2, 1 }, { -1, 2, 1 }, { 1, 3, 1 }, { -1, 3, 1 },
{ 1, 4, 1},{ -1, 4, 1},{ 1, 5, 1},{ -1, 5, 1},{ 1, 6, 1},{ -1, 6, 1}, { 1, 4, 1 }, { -1, 4, 1 }, { 1, 5, 1 }, { -1, 5, 1 }, { 1, 6, 1 }, { -1, 6, 1 },
{ 1, 7, 1},{ -1, 7, 1},{ 1, 8, 1},{ -1, 8, 1},{ 1, 9, 1},{ -1, 9, 1}, { 1, 7, 1 }, { -1, 7, 1 }, { 1, 8, 1 }, { -1, 8, 1 }, { 1, 9, 1 }, { -1, 9, 1 },
{ 1,10, 1},{ -1,10, 1},{ 1,11, 1},{ -1,11, 1},{ 2, 1, 2},{ -2, 1, 2}, { 1, 10, 1 }, { -1, 10, 1 }, { 1, 11, 1 }, { -1, 11, 1 }, { 2, 1, 2 }, { -2, 1, 2 },
{ 1,12, 1},{ -1,12, 1},{ 1,13, 1},{ -1,13, 1},{ 1,14, 1},{ -1,14, 1}, { 1, 12, 1 }, { -1, 12, 1 }, { 1, 13, 1 }, { -1, 13, 1 }, { 1, 14, 1 }, { -1, 14, 1 },
{ 1,15, 1},{ -1,15, 1},{ 2, 2, 2},{ -2, 2, 2},{ 1,16, 1},{ -1,16, 1}, { 1, 15, 1 }, { -1, 15, 1 }, { 2, 2, 2 }, { -2, 2, 2 }, { 1, 16, 1 }, { -1, 16, 1 },
{ 1,17, 1},{ -1,17, 1},{ 3, 1, 3},{ -3, 1, 3},{ 1,18, 1},{ -1,18, 1}, { 1, 17, 1 }, { -1, 17, 1 }, { 3, 1, 3 }, { -3, 1, 3 }, { 1, 18, 1 }, { -1, 18, 1 },
{ 1,19, 1},{ -1,19, 1},{ 2, 3, 2},{ -2, 3, 2},{ 1,20, 1},{ -1,20, 1}, { 1, 19, 1 }, { -1, 19, 1 }, { 2, 3, 2 }, { -2, 3, 2 }, { 1, 20, 1 }, { -1, 20, 1 },
{ 1,21, 1},{ -1,21, 1},{ 2, 4, 2},{ -2, 4, 2},{ 1,22, 1},{ -1,22, 1}, { 1, 21, 1 }, { -1, 21, 1 }, { 2, 4, 2 }, { -2, 4, 2 }, { 1, 22, 1 }, { -1, 22, 1 },
{ 2, 5, 2},{ -2, 5, 2},{ 1,23, 1},{ -1,23, 1},{ EOB } { 2, 5, 2 }, { -2, 5, 2 }, { 1, 23, 1 }, { -1, 23, 1 }, { EOB }
},
//level_add
{ 0, 4, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1 },
2, //golomb_order
0, //inc_limit
23, //max_run
}, },
//level_add {
{ 0, 4, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, { //level / run
2, 2, 2, 2, 2, 2, 2,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 2, 1, 1 }, { -2, 1, 1 },
2, //golomb_order { 1, 3, 0 }, { -1, 3, 0 }, { EOB }, { 1, 4, 0 }, { -1, 4, 0 }, { 1, 5, 0 },
0, //inc_limit { -1, 5, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 3, 1, 2 }, { -3, 1, 2 }, { 2, 2, 1 },
23, //max_run { -2, 2, 1 }, { 1, 7, 0 }, { -1, 7, 0 }, { 1, 8, 0 }, { -1, 8, 0 }, { 1, 9, 0 },
},{ { -1, 9, 0 }, { 2, 3, 1 }, { -2, 3, 1 }, { 4, 1, 2 }, { -4, 1, 2 }, { 1, 10, 0 },
{ //level / run { -1, 10, 0 }, { 1, 11, 0 }, { -1, 11, 0 }, { 2, 4, 1 }, { -2, 4, 1 }, { 3, 2, 2 },
{ 1, 1, 0},{ -1, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 2, 1, 1},{ -2, 1, 1}, { -3, 2, 2 }, { 1, 12, 0 }, { -1, 12, 0 }, { 2, 5, 1 }, { -2, 5, 1 }, { 5, 1, 3 },
{ 1, 3, 0},{ -1, 3, 0},{ EOB },{ 1, 4, 0},{ -1, 4, 0},{ 1, 5, 0}, { -5, 1, 3 }, { 1, 13, 0 }, { -1, 13, 0 }, { 2, 6, 1 }, { -2, 6, 1 }, { 1, 14, 0 },
{ -1, 5, 0},{ 1, 6, 0},{ -1, 6, 0},{ 3, 1, 2},{ -3, 1, 2},{ 2, 2, 1}, { -1, 14, 0 }, { 2, 7, 1 }, { -2, 7, 1 }, { 2, 8, 1 }, { -2, 8, 1 }, { 3, 3, 2 },
{ -2, 2, 1},{ 1, 7, 0},{ -1, 7, 0},{ 1, 8, 0},{ -1, 8, 0},{ 1, 9, 0}, { -3, 3, 2 }, { 6, 1, 3 }, { -6, 1, 3 }, { 1, 15, 0 }, { -1, 15, 0 }
{ -1, 9, 0},{ 2, 3, 1},{ -2, 3, 1},{ 4, 1, 2},{ -4, 1, 2},{ 1,10, 0}, },
{ -1,10, 0},{ 1,11, 0},{ -1,11, 0},{ 2, 4, 1},{ -2, 4, 1},{ 3, 2, 2}, //level_add
{ -3, 2, 2},{ 1,12, 0},{ -1,12, 0},{ 2, 5, 1},{ -2, 5, 1},{ 5, 1, 3}, { 0, 7, 4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -5, 1, 3},{ 1,13, 0},{ -1,13, 0},{ 2, 6, 1},{ -2, 6, 1},{ 1,14, 0}, 2, //golomb_order
{ -1,14, 0},{ 2, 7, 1},{ -2, 7, 1},{ 2, 8, 1},{ -2, 8, 1},{ 3, 3, 2}, 1, //inc_limit
{ -3, 3, 2},{ 6, 1, 3},{ -6, 1, 3},{ 1,15, 0},{ -1,15, 0} 15, //max_run
}, },
//level_add {
{ 0, 7, 4, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 },
2, //golomb_order { 3, 1, 1 }, { -3, 1, 1 }, { EOB }, { 1, 3, 0 }, { -1, 3, 0 }, { 2, 2, 0 },
1, //inc_limit { -2, 2, 0 }, { 4, 1, 1 }, { -4, 1, 1 }, { 1, 4, 0 }, { -1, 4, 0 }, { 5, 1, 2 },
15, //max_run { -5, 1, 2 }, { 1, 5, 0 }, { -1, 5, 0 }, { 3, 2, 1 }, { -3, 2, 1 }, { 2, 3, 0 },
},{ { -2, 3, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 6, 1, 2 }, { -6, 1, 2 }, { 2, 4, 0 },
{ //level / run { -2, 4, 0 }, { 1, 7, 0 }, { -1, 7, 0 }, { 4, 2, 1 }, { -4, 2, 1 }, { 7, 1, 2 },
{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 1, 2, 0},{ -1, 2, 0}, { -7, 1, 2 }, { 3, 3, 1 }, { -3, 3, 1 }, { 2, 5, 0 }, { -2, 5, 0 }, { 1, 8, 0 },
{ 3, 1, 1},{ -3, 1, 1},{ EOB },{ 1, 3, 0},{ -1, 3, 0},{ 2, 2, 0}, { -1, 8, 0 }, { 2, 6, 0 }, { -2, 6, 0 }, { 8, 1, 3 }, { -8, 1, 3 }, { 1, 9, 0 },
{ -2, 2, 0},{ 4, 1, 1},{ -4, 1, 1},{ 1, 4, 0},{ -1, 4, 0},{ 5, 1, 2}, { -1, 9, 0 }, { 5, 2, 2 }, { -5, 2, 2 }, { 3, 4, 1 }, { -3, 4, 1 }, { 2, 7, 0 },
{ -5, 1, 2},{ 1, 5, 0},{ -1, 5, 0},{ 3, 2, 1},{ -3, 2, 1},{ 2, 3, 0}, { -2, 7, 0 }, { 9, 1, 3 }, { -9, 1, 3 }, { 1, 10, 0 }, { -1, 10, 0 }
{ -2, 3, 0},{ 1, 6, 0},{ -1, 6, 0},{ 6, 1, 2},{ -6, 1, 2},{ 2, 4, 0}, },
{ -2, 4, 0},{ 1, 7, 0},{ -1, 7, 0},{ 4, 2, 1},{ -4, 2, 1},{ 7, 1, 2}, //level_add
{ -7, 1, 2},{ 3, 3, 1},{ -3, 3, 1},{ 2, 5, 0},{ -2, 5, 0},{ 1, 8, 0}, { 0, 10, 6, 4, 4, 3, 3, 3, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -1, 8, 0},{ 2, 6, 0},{ -2, 6, 0},{ 8, 1, 3},{ -8, 1, 3},{ 1, 9, 0}, 2, //golomb_order
{ -1, 9, 0},{ 5, 2, 2},{ -5, 2, 2},{ 3, 4, 1},{ -3, 4, 1},{ 2, 7, 0}, 2, //inc_limit
{ -2, 7, 0},{ 9, 1, 3},{ -9, 1, 3},{ 1,10, 0},{ -1,10, 0} 10, //max_run
}, },
//level_add {
{ 0,10, 6, 4, 4, 3, 3, 3, 2, 2, 2,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 }, { -3, 1, 0 },
2, //golomb_order { 1, 2, 0 }, { -1, 2, 0 }, { EOB }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 1 },
2, //inc_limit { -5, 1, 1 }, { 2, 2, 0 }, { -2, 2, 0 }, { 1, 3, 0 }, { -1, 3, 0 }, { 6, 1, 1 },
10, //max_run { -6, 1, 1 }, { 3, 2, 0 }, { -3, 2, 0 }, { 7, 1, 1 }, { -7, 1, 1 }, { 1, 4, 0 },
},{ { -1, 4, 0 }, { 8, 1, 2 }, { -8, 1, 2 }, { 2, 3, 0 }, { -2, 3, 0 }, { 4, 2, 0 },
{ //level / run { -4, 2, 0 }, { 1, 5, 0 }, { -1, 5, 0 }, { 9, 1, 2 }, { -9, 1, 2 }, { 5, 2, 1 },
{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0},{ -3, 1, 0}, { -5, 2, 1 }, { 2, 4, 0 }, { -2, 4, 0 }, { 10, 1, 2 }, {-10, 1, 2 }, { 3, 3, 0 },
{ 1, 2, 0},{ -1, 2, 0},{ EOB },{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 1}, { -3, 3, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 11, 1, 3 }, {-11, 1, 3 }, { 6, 2, 1 },
{ -5, 1, 1},{ 2, 2, 0},{ -2, 2, 0},{ 1, 3, 0},{ -1, 3, 0},{ 6, 1, 1}, { -6, 2, 1 }, { 1, 7, 0 }, { -1, 7, 0 }, { 2, 5, 0 }, { -2, 5, 0 }, { 3, 4, 0 },
{ -6, 1, 1},{ 3, 2, 0},{ -3, 2, 0},{ 7, 1, 1},{ -7, 1, 1},{ 1, 4, 0}, { -3, 4, 0 }, { 12, 1, 3 }, {-12, 1, 3 }, { 4, 3, 0 }, { -4, 3, 0 }
{ -1, 4, 0},{ 8, 1, 2},{ -8, 1, 2},{ 2, 3, 0},{ -2, 3, 0},{ 4, 2, 0}, },
{ -4, 2, 0},{ 1, 5, 0},{ -1, 5, 0},{ 9, 1, 2},{ -9, 1, 2},{ 5, 2, 1}, //level_add
{ -5, 2, 1},{ 2, 4, 0},{ -2, 4, 0},{ 10, 1, 2},{-10, 1, 2},{ 3, 3, 0}, { 0, 13, 7, 5, 4, 3, 2, 2, -1, -1, -1 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -3, 3, 0},{ 1, 6, 0},{ -1, 6, 0},{ 11, 1, 3},{-11, 1, 3},{ 6, 2, 1}, 2, //golomb_order
{ -6, 2, 1},{ 1, 7, 0},{ -1, 7, 0},{ 2, 5, 0},{ -2, 5, 0},{ 3, 4, 0}, 4, //inc_limit
{ -3, 4, 0},{ 12, 1, 3},{-12, 1, 3},{ 4, 3, 0},{ -4, 3, 0} 7, //max_run
}, },
//level_add {
{ 0,13, 7, 5, 4, 3, 2, 2,-1,-1,-1 -1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 }, { -3, 1, 0 },
2, //golomb_order { EOB }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 }, { -5, 1, 0 }, { 6, 1, 0 },
4, //inc_limit { -6, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 7, 1, 0 }, { -7, 1, 0 }, { 8, 1, 1 },
7, //max_run { -8, 1, 1 }, { 2, 2, 0 }, { -2, 2, 0 }, { 9, 1, 1 }, { -9, 1, 1 }, { 10, 1, 1 },
},{ {-10, 1, 1 }, { 1, 3, 0 }, { -1, 3, 0 }, { 3, 2, 0 }, { -3, 2, 0 }, { 11, 1, 2 },
{ //level / run {-11, 1, 2 }, { 4, 2, 0 }, { -4, 2, 0 }, { 12, 1, 2 }, {-12, 1, 2 }, { 13, 1, 2 },
{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0},{ -3, 1, 0}, {-13, 1, 2 }, { 5, 2, 0 }, { -5, 2, 0 }, { 1, 4, 0 }, { -1, 4, 0 }, { 2, 3, 0 },
{ EOB },{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0},{ -5, 1, 0},{ 6, 1, 0}, { -2, 3, 0 }, { 14, 1, 2 }, {-14, 1, 2 }, { 6, 2, 0 }, { -6, 2, 0 }, { 15, 1, 2 },
{ -6, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 7, 1, 0},{ -7, 1, 0},{ 8, 1, 1}, {-15, 1, 2 }, { 16, 1, 2 }, {-16, 1, 2 }, { 3, 3, 0 }, { -3, 3, 0 }, { 1, 5, 0 },
{ -8, 1, 1},{ 2, 2, 0},{ -2, 2, 0},{ 9, 1, 1},{ -9, 1, 1},{ 10, 1, 1}, { -1, 5, 0 }, { 7, 2, 0 }, { -7, 2, 0 }, { 17, 1, 2 }, {-17, 1, 2 }
{-10, 1, 1},{ 1, 3, 0},{ -1, 3, 0},{ 3, 2, 0},{ -3, 2, 0},{ 11, 1, 2}, },
{-11, 1, 2},{ 4, 2, 0},{ -4, 2, 0},{ 12, 1, 2},{-12, 1, 2},{ 13, 1, 2}, //level_add
{-13, 1, 2},{ 5, 2, 0},{ -5, 2, 0},{ 1, 4, 0},{ -1, 4, 0},{ 2, 3, 0}, { 0,18, 8, 4, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -2, 3, 0},{ 14, 1, 2},{-14, 1, 2},{ 6, 2, 0},{ -6, 2, 0},{ 15, 1, 2}, 2, //golomb_order
{-15, 1, 2},{ 16, 1, 2},{-16, 1, 2},{ 3, 3, 0},{ -3, 3, 0},{ 1, 5, 0}, 7, //inc_limit
{ -1, 5, 0},{ 7, 2, 0},{ -7, 2, 0},{ 17, 1, 2},{-17, 1, 2} 5, //max_run
}, },
//level_add {
{ 0,18, 8, 4, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
2, //golomb_order { -3, 1, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 }, { -5, 1, 0 }, { 6, 1, 0 },
7, //inc_limit { -6, 1, 0 }, { 7, 1, 0 }, { -7, 1, 0 }, { 8, 1, 0 }, { -8, 1, 0 }, { 9, 1, 0 },
5, //max_run { -9, 1, 0 }, { 10, 1, 0 }, {-10, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 11, 1, 1 },
},{ {-11, 1, 1 }, { 12, 1, 1 }, {-12, 1, 1 }, { 13, 1, 1 }, {-13, 1, 1 }, { 2, 2, 0 },
{ //level / run { -2, 2, 0 }, { 14, 1, 1 }, {-14, 1, 1 }, { 15, 1, 1 }, {-15, 1, 1 }, { 3, 2, 0 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, { -3, 2, 0 }, { 16, 1, 1 }, {-16, 1, 1 }, { 1, 3, 0 }, { -1, 3, 0 }, { 17, 1, 1 },
{ -3, 1, 0},{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0},{ -5, 1, 0},{ 6, 1, 0}, {-17, 1, 1 }, { 4, 2, 0 }, { -4, 2, 0 }, { 18, 1, 1 }, {-18, 1, 1 }, { 5, 2, 0 },
{ -6, 1, 0},{ 7, 1, 0},{ -7, 1, 0},{ 8, 1, 0},{ -8, 1, 0},{ 9, 1, 0}, { -5, 2, 0 }, { 19, 1, 1 }, {-19, 1, 1 }, { 20, 1, 1 }, {-20, 1, 1 }, { 6, 2, 0 },
{ -9, 1, 0},{ 10, 1, 0},{-10, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 11, 1, 1}, { -6, 2, 0 }, { 21, 1, 1 }, {-21, 1, 1 }, { 2, 3, 0 }, { -2, 3, 0 }
{-11, 1, 1},{ 12, 1, 1},{-12, 1, 1},{ 13, 1, 1},{-13, 1, 1},{ 2, 2, 0}, },
{ -2, 2, 0},{ 14, 1, 1},{-14, 1, 1},{ 15, 1, 1},{-15, 1, 1},{ 3, 2, 0}, //level_add
{ -3, 2, 0},{ 16, 1, 1},{-16, 1, 1},{ 1, 3, 0},{ -1, 3, 0},{ 17, 1, 1}, { 0, 22, 7, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{-17, 1, 1},{ 4, 2, 0},{ -4, 2, 0},{ 18, 1, 1},{-18, 1, 1},{ 5, 2, 0}, 2, //golomb_order
{ -5, 2, 0},{ 19, 1, 1},{-19, 1, 1},{ 20, 1, 1},{-20, 1, 1},{ 6, 2, 0}, 10, //inc_limit
{ -6, 2, 0},{ 21, 1, 1},{-21, 1, 1},{ 2, 3, 0},{ -2, 3, 0} 3, //max_run
}, },
//level_add {
{ 0,22, 7, 3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
2, //golomb_order { -3, 1, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 }, { -5, 1, 0 }, { 6, 1, 0 },
10, //inc_limit { -6, 1, 0 }, { 7, 1, 0 }, { -7, 1, 0 }, { 8, 1, 0 }, { -8, 1, 0 }, { 9, 1, 0 },
3, //max_run { -9, 1, 0 }, { 10, 1, 0 }, {-10, 1, 0 }, { 11, 1, 0 }, {-11, 1, 0 }, { 12, 1, 0 },
},{ {-12, 1, 0 }, { 13, 1, 0 }, {-13, 1, 0 }, { 14, 1, 0 }, {-14, 1, 0 }, { 15, 1, 0 },
{ //level / run {-15, 1, 0 }, { 16, 1, 0 }, {-16, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 17, 1, 0 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, {-17, 1, 0 }, { 18, 1, 0 }, {-18, 1, 0 }, { 19, 1, 0 }, {-19, 1, 0 }, { 20, 1, 0 },
{ -3, 1, 0},{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0},{ -5, 1, 0},{ 6, 1, 0}, {-20, 1, 0 }, { 21, 1, 0 }, {-21, 1, 0 }, { 2, 2, 0 }, { -2, 2, 0 }, { 22, 1, 0 },
{ -6, 1, 0},{ 7, 1, 0},{ -7, 1, 0},{ 8, 1, 0},{ -8, 1, 0},{ 9, 1, 0}, {-22, 1, 0 }, { 23, 1, 0 }, {-23, 1, 0 }, { 24, 1, 0 }, {-24, 1, 0 }, { 25, 1, 0 },
{ -9, 1, 0},{ 10, 1, 0},{-10, 1, 0},{ 11, 1, 0},{-11, 1, 0},{ 12, 1, 0}, {-25, 1, 0 }, { 3, 2, 0 }, { -3, 2, 0 }, { 26, 1, 0 }, {-26, 1, 0 }
{-12, 1, 0},{ 13, 1, 0},{-13, 1, 0},{ 14, 1, 0},{-14, 1, 0},{ 15, 1, 0}, },
{-15, 1, 0},{ 16, 1, 0},{-16, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 17, 1, 0}, //level_add
{-17, 1, 0},{ 18, 1, 0},{-18, 1, 0},{ 19, 1, 0},{-19, 1, 0},{ 20, 1, 0}, { 0, 27, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{-20, 1, 0},{ 21, 1, 0},{-21, 1, 0},{ 2, 2, 0},{ -2, 2, 0},{ 22, 1, 0}, 2, //golomb_order
{-22, 1, 0},{ 23, 1, 0},{-23, 1, 0},{ 24, 1, 0},{-24, 1, 0},{ 25, 1, 0}, INT_MAX, //inc_limit
{-25, 1, 0},{ 3, 2, 0},{ -3, 2, 0},{ 26, 1, 0},{-26, 1, 0} 2, //max_run
}, }
//level_add
{ 0,27, 4,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
2, //golomb_order
INT_MAX, //inc_limit
2, //max_run
}
}; };
static const struct dec_2dvlc inter_dec[7] = { static const struct dec_2dvlc inter_dec[7] = {
{ {
{ //level / run { //level / run
{ 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, { 1, 1, 1 }, { -1, 1, 1 }, { 1, 2, 1 }, { -1, 2, 1 }, { 1, 3, 1 }, { -1, 3, 1 },
{ 1, 4, 1},{ -1, 4, 1},{ 1, 5, 1},{ -1, 5, 1},{ 1, 6, 1},{ -1, 6, 1}, { 1, 4, 1 }, { -1, 4, 1 }, { 1, 5, 1 }, { -1, 5, 1 }, { 1, 6, 1 }, { -1, 6, 1 },
{ 1, 7, 1},{ -1, 7, 1},{ 1, 8, 1},{ -1, 8, 1},{ 1, 9, 1},{ -1, 9, 1}, { 1, 7, 1 }, { -1, 7, 1 }, { 1, 8, 1 }, { -1, 8, 1 }, { 1, 9, 1 }, { -1, 9, 1 },
{ 1,10, 1},{ -1,10, 1},{ 1,11, 1},{ -1,11, 1},{ 1,12, 1},{ -1,12, 1}, { 1, 10, 1 }, { -1, 10, 1 }, { 1, 11, 1 }, { -1, 11, 1 }, { 1, 12, 1 }, { -1, 12, 1 },
{ 1,13, 1},{ -1,13, 1},{ 2, 1, 2},{ -2, 1, 2},{ 1,14, 1},{ -1,14, 1}, { 1, 13, 1 }, { -1, 13, 1 }, { 2, 1, 2 }, { -2, 1, 2 }, { 1, 14, 1 }, { -1, 14, 1 },
{ 1,15, 1},{ -1,15, 1},{ 1,16, 1},{ -1,16, 1},{ 1,17, 1},{ -1,17, 1}, { 1, 15, 1 }, { -1, 15, 1 }, { 1, 16, 1 }, { -1, 16, 1 }, { 1, 17, 1 }, { -1, 17, 1 },
{ 1,18, 1},{ -1,18, 1},{ 1,19, 1},{ -1,19, 1},{ 3, 1, 3},{ -3, 1, 3}, { 1, 18, 1 }, { -1, 18, 1 }, { 1, 19, 1 }, { -1, 19, 1 }, { 3, 1, 3 }, { -3, 1, 3 },
{ 1,20, 1},{ -1,20, 1},{ 1,21, 1},{ -1,21, 1},{ 2, 2, 2},{ -2, 2, 2}, { 1, 20, 1 }, { -1, 20, 1 }, { 1, 21, 1 }, { -1, 21, 1 }, { 2, 2, 2 }, { -2, 2, 2 },
{ 1,22, 1},{ -1,22, 1},{ 1,23, 1},{ -1,23, 1},{ 1,24, 1},{ -1,24, 1}, { 1, 22, 1 }, { -1, 22, 1 }, { 1, 23, 1 }, { -1, 23, 1 }, { 1, 24, 1 }, { -1, 24, 1 },
{ 1,25, 1},{ -1,25, 1},{ 1,26, 1},{ -1,26, 1},{ EOB } { 1, 25, 1 }, { -1, 25, 1 }, { 1, 26, 1 }, { -1, 26, 1 }, { EOB }
},
//level_add
{ 0, 4, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 },
3, //golomb_order
0, //inc_limit
26 //max_run
}, },
//level_add {
{ 0, 4, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, { //level / run
2, 2, 2, 2, 2, 2, 2, 2, 2, 2}, { 1, 1, 0 }, { -1, 1, 0 }, { EOB }, { 1, 2, 0 }, { -1, 2, 0 }, { 1, 3, 0 },
3, //golomb_order { -1, 3, 0 }, { 1, 4, 0 }, { -1, 4, 0 }, { 1, 5, 0 }, { -1, 5, 0 }, { 1, 6, 0 },
0, //inc_limit { -1, 6, 0 }, { 2, 1, 1 }, { -2, 1, 1 }, { 1, 7, 0 }, { -1, 7, 0 }, { 1, 8, 0 },
26 //max_run { -1, 8, 0 }, { 1, 9, 0 }, { -1, 9, 0 }, { 1, 10, 0 }, { -1, 10, 0 }, { 2, 2, 1 },
},{ { -2, 2, 1 }, { 1, 11, 0 }, { -1, 11, 0 }, { 1, 12, 0 }, { -1, 12, 0 }, { 3, 1, 2 },
{ //level / run { -3, 1, 2 }, { 1, 13, 0 }, { -1, 13, 0 }, { 1, 14, 0 }, { -1, 14, 0 }, { 2, 3, 1 },
{ 1, 1, 0},{ -1, 1, 0},{ EOB },{ 1, 2, 0},{ -1, 2, 0},{ 1, 3, 0}, { -2, 3, 1 }, { 1, 15, 0 }, { -1, 15, 0 }, { 2, 4, 1 }, { -2, 4, 1 }, { 1, 16, 0 },
{ -1, 3, 0},{ 1, 4, 0},{ -1, 4, 0},{ 1, 5, 0},{ -1, 5, 0},{ 1, 6, 0}, { -1, 16, 0 }, { 2, 5, 1 }, { -2, 5, 1 }, { 1, 17, 0 }, { -1, 17, 0 }, { 4, 1, 3 },
{ -1, 6, 0},{ 2, 1, 1},{ -2, 1, 1},{ 1, 7, 0},{ -1, 7, 0},{ 1, 8, 0}, { -4, 1, 3 }, { 2, 6, 1 }, { -2, 6, 1 }, { 1, 18, 0 }, { -1, 18, 0 }, { 1, 19, 0 },
{ -1, 8, 0},{ 1, 9, 0},{ -1, 9, 0},{ 1,10, 0},{ -1,10, 0},{ 2, 2, 1}, { -1, 19, 0 }, { 2, 7, 1 }, { -2, 7, 1 }, { 3, 2, 2 }, { -3, 2, 2 }
{ -2, 2, 1},{ 1,11, 0},{ -1,11, 0},{ 1,12, 0},{ -1,12, 0},{ 3, 1, 2}, },
{ -3, 1, 2},{ 1,13, 0},{ -1,13, 0},{ 1,14, 0},{ -1,14, 0},{ 2, 3, 1}, //level_add
{ -2, 3, 1},{ 1,15, 0},{ -1,15, 0},{ 2, 4, 1},{ -2, 4, 1},{ 1,16, 0}, { 0, 5, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1 },
{ -1,16, 0},{ 2, 5, 1},{ -2, 5, 1},{ 1,17, 0},{ -1,17, 0},{ 4, 1, 3}, 2, //golomb_order
{ -4, 1, 3},{ 2, 6, 1},{ -2, 6, 1},{ 1,18, 0},{ -1,18, 0},{ 1,19, 0}, 1, //inc_limit
{ -1,19, 0},{ 2, 7, 1},{ -2, 7, 1},{ 3, 2, 2},{ -3, 2, 2} 19 //max_run
}, },
//level_add {
{ 0, 5, 4, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, { //level / run
2, 2, 2,-1,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { EOB }, { 1, 2, 0 }, { -1, 2, 0 }, { 2, 1, 0 },
2, //golomb_order { -2, 1, 0 }, { 1, 3, 0 }, { -1, 3, 0 }, { 1, 4, 0 }, { -1, 4, 0 }, { 3, 1, 1 },
1, //inc_limit { -3, 1, 1 }, { 2, 2, 0 }, { -2, 2, 0 }, { 1, 5, 0 }, { -1, 5, 0 }, { 1, 6, 0 },
19 //max_run { -1, 6, 0 }, { 1, 7, 0 }, { -1, 7, 0 }, { 2, 3, 0 }, { -2, 3, 0 }, { 4, 1, 2 },
},{ { -4, 1, 2 }, { 1, 8, 0 }, { -1, 8, 0 }, { 3, 2, 1 }, { -3, 2, 1 }, { 2, 4, 0 },
{ //level / run { -2, 4, 0 }, { 1, 9, 0 }, { -1, 9, 0 }, { 1, 10, 0 }, { -1, 10, 0 }, { 5, 1, 2 },
{ 1, 1, 0},{ -1, 1, 0},{ EOB },{ 1, 2, 0},{ -1, 2, 0},{ 2, 1, 0}, { -5, 1, 2 }, { 2, 5, 0 }, { -2, 5, 0 }, { 1, 11, 0 }, { -1, 11, 0 }, { 2, 6, 0 },
{ -2, 1, 0},{ 1, 3, 0},{ -1, 3, 0},{ 1, 4, 0},{ -1, 4, 0},{ 3, 1, 1}, { -2, 6, 0 }, { 1, 12, 0 }, { -1, 12, 0 }, { 3, 3, 1 }, { -3, 3, 1 }, { 6, 1, 2 },
{ -3, 1, 1},{ 2, 2, 0},{ -2, 2, 0},{ 1, 5, 0},{ -1, 5, 0},{ 1, 6, 0}, { -6, 1, 2 }, { 4, 2, 2 }, { -4, 2, 2 }, { 1, 13, 0 }, { -1, 13, 0 }, { 2, 7, 0 },
{ -1, 6, 0},{ 1, 7, 0},{ -1, 7, 0},{ 2, 3, 0},{ -2, 3, 0},{ 4, 1, 2}, { -2, 7, 0 }, { 3, 4, 1 }, { -3, 4, 1 }, { 1, 14, 0 }, { -1, 14, 0 }
{ -4, 1, 2},{ 1, 8, 0},{ -1, 8, 0},{ 3, 2, 1},{ -3, 2, 1},{ 2, 4, 0}, },
{ -2, 4, 0},{ 1, 9, 0},{ -1, 9, 0},{ 1,10, 0},{ -1,10, 0},{ 5, 1, 2}, //level_add
{ -5, 1, 2},{ 2, 5, 0},{ -2, 5, 0},{ 1,11, 0},{ -1,11, 0},{ 2, 6, 0}, { 0, 7, 5, 4, 4, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -2, 6, 0},{ 1,12, 0},{ -1,12, 0},{ 3, 3, 1},{ -3, 3, 1},{ 6, 1, 2}, 2, //golomb_order
{ -6, 1, 2},{ 4, 2, 2},{ -4, 2, 2},{ 1,13, 0},{ -1,13, 0},{ 2, 7, 0}, 2, //inc_limit
{ -2, 7, 0},{ 3, 4, 1},{ -3, 4, 1},{ 1,14, 0},{ -1,14, 0} 14 //max_run
}, },
//level_add {
{ 0, 7, 5, 4, 4, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { EOB }, { 2, 1, 0 }, { -2, 1, 0 }, { 1, 2, 0 },
2, //golomb_order { -1, 2, 0 }, { 3, 1, 0 }, { -3, 1, 0 }, { 1, 3, 0 }, { -1, 3, 0 }, { 2, 2, 0 },
2, //inc_limit { -2, 2, 0 }, { 4, 1, 1 }, { -4, 1, 1 }, { 1, 4, 0 }, { -1, 4, 0 }, { 5, 1, 1 },
14 //max_run { -5, 1, 1 }, { 1, 5, 0 }, { -1, 5, 0 }, { 3, 2, 0 }, { -3, 2, 0 }, { 2, 3, 0 },
},{ { -2, 3, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 6, 1, 1 }, { -6, 1, 1 }, { 2, 4, 0 },
{ //level / run { -2, 4, 0 }, { 1, 7, 0 }, { -1, 7, 0 }, { 4, 2, 1 }, { -4, 2, 1 }, { 7, 1, 2 },
{ 1, 1, 0},{ -1, 1, 0},{ EOB },{ 2, 1, 0},{ -2, 1, 0},{ 1, 2, 0}, { -7, 1, 2 }, { 3, 3, 0 }, { -3, 3, 0 }, { 1, 8, 0 }, { -1, 8, 0 }, { 2, 5, 0 },
{ -1, 2, 0},{ 3, 1, 0},{ -3, 1, 0},{ 1, 3, 0},{ -1, 3, 0},{ 2, 2, 0}, { -2, 5, 0 }, { 8, 1, 2 }, { -8, 1, 2 }, { 1, 9, 0 }, { -1, 9, 0 }, { 3, 4, 0 },
{ -2, 2, 0},{ 4, 1, 1},{ -4, 1, 1},{ 1, 4, 0},{ -1, 4, 0},{ 5, 1, 1}, { -3, 4, 0 }, { 2, 6, 0 }, { -2, 6, 0 }, { 5, 2, 1 }, { -5, 2, 1 }, { 1, 10, 0 },
{ -5, 1, 1},{ 1, 5, 0},{ -1, 5, 0},{ 3, 2, 0},{ -3, 2, 0},{ 2, 3, 0}, { -1, 10, 0 }, { 9, 1, 2 }, { -9, 1, 2 }, { 4, 3, 1 }, { -4, 3, 1 }
{ -2, 3, 0},{ 1, 6, 0},{ -1, 6, 0},{ 6, 1, 1},{ -6, 1, 1},{ 2, 4, 0}, },
{ -2, 4, 0},{ 1, 7, 0},{ -1, 7, 0},{ 4, 2, 1},{ -4, 2, 1},{ 7, 1, 2}, //level_add
{ -7, 1, 2},{ 3, 3, 0},{ -3, 3, 0},{ 1, 8, 0},{ -1, 8, 0},{ 2, 5, 0}, { 0,10, 6, 5, 4, 3, 3, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -2, 5, 0},{ 8, 1, 2},{ -8, 1, 2},{ 1, 9, 0},{ -1, 9, 0},{ 3, 4, 0}, 2, //golomb_order
{ -3, 4, 0},{ 2, 6, 0},{ -2, 6, 0},{ 5, 2, 1},{ -5, 2, 1},{ 1,10, 0}, 3, //inc_limit
{ -1,10, 0},{ 9, 1, 2},{ -9, 1, 2},{ 4, 3, 1},{ -4, 3, 1} 10 //max_run
}, },
//level_add {
{ 0,10, 6, 5, 4, 3, 3, 2, 2, 2, 2,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { EOB }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
2, //golomb_order { -3, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 },
3, //inc_limit { -5, 1, 0 }, { 2, 2, 0 }, { -2, 2, 0 }, { 1, 3, 0 }, { -1, 3, 0 }, { 6, 1, 0 },
10 //max_run { -6, 1, 0 }, { 3, 2, 0 }, { -3, 2, 0 }, { 7, 1, 1 }, { -7, 1, 1 }, { 1, 4, 0 },
},{ { -1, 4, 0 }, { 8, 1, 1 }, { -8, 1, 1 }, { 2, 3, 0 }, { -2, 3, 0 }, { 4, 2, 0 },
{ //level / run { -4, 2, 0 }, { 1, 5, 0 }, { -1, 5, 0 }, { 9, 1, 1 }, { -9, 1, 1 }, { 5, 2, 0 },
{ 1, 1, 0},{ -1, 1, 0},{ EOB },{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, { -5, 2, 0 }, { 2, 4, 0 }, { -2, 4, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 10, 1, 2 },
{ -3, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0}, {-10, 1, 2 }, { 3, 3, 0 }, { -3, 3, 0 }, { 11, 1, 2 }, {-11, 1, 2 }, { 1, 7, 0 },
{ -5, 1, 0},{ 2, 2, 0},{ -2, 2, 0},{ 1, 3, 0},{ -1, 3, 0},{ 6, 1, 0}, { -1, 7, 0 }, { 6, 2, 0 }, { -6, 2, 0 }, { 3, 4, 0 }, { -3, 4, 0 }, { 2, 5, 0 },
{ -6, 1, 0},{ 3, 2, 0},{ -3, 2, 0},{ 7, 1, 1},{ -7, 1, 1},{ 1, 4, 0}, { -2, 5, 0 }, { 12, 1, 2 }, {-12, 1, 2 }, { 4, 3, 0 }, { -4, 3, 0 }
{ -1, 4, 0},{ 8, 1, 1},{ -8, 1, 1},{ 2, 3, 0},{ -2, 3, 0},{ 4, 2, 0}, },
{ -4, 2, 0},{ 1, 5, 0},{ -1, 5, 0},{ 9, 1, 1},{ -9, 1, 1},{ 5, 2, 0}, //level_add
{ -5, 2, 0},{ 2, 4, 0},{ -2, 4, 0},{ 1, 6, 0},{ -1, 6, 0},{ 10, 1, 2}, { 0, 13, 7, 5, 4, 3, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{-10, 1, 2},{ 3, 3, 0},{ -3, 3, 0},{ 11, 1, 2},{-11, 1, 2},{ 1, 7, 0}, 2, //golomb_order
{ -1, 7, 0},{ 6, 2, 0},{ -6, 2, 0},{ 3, 4, 0},{ -3, 4, 0},{ 2, 5, 0}, 6, //inc_limit
{ -2, 5, 0},{ 12, 1, 2},{-12, 1, 2},{ 4, 3, 0},{ -4, 3, 0} 7 //max_run
}, },
//level_add {
{ 0,13, 7, 5, 4, 3, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
2, //golomb_order { -3, 1, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 }, { -5, 1, 0 }, { 1, 2, 0 },
6, //inc_limit { -1, 2, 0 }, { 6, 1, 0 }, { -6, 1, 0 }, { 7, 1, 0 }, { -7, 1, 0 }, { 8, 1, 0 },
7 //max_run { -8, 1, 0 }, { 2, 2, 0 }, { -2, 2, 0 }, { 9, 1, 0 }, { -9, 1, 0 }, { 1, 3, 0 },
},{ { -1, 3, 0 }, { 10, 1, 1 }, { -10, 1, 1 }, { 3, 2, 0 }, { -3, 2, 0 }, { 11, 1, 1 },
{ //level / run { -11, 1, 1 }, { 4, 2, 0 }, { -4, 2, 0 }, { 12, 1, 1 }, { -12, 1, 1 }, { 1, 4, 0 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, { -1, 4, 0 }, { 2, 3, 0 }, { -2, 3, 0 }, { 13, 1, 1 }, { -13, 1, 1 }, { 5, 2, 0 },
{ -3, 1, 0},{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0},{ -5, 1, 0},{ 1, 2, 0}, { -5, 2, 0 }, { 14, 1, 1 }, { -14, 1, 1 }, { 6, 2, 0 }, { -6, 2, 0 }, { 1, 5, 0 },
{ -1, 2, 0},{ 6, 1, 0},{ -6, 1, 0},{ 7, 1, 0},{ -7, 1, 0},{ 8, 1, 0}, { -1, 5, 0 }, { 15, 1, 1 }, { -15, 1, 1 }, { 3, 3, 0 }, { -3, 3, 0 }, { 16, 1, 1 },
{ -8, 1, 0},{ 2, 2, 0},{ -2, 2, 0},{ 9, 1, 0},{ -9, 1, 0},{ 1, 3, 0}, { -16, 1, 1 }, { 2, 4, 0 }, { -2, 4, 0 }, { 7, 2, 0 }, { -7, 2, 0 }
{ -1, 3, 0},{ 10, 1, 1},{-10, 1, 1},{ 3, 2, 0},{ -3, 2, 0},{ 11, 1, 1}, },
{-11, 1, 1},{ 4, 2, 0},{ -4, 2, 0},{ 12, 1, 1},{-12, 1, 1},{ 1, 4, 0}, //level_add
{ -1, 4, 0},{ 2, 3, 0},{ -2, 3, 0},{ 13, 1, 1},{-13, 1, 1},{ 5, 2, 0}, { 0, 17, 8, 4, 3, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -5, 2, 0},{ 14, 1, 1},{-14, 1, 1},{ 6, 2, 0},{ -6, 2, 0},{ 1, 5, 0}, 2, //golomb_order
{ -1, 5, 0},{ 15, 1, 1},{-15, 1, 1},{ 3, 3, 0},{ -3, 3, 0},{ 16, 1, 1}, 9, //inc_limit
{-16, 1, 1},{ 2, 4, 0},{ -2, 4, 0},{ 7, 2, 0},{ -7, 2, 0} 5 //max_run
}, },
//level_add {
{ 0,17, 8, 4, 3, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
2, //golomb_order { -3, 1, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 }, { -5, 1, 0 }, { 6, 1, 0 },
9, //inc_limit { -6, 1, 0 }, { 7, 1, 0 }, { -7, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 8, 1, 0 },
5 //max_run { -8, 1, 0 }, { 9, 1, 0 }, { -9, 1, 0 }, { 10, 1, 0 }, { -10, 1, 0 }, { 11, 1, 0 },
},{ { -11, 1, 0 }, { 12, 1, 0 }, { -12, 1, 0 }, { 2, 2, 0 }, { -2, 2, 0 }, { 13, 1, 0 },
{ //level / run { -13, 1, 0 }, { 1, 3, 0 }, { -1, 3, 0 }, { 14, 1, 0 }, { -14, 1, 0 }, { 15, 1, 0 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, { -15, 1, 0 }, { 3, 2, 0 }, { -3, 2, 0 }, { 16, 1, 0 }, { -16, 1, 0 }, { 17, 1, 0 },
{ -3, 1, 0},{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0},{ -5, 1, 0},{ 6, 1, 0}, { -17, 1, 0 }, { 18, 1, 0 }, { -18, 1, 0 }, { 4, 2, 0 }, { -4, 2, 0 }, { 19, 1, 0 },
{ -6, 1, 0},{ 7, 1, 0},{ -7, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 8, 1, 0}, { -19, 1, 0 }, { 20, 1, 0 }, { -20, 1, 0 }, { 2, 3, 0 }, { -2, 3, 0 }, { 1, 4, 0 },
{ -8, 1, 0},{ 9, 1, 0},{ -9, 1, 0},{ 10, 1, 0},{-10, 1, 0},{ 11, 1, 0}, { -1, 4, 0 }, { 5, 2, 0 }, { -5, 2, 0 }, { 21, 1, 0 }, { -21, 1, 0 }
{-11, 1, 0},{ 12, 1, 0},{-12, 1, 0},{ 2, 2, 0},{ -2, 2, 0},{ 13, 1, 0}, },
{-13, 1, 0},{ 1, 3, 0},{ -1, 3, 0},{ 14, 1, 0},{-14, 1, 0},{ 15, 1, 0}, //level_add
{-15, 1, 0},{ 3, 2, 0},{ -3, 2, 0},{ 16, 1, 0},{-16, 1, 0},{ 17, 1, 0}, { 0, 22, 6, 3, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{-17, 1, 0},{ 18, 1, 0},{-18, 1, 0},{ 4, 2, 0},{ -4, 2, 0},{ 19, 1, 0}, 2, //golomb_order
{-19, 1, 0},{ 20, 1, 0},{-20, 1, 0},{ 2, 3, 0},{ -2, 3, 0},{ 1, 4, 0}, INT_MAX, //inc_limit
{ -1, 4, 0},{ 5, 2, 0},{ -5, 2, 0},{ 21, 1, 0},{-21, 1, 0} 4 //max_run
}, }
//level_add
{ 0,22, 6, 3, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
2, //golomb_order
INT_MAX, //inc_limit
4 //max_run
}
}; };
static const struct dec_2dvlc chroma_dec[5] = { static const struct dec_2dvlc chroma_dec[5] = {
{ {
{ //level / run { //level / run
{ 1, 1, 1},{ -1, 1, 1},{ 1, 2, 1},{ -1, 2, 1},{ 1, 3, 1},{ -1, 3, 1}, { 1, 1, 1 }, { -1, 1, 1 }, { 1, 2, 1 }, { -1, 2, 1 }, { 1, 3, 1 }, { -1, 3, 1 },
{ 1, 4, 1},{ -1, 4, 1},{ 1, 5, 1},{ -1, 5, 1},{ 1, 6, 1},{ -1, 6, 1}, { 1, 4, 1 }, { -1, 4, 1 }, { 1, 5, 1 }, { -1, 5, 1 }, { 1, 6, 1 }, { -1, 6, 1 },
{ 1, 7, 1},{ -1, 7, 1},{ 2, 1, 2},{ -2, 1, 2},{ 1, 8, 1},{ -1, 8, 1}, { 1, 7, 1 }, { -1, 7, 1 }, { 2, 1, 2 }, { -2, 1, 2 }, { 1, 8, 1 }, { -1, 8, 1 },
{ 1, 9, 1},{ -1, 9, 1},{ 1,10, 1},{ -1,10, 1},{ 1,11, 1},{ -1,11, 1}, { 1, 9, 1 }, { -1, 9, 1 }, { 1, 10, 1 }, { -1, 10, 1 }, { 1, 11, 1 }, { -1, 11, 1 },
{ 1,12, 1},{ -1,12, 1},{ 1,13, 1},{ -1,13, 1},{ 1,14, 1},{ -1,14, 1}, { 1, 12, 1 }, { -1, 12, 1 }, { 1, 13, 1 }, { -1, 13, 1 }, { 1, 14, 1 }, { -1, 14, 1 },
{ 1,15, 1},{ -1,15, 1},{ 3, 1, 3},{ -3, 1, 3},{ 1,16, 1},{ -1,16, 1}, { 1, 15, 1 }, { -1, 15, 1 }, { 3, 1, 3 }, { -3, 1, 3 }, { 1, 16, 1 }, { -1, 16, 1 },
{ 1,17, 1},{ -1,17, 1},{ 1,18, 1},{ -1,18, 1},{ 1,19, 1},{ -1,19, 1}, { 1, 17, 1 }, { -1, 17, 1 }, { 1, 18, 1 }, { -1, 18, 1 }, { 1, 19, 1 }, { -1, 19, 1 },
{ 1,20, 1},{ -1,20, 1},{ 1,21, 1},{ -1,21, 1},{ 1,22, 1},{ -1,22, 1}, { 1, 20, 1 }, { -1, 20, 1 }, { 1, 21, 1 }, { -1, 21, 1 }, { 1, 22, 1 }, { -1, 22, 1 },
{ 2, 2, 2},{ -2, 2, 2},{ 1,23, 1},{ -1,23, 1},{ 1,24, 1},{ -1,24, 1}, { 2, 2, 2 }, { -2, 2, 2 }, { 1, 23, 1 }, { -1, 23, 1 }, { 1, 24, 1 }, { -1, 24, 1 },
{ 1,25, 1},{ -1,25, 1},{ 4, 1, 3},{ -4, 1, 3},{ EOB } { 1, 25, 1 }, { -1, 25, 1 }, { 4, 1, 3 }, { -4, 1, 3 }, { EOB }
},
//level_add
{ 0, 5, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1 },
2, //golomb_order
0, //inc_limit
25 //max_run
}, },
//level_add {
{ 0, 5, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, { //level / run
2, 2, 2, 2, 2, 2, 2, 2, 2,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 2, 1, 1 },
2, //golomb_order { -2, 1, 1 }, { 1, 3, 0 }, { -1, 3, 0 }, { 1, 4, 0 }, { -1, 4, 0 }, { 1, 5, 0 },
0, //inc_limit { -1, 5, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 3, 1, 2 }, { -3, 1, 2 }, { 1, 7, 0 },
25 //max_run { -1, 7, 0 }, { 1, 8, 0 }, { -1, 8, 0 }, { 2, 2, 1 }, { -2, 2, 1 }, { 1, 9, 0 },
},{ { -1, 9, 0 }, { 1, 10, 0 }, { -1, 10, 0 }, { 1, 11, 0 }, { -1, 11, 0 }, { 4, 1, 2 },
{ //level / run { -4, 1, 2 }, { 1, 12, 0 }, { -1, 12, 0 }, { 1, 13, 0 }, { -1, 13, 0 }, { 1, 14, 0 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 2, 1, 1}, { -1, 14, 0 }, { 2, 3, 1 }, { -2, 3, 1 }, { 1, 15, 0 }, { -1, 15, 0 }, { 2, 4, 1 },
{ -2, 1, 1},{ 1, 3, 0},{ -1, 3, 0},{ 1, 4, 0},{ -1, 4, 0},{ 1, 5, 0}, { -2, 4, 1 }, { 5, 1, 3 }, { -5, 1, 3 }, { 3, 2, 2 }, { -3, 2, 2 }, { 1, 16, 0 },
{ -1, 5, 0},{ 1, 6, 0},{ -1, 6, 0},{ 3, 1, 2},{ -3, 1, 2},{ 1, 7, 0}, { -1, 16, 0 }, { 1, 17, 0 }, { -1, 17, 0 }, { 1, 18, 0 }, { -1, 18, 0 }, { 2, 5, 1 },
{ -1, 7, 0},{ 1, 8, 0},{ -1, 8, 0},{ 2, 2, 1},{ -2, 2, 1},{ 1, 9, 0}, { -2, 5, 1 }, { 1, 19, 0 }, { -1, 19, 0 }, { 1, 20, 0 }, { -1, 20, 0 }
{ -1, 9, 0},{ 1,10, 0},{ -1,10, 0},{ 1,11, 0},{ -1,11, 0},{ 4, 1, 2}, },
{ -4, 1, 2},{ 1,12, 0},{ -1,12, 0},{ 1,13, 0},{ -1,13, 0},{ 1,14, 0}, //level_add
{ -1,14, 0},{ 2, 3, 1},{ -2, 3, 1},{ 1,15, 0},{ -1,15, 0},{ 2, 4, 1}, { 0, 6, 4, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1 },
{ -2, 4, 1},{ 5, 1, 3},{ -5, 1, 3},{ 3, 2, 2},{ -3, 2, 2},{ 1,16, 0}, 0, //golomb_order
{ -1,16, 0},{ 1,17, 0},{ -1,17, 0},{ 1,18, 0},{ -1,18, 0},{ 2, 5, 1}, 1, //inc_limit
{ -2, 5, 1},{ 1,19, 0},{ -1,19, 0},{ 1,20, 0},{ -1,20, 0} 20 //max_run
}, },
//level_add {
{ 0, 6, 4, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, { //level / run
2, 2, 2, 2,-1,-1,-1,-1,-1,-1}, { 1, 1, 0 }, { -1, 1, 0 }, { EOB }, { 2, 1, 0 }, { -2, 1, 0 }, { 1, 2, 0 },
0, //golomb_order { -1, 2, 0 }, { 3, 1, 1 }, { -3, 1, 1 }, { 1, 3, 0 }, { -1, 3, 0 }, { 4, 1, 1 },
1, //inc_limit { -4, 1, 1 }, { 2, 2, 0 }, { -2, 2, 0 }, { 1, 4, 0 }, { -1, 4, 0 }, { 5, 1, 2 },
20 //max_run { -5, 1, 2 }, { 1, 5, 0 }, { -1, 5, 0 }, { 3, 2, 1 }, { -3, 2, 1 }, { 2, 3, 0 },
},{ { -2, 3, 0 }, { 1, 6, 0 }, { -1, 6, 0 }, { 6, 1, 2 }, { -6, 1, 2 }, { 1, 7, 0 },
{ //level / run { -1, 7, 0 }, { 2, 4, 0 }, { -2, 4, 0 }, { 7, 1, 2 }, { -7, 1, 2 }, { 1, 8, 0 },
{ 1, 1, 0},{ -1, 1, 0},{ EOB },{ 2, 1, 0},{ -2, 1, 0},{ 1, 2, 0}, { -1, 8, 0 }, { 4, 2, 1 }, { -4, 2, 1 }, { 1, 9, 0 }, { -1, 9, 0 }, { 3, 3, 1 },
{ -1, 2, 0},{ 3, 1, 1},{ -3, 1, 1},{ 1, 3, 0},{ -1, 3, 0},{ 4, 1, 1}, { -3, 3, 1 }, { 2, 5, 0 }, { -2, 5, 0 }, { 2, 6, 0 }, { -2, 6, 0 }, { 8, 1, 2 },
{ -4, 1, 1},{ 2, 2, 0},{ -2, 2, 0},{ 1, 4, 0},{ -1, 4, 0},{ 5, 1, 2}, { -8, 1, 2 }, { 1, 10, 0 }, { -1, 10, 0 }, { 1, 11, 0 }, { -1, 11, 0 }, { 9, 1, 2 },
{ -5, 1, 2},{ 1, 5, 0},{ -1, 5, 0},{ 3, 2, 1},{ -3, 2, 1},{ 2, 3, 0}, { -9, 1, 2 }, { 5, 2, 2 }, { -5, 2, 2 }, { 3, 4, 1 }, { -3, 4, 1 },
{ -2, 3, 0},{ 1, 6, 0},{ -1, 6, 0},{ 6, 1, 2},{ -6, 1, 2},{ 1, 7, 0}, },
{ -1, 7, 0},{ 2, 4, 0},{ -2, 4, 0},{ 7, 1, 2},{ -7, 1, 2},{ 1, 8, 0}, //level_add
{ -1, 8, 0},{ 4, 2, 1},{ -4, 2, 1},{ 1, 9, 0},{ -1, 9, 0},{ 3, 3, 1}, { 0,10, 6, 4, 4, 3, 3, 2, 2, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -3, 3, 1},{ 2, 5, 0},{ -2, 5, 0},{ 2, 6, 0},{ -2, 6, 0},{ 8, 1, 2}, 1, //golomb_order
{ -8, 1, 2},{ 1,10, 0},{ -1,10, 0},{ 1,11, 0},{ -1,11, 0},{ 9, 1, 2}, 2, //inc_limit
{ -9, 1, 2},{ 5, 2, 2},{ -5, 2, 2},{ 3, 4, 1},{ -3, 4, 1}, 11 //max_run
}, },
//level_add {
{ 0,10, 6, 4, 4, 3, 3, 2, 2, 2, 2, 2,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
1, //golomb_order { -3, 1, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 1, 2, 0 }, { -1, 2, 0 }, { 5, 1, 1 },
2, //inc_limit { -5, 1, 1 }, { 2, 2, 0 }, { -2, 2, 0 }, { 6, 1, 1 }, { -6, 1, 1 }, { 1, 3, 0 },
11 //max_run { -1, 3, 0 }, { 7, 1, 1 }, { -7, 1, 1 }, { 3, 2, 0 }, { -3, 2, 0 }, { 8, 1, 1 },
},{ { -8, 1, 1 }, { 1, 4, 0 }, { -1, 4, 0 }, { 2, 3, 0 }, { -2, 3, 0 }, { 9, 1, 1 },
{ //level / run { -9, 1, 1 }, { 4, 2, 0 }, { -4, 2, 0 }, { 1, 5, 0 }, { -1, 5, 0 }, { 10, 1, 1 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, {-10, 1, 1 }, { 3, 3, 0 }, { -3, 3, 0 }, { 5, 2, 1 }, { -5, 2, 1 }, { 2, 4, 0 },
{ -3, 1, 0},{ 4, 1, 0},{ -4, 1, 0},{ 1, 2, 0},{ -1, 2, 0},{ 5, 1, 1}, { -2, 4, 0 }, { 11, 1, 1 }, {-11, 1, 1 }, { 1, 6, 0 }, { -1, 6, 0 }, { 12, 1, 1 },
{ -5, 1, 1},{ 2, 2, 0},{ -2, 2, 0},{ 6, 1, 1},{ -6, 1, 1},{ 1, 3, 0}, {-12, 1, 1 }, { 1, 7, 0 }, { -1, 7, 0 }, { 6, 2, 1 }, { -6, 2, 1 }, { 13, 1, 1 },
{ -1, 3, 0},{ 7, 1, 1},{ -7, 1, 1},{ 3, 2, 0},{ -3, 2, 0},{ 8, 1, 1}, {-13, 1, 1 }, { 2, 5, 0 }, { -2, 5, 0 }, { 1, 8, 0 }, { -1, 8, 0 },
{ -8, 1, 1},{ 1, 4, 0},{ -1, 4, 0},{ 2, 3, 0},{ -2, 3, 0},{ 9, 1, 1}, },
{ -9, 1, 1},{ 4, 2, 0},{ -4, 2, 0},{ 1, 5, 0},{ -1, 5, 0},{ 10, 1, 1}, //level_add
{-10, 1, 1},{ 3, 3, 0},{ -3, 3, 0},{ 5, 2, 1},{ -5, 2, 1},{ 2, 4, 0}, { 0, 14, 7, 4, 3, 3, 2, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{ -2, 4, 0},{ 11, 1, 1},{-11, 1, 1},{ 1, 6, 0},{ -1, 6, 0},{ 12, 1, 1}, 1, //golomb_order
{-12, 1, 1},{ 1, 7, 0},{ -1, 7, 0},{ 6, 2, 1},{ -6, 2, 1},{ 13, 1, 1}, 4, //inc_limit
{-13, 1, 1},{ 2, 5, 0},{ -2, 5, 0},{ 1, 8, 0},{ -1, 8, 0}, 8 //max_run
}, },
//level_add {
{ 0,14, 7, 4, 3, 3, 2, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1, { //level / run
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1}, { EOB }, { 1, 1, 0 }, { -1, 1, 0 }, { 2, 1, 0 }, { -2, 1, 0 }, { 3, 1, 0 },
1, //golomb_order { -3, 1, 0 }, { 4, 1, 0 }, { -4, 1, 0 }, { 5, 1, 0 }, { -5, 1, 0 }, { 6, 1, 0 },
4, //inc_limit { -6, 1, 0 }, { 7, 1, 0 }, { -7, 1, 0 }, { 8, 1, 0 }, { -8, 1, 0 }, { 1, 2, 0 },
8 //max_run { -1, 2, 0 }, { 9, 1, 0 }, { -9, 1, 0 }, { 10, 1, 0 }, { -10, 1, 0 }, { 11, 1, 0 },
},{ { -11, 1, 0 }, { 2, 2, 0 }, { -2, 2, 0 }, { 12, 1, 0 }, { -12, 1, 0 }, { 13, 1, 0 },
{ //level / run { -13, 1, 0 }, { 3, 2, 0 }, { -3, 2, 0 }, { 14, 1, 0 }, { -14, 1, 0 }, { 1, 3, 0 },
{ EOB },{ 1, 1, 0},{ -1, 1, 0},{ 2, 1, 0},{ -2, 1, 0},{ 3, 1, 0}, { -1, 3, 0 }, { 15, 1, 0 }, { -15, 1, 0 }, { 4, 2, 0 }, { -4, 2, 0 }, { 16, 1, 0 },
{ -3, 1, 0},{ 4, 1, 0},{ -4, 1, 0},{ 5, 1, 0},{ -5, 1, 0},{ 6, 1, 0}, { -16, 1, 0 }, { 17, 1, 0 }, { -17, 1, 0 }, { 5, 2, 0 }, { -5, 2, 0 }, { 1, 4, 0 },
{ -6, 1, 0},{ 7, 1, 0},{ -7, 1, 0},{ 8, 1, 0},{ -8, 1, 0},{ 1, 2, 0}, { -1, 4, 0 }, { 2, 3, 0 }, { -2, 3, 0 }, { 18, 1, 0 }, { -18, 1, 0 }, { 6, 2, 0 },
{ -1, 2, 0},{ 9, 1, 0},{ -9, 1, 0},{ 10, 1, 0},{-10, 1, 0},{ 11, 1, 0}, { -6, 2, 0 }, { 19, 1, 0 }, { -19, 1, 0 }, { 1, 5, 0 }, { -1, 5, 0 },
{-11, 1, 0},{ 2, 2, 0},{ -2, 2, 0},{ 12, 1, 0},{-12, 1, 0},{ 13, 1, 0}, },
{-13, 1, 0},{ 3, 2, 0},{ -3, 2, 0},{ 14, 1, 0},{-14, 1, 0},{ 1, 3, 0}, //level_add
{ -1, 3, 0},{ 15, 1, 0},{-15, 1, 0},{ 4, 2, 0},{ -4, 2, 0},{ 16, 1, 0}, { 0, 20, 7, 3, 2, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 },
{-16, 1, 0},{ 17, 1, 0},{-17, 1, 0},{ 5, 2, 0},{ -5, 2, 0},{ 1, 4, 0}, 0, //golomb_order
{ -1, 4, 0},{ 2, 3, 0},{ -2, 3, 0},{ 18, 1, 0},{-18, 1, 0},{ 6, 2, 0}, INT_MAX, //inc_limit
{ -6, 2, 0},{ 19, 1, 0},{-19, 1, 0},{ 1, 5, 0},{ -1, 5, 0}, 5, //max_run
}, }
//level_add
{ 0,20, 7, 3, 2, 2,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
0, //golomb_order
INT_MAX, //inc_limit
5, //max_run
}
}; };
#undef EOB #undef EOB
...@@ -462,15 +459,17 @@ static const struct dec_2dvlc chroma_dec[5] = { ...@@ -462,15 +459,17 @@ static const struct dec_2dvlc chroma_dec[5] = {
* *
****************************************************************************/ ****************************************************************************/
static inline void store_mvs(AVSContext *h) { static inline void store_mvs(AVSContext *h)
h->col_mv[h->mbidx*4 + 0] = h->mv[MV_FWD_X0]; {
h->col_mv[h->mbidx*4 + 1] = h->mv[MV_FWD_X1]; h->col_mv[h->mbidx * 4 + 0] = h->mv[MV_FWD_X0];
h->col_mv[h->mbidx*4 + 2] = h->mv[MV_FWD_X2]; h->col_mv[h->mbidx * 4 + 1] = h->mv[MV_FWD_X1];
h->col_mv[h->mbidx*4 + 3] = h->mv[MV_FWD_X3]; h->col_mv[h->mbidx * 4 + 2] = h->mv[MV_FWD_X2];
h->col_mv[h->mbidx * 4 + 3] = h->mv[MV_FWD_X3];
} }
static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw, static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw,
cavs_vector *col_mv) { cavs_vector *col_mv)
{
cavs_vector *pmv_bw = pmv_fw + MV_BWD_OFFS; cavs_vector *pmv_bw = pmv_fw + MV_BWD_OFFS;
int den = h->direct_den[col_mv->ref]; int den = h->direct_den[col_mv->ref];
int m = col_mv->x >> 31; int m = col_mv->x >> 31;
...@@ -480,14 +479,16 @@ static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw, ...@@ -480,14 +479,16 @@ static inline void mv_pred_direct(AVSContext *h, cavs_vector *pmv_fw,
pmv_fw->ref = 1; pmv_fw->ref = 1;
pmv_bw->ref = 0; pmv_bw->ref = 0;
/* scale the co-located motion vector according to its temporal span */ /* scale the co-located motion vector according to its temporal span */
pmv_fw->x = (((den+(den*col_mv->x*pmv_fw->dist^m)-m-1)>>14)^m)-m; pmv_fw->x = (((den + (den * col_mv->x * pmv_fw->dist ^ m) - m - 1) >> 14) ^ m) - m;
pmv_bw->x = m-(((den+(den*col_mv->x*pmv_bw->dist^m)-m-1)>>14)^m); pmv_bw->x = m - (((den + (den * col_mv->x * pmv_bw->dist ^ m) - m - 1) >> 14) ^ m);
m = col_mv->y >> 31; m = col_mv->y >> 31;
pmv_fw->y = (((den+(den*col_mv->y*pmv_fw->dist^m)-m-1)>>14)^m)-m; pmv_fw->y = (((den + (den * col_mv->y * pmv_fw->dist ^ m) - m - 1) >> 14) ^ m) - m;
pmv_bw->y = m-(((den+(den*col_mv->y*pmv_bw->dist^m)-m-1)>>14)^m); pmv_bw->y = m - (((den + (den * col_mv->y * pmv_bw->dist ^ m) - m - 1) >> 14) ^ m);
} }
static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum cavs_block size) { static inline void mv_pred_sym(AVSContext *h, cavs_vector *src,
enum cavs_block size)
{
cavs_vector *dst = src + MV_BWD_OFFS; cavs_vector *dst = src + MV_BWD_OFFS;
/* backward mv is the scaled and negated forward mv */ /* backward mv is the scaled and negated forward mv */
...@@ -505,30 +506,32 @@ static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum cavs_block ...@@ -505,30 +506,32 @@ static inline void mv_pred_sym(AVSContext *h, cavs_vector *src, enum cavs_block
****************************************************************************/ ****************************************************************************/
/** kth-order exponential golomb code */ /** kth-order exponential golomb code */
static inline int get_ue_code(GetBitContext *gb, int order) { static inline int get_ue_code(GetBitContext *gb, int order)
if(order) { {
if (order) {
int ret = get_ue_golomb(gb) << order; int ret = get_ue_golomb(gb) << order;
return ret + get_bits(gb,order); return ret + get_bits(gb, order);
} }
return get_ue_golomb(gb); return get_ue_golomb(gb);
} }
static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf, static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,
DCTELEM *dst, int mul, int shift, int coeff_num) { DCTELEM *dst, int mul, int shift, int coeff_num)
{
int round = 1 << (shift - 1); int round = 1 << (shift - 1);
int pos = -1; int pos = -1;
const uint8_t *scantab = h->scantable.permutated; const uint8_t *scantab = h->scantable.permutated;
/* inverse scan and dequantization */ /* inverse scan and dequantization */
while(--coeff_num >= 0){ while (--coeff_num >= 0) {
pos += run_buf[coeff_num]; pos += run_buf[coeff_num];
if(pos > 63) { if (pos > 63) {
av_log(h->s.avctx, AV_LOG_ERROR, av_log(h->s.avctx, AV_LOG_ERROR,
"position out of block bounds at pic %d MB(%d,%d)\n", "position out of block bounds at pic %d MB(%d,%d)\n",
h->picture.poc, h->mbx, h->mby); h->picture.poc, h->mbx, h->mby);
return -1; return -1;
} }
dst[scantab[pos]] = (level_buf[coeff_num]*mul + round) >> shift; dst[scantab[pos]] = (level_buf[coeff_num] * mul + round) >> shift;
} }
return 0; return 0;
} }
...@@ -544,69 +547,72 @@ static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf, ...@@ -544,69 +547,72 @@ static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,
*/ */
static int decode_residual_block(AVSContext *h, GetBitContext *gb, static int decode_residual_block(AVSContext *h, GetBitContext *gb,
const struct dec_2dvlc *r, int esc_golomb_order, const struct dec_2dvlc *r, int esc_golomb_order,
int qp, uint8_t *dst, int stride) { int qp, uint8_t *dst, int stride)
{
int i, esc_code, level, mask; int i, esc_code, level, mask;
unsigned int level_code, run; unsigned int level_code, run;
DCTELEM level_buf[65]; DCTELEM level_buf[65];
uint8_t run_buf[65]; uint8_t run_buf[65];
DCTELEM *block = h->block; DCTELEM *block = h->block;
for(i=0;i<65;i++) { for (i = 0; i < 65; i++) {
level_code = get_ue_code(gb,r->golomb_order); level_code = get_ue_code(gb, r->golomb_order);
if(level_code >= ESCAPE_CODE) { if (level_code >= ESCAPE_CODE) {
run = ((level_code - ESCAPE_CODE) >> 1) + 1; run = ((level_code - ESCAPE_CODE) >> 1) + 1;
if(run > 64) if(run > 64)
return -1; return -1;
esc_code = get_ue_code(gb,esc_golomb_order); esc_code = get_ue_code(gb, esc_golomb_order);
level = esc_code + (run > r->max_run ? 1 : r->level_add[run]); level = esc_code + (run > r->max_run ? 1 : r->level_add[run]);
while(level > r->inc_limit) while (level > r->inc_limit)
r++; r++;
mask = -(level_code & 1); mask = -(level_code & 1);
level = (level^mask) - mask; level = (level ^ mask) - mask;
} else { } else {
level = r->rltab[level_code][0]; level = r->rltab[level_code][0];
if(!level) //end of block signal if (!level) //end of block signal
break; break;
run = r->rltab[level_code][1]; run = r->rltab[level_code][1];
r += r->rltab[level_code][2]; r += r->rltab[level_code][2];
} }
level_buf[i] = level; level_buf[i] = level;
run_buf[i] = run; run_buf[i] = run;
} }
if (dequant(h, level_buf, run_buf, block, dequant_mul[qp], if (dequant(h, level_buf, run_buf, block, dequant_mul[qp],
dequant_shift[qp], i)) dequant_shift[qp], i))
return -1; return -1;
h->cdsp.cavs_idct8_add(dst,block,stride); h->cdsp.cavs_idct8_add(dst, block, stride);
h->s.dsp.clear_block(block); h->s.dsp.clear_block(block);
return 0; return 0;
} }
static inline void decode_residual_chroma(AVSContext *h) { static inline void decode_residual_chroma(AVSContext *h)
if(h->cbp & (1<<4)) {
if (h->cbp & (1 << 4))
decode_residual_block(h, &h->s.gb, chroma_dec, 0, decode_residual_block(h, &h->s.gb, chroma_dec, 0,
cavs_chroma_qp[h->qp], h->cu, h->c_stride); cavs_chroma_qp[h->qp], h->cu, h->c_stride);
if(h->cbp & (1<<5)) if (h->cbp & (1 << 5))
decode_residual_block(h, &h->s.gb, chroma_dec, 0, decode_residual_block(h, &h->s.gb, chroma_dec, 0,
cavs_chroma_qp[h->qp], h->cv, h->c_stride); cavs_chroma_qp[h->qp], h->cv, h->c_stride);
} }
static inline int decode_residual_inter(AVSContext *h) { static inline int decode_residual_inter(AVSContext *h)
{
int block; int block;
/* get coded block pattern */ /* get coded block pattern */
int cbp= get_ue_golomb(&h->s.gb); int cbp = get_ue_golomb(&h->s.gb);
if(cbp > 63U){ if (cbp > 63U) {
av_log(h->s.avctx, AV_LOG_ERROR, "illegal inter cbp\n"); av_log(h->s.avctx, AV_LOG_ERROR, "illegal inter cbp\n");
return -1; return -1;
} }
h->cbp = cbp_tab[cbp][1]; h->cbp = cbp_tab[cbp][1];
/* get quantizer */ /* get quantizer */
if(h->cbp && !h->qp_fixed) if (h->cbp && !h->qp_fixed)
h->qp = (h->qp + get_se_golomb(&h->s.gb)) & 63; h->qp = (h->qp + get_se_golomb(&h->s.gb)) & 63;
for(block=0;block<4;block++) for (block = 0; block < 4; block++)
if(h->cbp & (1<<block)) if (h->cbp & (1 << block))
decode_residual_block(h, &h->s.gb, inter_dec, 0, h->qp, decode_residual_block(h, &h->s.gb, inter_dec, 0, h->qp,
h->cy + h->luma_scan[block], h->l_stride); h->cy + h->luma_scan[block], h->l_stride);
decode_residual_chroma(h); decode_residual_chroma(h);
...@@ -620,16 +626,18 @@ static inline int decode_residual_inter(AVSContext *h) { ...@@ -620,16 +626,18 @@ static inline int decode_residual_inter(AVSContext *h) {
* *
****************************************************************************/ ****************************************************************************/
static inline void set_mv_intra(AVSContext *h) { static inline void set_mv_intra(AVSContext *h)
{
h->mv[MV_FWD_X0] = ff_cavs_intra_mv; h->mv[MV_FWD_X0] = ff_cavs_intra_mv;
set_mvs(&h->mv[MV_FWD_X0], BLK_16X16); set_mvs(&h->mv[MV_FWD_X0], BLK_16X16);
h->mv[MV_BWD_X0] = ff_cavs_intra_mv; h->mv[MV_BWD_X0] = ff_cavs_intra_mv;
set_mvs(&h->mv[MV_BWD_X0], BLK_16X16); set_mvs(&h->mv[MV_BWD_X0], BLK_16X16);
if(h->pic_type != AV_PICTURE_TYPE_B) if (h->pic_type != AV_PICTURE_TYPE_B)
h->col_type_base[h->mbidx] = I_8X8; h->col_type_base[h->mbidx] = I_8X8;
} }
static int decode_mb_i(AVSContext *h, int cbp_code) { static int decode_mb_i(AVSContext *h, int cbp_code)
{
GetBitContext *gb = &h->s.gb; GetBitContext *gb = &h->s.gb;
unsigned pred_mode_uv; unsigned pred_mode_uv;
int block; int block;
...@@ -640,84 +648,86 @@ static int decode_mb_i(AVSContext *h, int cbp_code) { ...@@ -640,84 +648,86 @@ static int decode_mb_i(AVSContext *h, int cbp_code) {
ff_cavs_init_mb(h); ff_cavs_init_mb(h);
/* get intra prediction modes from stream */ /* get intra prediction modes from stream */
for(block=0;block<4;block++) { for (block = 0; block < 4; block++) {
int nA,nB,predpred; int nA, nB, predpred;
int pos = scan3x3[block]; int pos = scan3x3[block];
nA = h->pred_mode_Y[pos-1]; nA = h->pred_mode_Y[pos - 1];
nB = h->pred_mode_Y[pos-3]; nB = h->pred_mode_Y[pos - 3];
predpred = FFMIN(nA,nB); predpred = FFMIN(nA, nB);
if(predpred == NOT_AVAIL) // if either is not available if (predpred == NOT_AVAIL) // if either is not available
predpred = INTRA_L_LP; predpred = INTRA_L_LP;
if(!get_bits1(gb)){ if (!get_bits1(gb)) {
int rem_mode= get_bits(gb, 2); int rem_mode = get_bits(gb, 2);
predpred = rem_mode + (rem_mode >= predpred); predpred = rem_mode + (rem_mode >= predpred);
} }
h->pred_mode_Y[pos] = predpred; h->pred_mode_Y[pos] = predpred;
} }
pred_mode_uv = get_ue_golomb(gb); pred_mode_uv = get_ue_golomb(gb);
if(pred_mode_uv > 6) { if (pred_mode_uv > 6) {
av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n"); av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
return -1; return -1;
} }
ff_cavs_modify_mb_i(h, &pred_mode_uv); ff_cavs_modify_mb_i(h, &pred_mode_uv);
/* get coded block pattern */ /* get coded block pattern */
if(h->pic_type == AV_PICTURE_TYPE_I) if (h->pic_type == AV_PICTURE_TYPE_I)
cbp_code = get_ue_golomb(gb); cbp_code = get_ue_golomb(gb);
if(cbp_code > 63U){ if (cbp_code > 63U) {
av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra cbp\n"); av_log(h->s.avctx, AV_LOG_ERROR, "illegal intra cbp\n");
return -1; return -1;
} }
h->cbp = cbp_tab[cbp_code][0]; h->cbp = cbp_tab[cbp_code][0];
if(h->cbp && !h->qp_fixed) if (h->cbp && !h->qp_fixed)
h->qp = (h->qp + get_se_golomb(gb)) & 63; //qp_delta h->qp = (h->qp + get_se_golomb(gb)) & 63; //qp_delta
/* luma intra prediction interleaved with residual decode/transform/add */ /* luma intra prediction interleaved with residual decode/transform/add */
for(block=0;block<4;block++) { for (block = 0; block < 4; block++) {
d = h->cy + h->luma_scan[block]; d = h->cy + h->luma_scan[block];
ff_cavs_load_intra_pred_luma(h, top, &left, block); ff_cavs_load_intra_pred_luma(h, top, &left, block);
h->intra_pred_l[h->pred_mode_Y[scan3x3[block]]] h->intra_pred_l[h->pred_mode_Y[scan3x3[block]]]
(d, top, left, h->l_stride); (d, top, left, h->l_stride);
if(h->cbp & (1<<block)) if (h->cbp & (1<<block))
decode_residual_block(h, gb, intra_dec, 1, h->qp, d, h->l_stride); decode_residual_block(h, gb, intra_dec, 1, h->qp, d, h->l_stride);
} }
/* chroma intra prediction */ /* chroma intra prediction */
ff_cavs_load_intra_pred_chroma(h); ff_cavs_load_intra_pred_chroma(h);
h->intra_pred_c[pred_mode_uv](h->cu, &h->top_border_u[h->mbx*10], h->intra_pred_c[pred_mode_uv](h->cu, &h->top_border_u[h->mbx * 10],
h->left_border_u, h->c_stride); h->left_border_u, h->c_stride);
h->intra_pred_c[pred_mode_uv](h->cv, &h->top_border_v[h->mbx*10], h->intra_pred_c[pred_mode_uv](h->cv, &h->top_border_v[h->mbx * 10],
h->left_border_v, h->c_stride); h->left_border_v, h->c_stride);
decode_residual_chroma(h); decode_residual_chroma(h);
ff_cavs_filter(h,I_8X8); ff_cavs_filter(h, I_8X8);
set_mv_intra(h); set_mv_intra(h);
return 0; return 0;
} }
static inline void set_intra_mode_default(AVSContext *h) { static inline void set_intra_mode_default(AVSContext *h)
if(h->stream_revision > 0) { {
if (h->stream_revision > 0) {
h->pred_mode_Y[3] = h->pred_mode_Y[6] = NOT_AVAIL; h->pred_mode_Y[3] = h->pred_mode_Y[6] = NOT_AVAIL;
h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = NOT_AVAIL; h->top_pred_Y[h->mbx * 2 + 0] = h->top_pred_Y[h->mbx * 2 + 1] = NOT_AVAIL;
} else { } else {
h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP; h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP;
h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP; h->top_pred_Y[h->mbx * 2 + 0] = h->top_pred_Y[h->mbx * 2 + 1] = INTRA_L_LP;
} }
} }
static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) { static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type)
{
GetBitContext *gb = &h->s.gb; GetBitContext *gb = &h->s.gb;
int ref[4]; int ref[4];
ff_cavs_init_mb(h); ff_cavs_init_mb(h);
switch(mb_type) { switch (mb_type) {
case P_SKIP: case P_SKIP:
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_PSKIP, BLK_16X16, 0); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_PSKIP, BLK_16X16, 0);
break; break;
case P_16X16: case P_16X16:
ref[0] = h->ref_flag ? 0 : get_bits1(gb); ref[0] = h->ref_flag ? 0 : get_bits1(gb);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_MEDIAN, BLK_16X16,ref[0]); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_MEDIAN, BLK_16X16, ref[0]);
break; break;
case P_16X8: case P_16X8:
ref[0] = h->ref_flag ? 0 : get_bits1(gb); ref[0] = h->ref_flag ? 0 : get_bits1(gb);
...@@ -728,8 +738,8 @@ static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) { ...@@ -728,8 +738,8 @@ static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) {
case P_8X16: case P_8X16:
ref[0] = h->ref_flag ? 0 : get_bits1(gb); ref[0] = h->ref_flag ? 0 : get_bits1(gb);
ref[1] = h->ref_flag ? 0 : get_bits1(gb); ref[1] = h->ref_flag ? 0 : get_bits1(gb);
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, ref[0]); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, ref[0]);
ff_cavs_mv(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, ref[1]); ff_cavs_mv(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT, BLK_8X16, ref[1]);
break; break;
case P_8X8: case P_8X8:
ref[0] = h->ref_flag ? 0 : get_bits1(gb); ref[0] = h->ref_flag ? 0 : get_bits1(gb);
...@@ -744,13 +754,14 @@ static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) { ...@@ -744,13 +754,14 @@ static void decode_mb_p(AVSContext *h, enum cavs_mb mb_type) {
ff_cavs_inter(h, mb_type); ff_cavs_inter(h, mb_type);
set_intra_mode_default(h); set_intra_mode_default(h);
store_mvs(h); store_mvs(h);
if(mb_type != P_SKIP) if (mb_type != P_SKIP)
decode_residual_inter(h); decode_residual_inter(h);
ff_cavs_filter(h,mb_type); ff_cavs_filter(h, mb_type);
h->col_type_base[h->mbidx] = mb_type; h->col_type_base[h->mbidx] = mb_type;
} }
static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type)
{
int block; int block;
enum cavs_sub_mb sub_type[4]; enum cavs_sub_mb sub_type[4];
int flags; int flags;
...@@ -762,18 +773,18 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { ...@@ -762,18 +773,18 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) {
set_mvs(&h->mv[MV_FWD_X0], BLK_16X16); set_mvs(&h->mv[MV_FWD_X0], BLK_16X16);
h->mv[MV_BWD_X0] = ff_cavs_dir_mv; h->mv[MV_BWD_X0] = ff_cavs_dir_mv;
set_mvs(&h->mv[MV_BWD_X0], BLK_16X16); set_mvs(&h->mv[MV_BWD_X0], BLK_16X16);
switch(mb_type) { switch (mb_type) {
case B_SKIP: case B_SKIP:
case B_DIRECT: case B_DIRECT:
if(!h->col_type_base[h->mbidx]) { if (!h->col_type_base[h->mbidx]) {
/* intra MB at co-location, do in-plane prediction */ /* intra MB at co-location, do in-plane prediction */
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_BSKIP, BLK_16X16, 1); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_BSKIP, BLK_16X16, 1);
ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_BSKIP, BLK_16X16, 0); ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_BSKIP, BLK_16X16, 0);
} else } else
/* direct prediction from co-located P MB, block-wise */ /* direct prediction from co-located P MB, block-wise */
for(block=0;block<4;block++) for (block = 0; block < 4; block++)
mv_pred_direct(h,&h->mv[mv_scan[block]], mv_pred_direct(h, &h->mv[mv_scan[block]],
&h->col_mv[h->mbidx*4 + block]); &h->col_mv[h->mbidx * 4 + block]);
break; break;
case B_FWD_16X16: case B_FWD_16X16:
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_MEDIAN, BLK_16X16, 1); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_MEDIAN, BLK_16X16, 1);
...@@ -786,38 +797,38 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { ...@@ -786,38 +797,38 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) {
ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_MEDIAN, BLK_16X16, 0); ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_MEDIAN, BLK_16X16, 0);
break; break;
case B_8X8: case B_8X8:
for(block=0;block<4;block++) for (block = 0; block < 4; block++)
sub_type[block] = get_bits(&h->s.gb,2); sub_type[block] = get_bits(&h->s.gb, 2);
for(block=0;block<4;block++) { for (block = 0; block < 4; block++) {
switch(sub_type[block]) { switch (sub_type[block]) {
case B_SUB_DIRECT: case B_SUB_DIRECT:
if(!h->col_type_base[h->mbidx]) { if (!h->col_type_base[h->mbidx]) {
/* intra MB at co-location, do in-plane prediction */ /* intra MB at co-location, do in-plane prediction */
ff_cavs_mv(h, mv_scan[block], mv_scan[block]-3, ff_cavs_mv(h, mv_scan[block], mv_scan[block] - 3,
MV_PRED_BSKIP, BLK_8X8, 1); MV_PRED_BSKIP, BLK_8X8, 1);
ff_cavs_mv(h, mv_scan[block]+MV_BWD_OFFS, ff_cavs_mv(h, mv_scan[block] + MV_BWD_OFFS,
mv_scan[block]-3+MV_BWD_OFFS, mv_scan[block] - 3 + MV_BWD_OFFS,
MV_PRED_BSKIP, BLK_8X8, 0); MV_PRED_BSKIP, BLK_8X8, 0);
} else } else
mv_pred_direct(h,&h->mv[mv_scan[block]], mv_pred_direct(h, &h->mv[mv_scan[block]],
&h->col_mv[h->mbidx*4 + block]); &h->col_mv[h->mbidx * 4 + block]);
break; break;
case B_SUB_FWD: case B_SUB_FWD:
ff_cavs_mv(h, mv_scan[block], mv_scan[block]-3, ff_cavs_mv(h, mv_scan[block], mv_scan[block] - 3,
MV_PRED_MEDIAN, BLK_8X8, 1); MV_PRED_MEDIAN, BLK_8X8, 1);
break; break;
case B_SUB_SYM: case B_SUB_SYM:
ff_cavs_mv(h, mv_scan[block], mv_scan[block]-3, ff_cavs_mv(h, mv_scan[block], mv_scan[block] - 3,
MV_PRED_MEDIAN, BLK_8X8, 1); MV_PRED_MEDIAN, BLK_8X8, 1);
mv_pred_sym(h, &h->mv[mv_scan[block]], BLK_8X8); mv_pred_sym(h, &h->mv[mv_scan[block]], BLK_8X8);
break; break;
} }
} }
for(block=0;block<4;block++) { for (block = 0; block < 4; block++) {
if(sub_type[block] == B_SUB_BWD) if (sub_type[block] == B_SUB_BWD)
ff_cavs_mv(h, mv_scan[block]+MV_BWD_OFFS, ff_cavs_mv(h, mv_scan[block] + MV_BWD_OFFS,
mv_scan[block]+MV_BWD_OFFS-3, mv_scan[block] + MV_BWD_OFFS - 3,
MV_PRED_MEDIAN, BLK_8X8, 0); MV_PRED_MEDIAN, BLK_8X8, 0);
} }
break; break;
default: default:
...@@ -827,39 +838,39 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { ...@@ -827,39 +838,39 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) {
} }
av_assert2(mb_type < B_8X8); av_assert2(mb_type < B_8X8);
flags = ff_cavs_partition_flags[mb_type]; flags = ff_cavs_partition_flags[mb_type];
if(mb_type & 1) { /* 16x8 macroblock types */ if (mb_type & 1) { /* 16x8 macroblock types */
if(flags & FWD0) if (flags & FWD0)
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1);
if(flags & SYM0) if (flags & SYM0)
mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_16X8); mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_16X8);
if(flags & FWD1) if (flags & FWD1)
ff_cavs_mv(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1); ff_cavs_mv(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1);
if(flags & SYM1) if (flags & SYM1)
mv_pred_sym(h, &h->mv[MV_FWD_X2], BLK_16X8); mv_pred_sym(h, &h->mv[MV_FWD_X2], BLK_16X8);
if(flags & BWD0) if (flags & BWD0)
ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_TOP, BLK_16X8, 0); ff_cavs_mv(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_TOP, BLK_16X8, 0);
if(flags & BWD1) if (flags & BWD1)
ff_cavs_mv(h, MV_BWD_X2, MV_BWD_A1, MV_PRED_LEFT, BLK_16X8, 0); ff_cavs_mv(h, MV_BWD_X2, MV_BWD_A1, MV_PRED_LEFT, BLK_16X8, 0);
} else { /* 8x16 macroblock types */ } else { /* 8x16 macroblock types */
if(flags & FWD0) if (flags & FWD0)
ff_cavs_mv(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1); ff_cavs_mv(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1);
if(flags & SYM0) if (flags & SYM0)
mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_8X16); mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_8X16);
if(flags & FWD1) if (flags & FWD1)
ff_cavs_mv(h,MV_FWD_X1,MV_FWD_C2,MV_PRED_TOPRIGHT,BLK_8X16,1); ff_cavs_mv(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT, BLK_8X16, 1);
if(flags & SYM1) if (flags & SYM1)
mv_pred_sym(h, &h->mv[MV_FWD_X1], BLK_8X16); mv_pred_sym(h, &h->mv[MV_FWD_X1], BLK_8X16);
if(flags & BWD0) if (flags & BWD0)
ff_cavs_mv(h, MV_BWD_X0, MV_BWD_B3, MV_PRED_LEFT, BLK_8X16, 0); ff_cavs_mv(h, MV_BWD_X0, MV_BWD_B3, MV_PRED_LEFT, BLK_8X16, 0);
if(flags & BWD1) if (flags & BWD1)
ff_cavs_mv(h,MV_BWD_X1,MV_BWD_C2,MV_PRED_TOPRIGHT,BLK_8X16,0); ff_cavs_mv(h, MV_BWD_X1, MV_BWD_C2, MV_PRED_TOPRIGHT, BLK_8X16, 0);
} }
} }
ff_cavs_inter(h, mb_type); ff_cavs_inter(h, mb_type);
set_intra_mode_default(h); set_intra_mode_default(h);
if(mb_type != B_SKIP) if (mb_type != B_SKIP)
decode_residual_inter(h); decode_residual_inter(h);
ff_cavs_filter(h,mb_type); ff_cavs_filter(h, mb_type);
return 0; return 0;
} }
...@@ -870,47 +881,50 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) { ...@@ -870,47 +881,50 @@ static int decode_mb_b(AVSContext *h, enum cavs_mb mb_type) {
* *
****************************************************************************/ ****************************************************************************/
static inline int decode_slice_header(AVSContext *h, GetBitContext *gb) { static inline int decode_slice_header(AVSContext *h, GetBitContext *gb)
if(h->stc > 0xAF) {
if (h->stc > 0xAF)
av_log(h->s.avctx, AV_LOG_ERROR, "unexpected start code 0x%02x\n", h->stc); av_log(h->s.avctx, AV_LOG_ERROR, "unexpected start code 0x%02x\n", h->stc);
if (h->stc >= h->mb_height) if (h->stc >= h->mb_height)
return -1; return -1;
h->mby = h->stc; h->mby = h->stc;
h->mbidx = h->mby*h->mb_width; h->mbidx = h->mby * h->mb_width;
/* mark top macroblocks as unavailable */ /* mark top macroblocks as unavailable */
h->flags &= ~(B_AVAIL|C_AVAIL); h->flags &= ~(B_AVAIL | C_AVAIL);
if((h->mby == 0) && (!h->qp_fixed)){ if ((h->mby == 0) && (!h->qp_fixed)) {
h->qp_fixed = get_bits1(gb); h->qp_fixed = get_bits1(gb);
h->qp = get_bits(gb,6); h->qp = get_bits(gb, 6);
} }
/* inter frame or second slice can have weighting params */ /* inter frame or second slice can have weighting params */
if((h->pic_type != AV_PICTURE_TYPE_I) || (!h->pic_structure && h->mby >= h->mb_width/2)) if ((h->pic_type != AV_PICTURE_TYPE_I) ||
if(get_bits1(gb)) { //slice_weighting_flag (!h->pic_structure && h->mby >= h->mb_width / 2))
if (get_bits1(gb)) { //slice_weighting_flag
av_log(h->s.avctx, AV_LOG_ERROR, av_log(h->s.avctx, AV_LOG_ERROR,
"weighted prediction not yet supported\n"); "weighted prediction not yet supported\n");
} }
return 0; return 0;
} }
static inline int check_for_slice(AVSContext *h) { static inline int check_for_slice(AVSContext *h)
{
GetBitContext *gb = &h->s.gb; GetBitContext *gb = &h->s.gb;
int align; int align;
if(h->mbx) if (h->mbx)
return 0; return 0;
align = (-get_bits_count(gb)) & 7; align = (-get_bits_count(gb)) & 7;
/* check for stuffing byte */ /* check for stuffing byte */
if(!align && (show_bits(gb,8) == 0x80)) if (!align && (show_bits(gb, 8) == 0x80))
align = 8; align = 8;
if((show_bits_long(gb,24+align) & 0xFFFFFF) == 0x000001) { if ((show_bits_long(gb, 24 + align) & 0xFFFFFF) == 0x000001) {
skip_bits_long(gb,24+align); skip_bits_long(gb, 24 + align);
h->stc = get_bits(gb,8); h->stc = get_bits(gb, 8);
if (h->stc >= h->mb_height) if (h->stc >= h->mb_height)
return 0; return 0;
decode_slice_header(h,gb); decode_slice_header(h, gb);
return 1; return 1;
} }
return 0; return 0;
...@@ -922,9 +936,10 @@ static inline int check_for_slice(AVSContext *h) { ...@@ -922,9 +936,10 @@ static inline int check_for_slice(AVSContext *h) {
* *
****************************************************************************/ ****************************************************************************/
static int decode_pic(AVSContext *h) { static int decode_pic(AVSContext *h)
{
MpegEncContext *s = &h->s; MpegEncContext *s = &h->s;
int skip_count = -1; int skip_count = -1;
int ret; int ret;
enum cavs_mb mb_type; enum cavs_mb mb_type;
...@@ -933,45 +948,45 @@ static int decode_pic(AVSContext *h) { ...@@ -933,45 +948,45 @@ static int decode_pic(AVSContext *h) {
return -1; return -1;
ff_init_scantable_permutation(s->dsp.idct_permutation, ff_init_scantable_permutation(s->dsp.idct_permutation,
h->cdsp.idct_perm); h->cdsp.idct_perm);
ff_init_scantable(s->dsp.idct_permutation,&h->scantable,ff_zigzag_direct); ff_init_scantable(s->dsp.idct_permutation, &h->scantable, ff_zigzag_direct);
} }
skip_bits(&s->gb,16);//bbv_dwlay skip_bits(&s->gb, 16);//bbv_dwlay
if(h->stc == PIC_PB_START_CODE) { if (h->stc == PIC_PB_START_CODE) {
h->pic_type = get_bits(&s->gb,2) + AV_PICTURE_TYPE_I; h->pic_type = get_bits(&s->gb, 2) + AV_PICTURE_TYPE_I;
if(h->pic_type > AV_PICTURE_TYPE_B) { if (h->pic_type > AV_PICTURE_TYPE_B) {
av_log(s->avctx, AV_LOG_ERROR, "illegal picture type\n"); av_log(s->avctx, AV_LOG_ERROR, "illegal picture type\n");
return -1; return -1;
} }
/* make sure we have the reference frames we need */ /* make sure we have the reference frames we need */
if(!h->DPB[0].f.data[0] || if (!h->DPB[0].f.data[0] ||
(!h->DPB[1].f.data[0] && h->pic_type == AV_PICTURE_TYPE_B)) (!h->DPB[1].f.data[0] && h->pic_type == AV_PICTURE_TYPE_B))
return -1; return -1;
} else { } else {
h->pic_type = AV_PICTURE_TYPE_I; h->pic_type = AV_PICTURE_TYPE_I;
if(get_bits1(&s->gb)) if (get_bits1(&s->gb))
skip_bits(&s->gb,24);//time_code skip_bits(&s->gb, 24);//time_code
/* old sample clips were all progressive and no low_delay, /* old sample clips were all progressive and no low_delay,
bump stream revision if detected otherwise */ bump stream revision if detected otherwise */
if (s->low_delay || !(show_bits(&s->gb,9) & 1)) if (s->low_delay || !(show_bits(&s->gb, 9) & 1))
h->stream_revision = 1; h->stream_revision = 1;
/* similarly test top_field_first and repeat_first_field */ /* similarly test top_field_first and repeat_first_field */
else if(show_bits(&s->gb,11) & 3) else if (show_bits(&s->gb, 11) & 3)
h->stream_revision = 1; h->stream_revision = 1;
if(h->stream_revision > 0) if (h->stream_revision > 0)
skip_bits(&s->gb,1); //marker_bit skip_bits(&s->gb, 1); //marker_bit
} }
/* release last B frame */ /* release last B frame */
if(h->picture.f.data[0]) if (h->picture.f.data[0])
s->avctx->release_buffer(s->avctx, &h->picture.f); s->avctx->release_buffer(s->avctx, &h->picture.f);
if ((ret = ff_get_buffer(s->avctx, &h->picture.f)) < 0) if ((ret = ff_get_buffer(s->avctx, &h->picture.f)) < 0)
return ret; return ret;
if ((ret = ff_cavs_init_pic(h)) < 0) if ((ret = ff_cavs_init_pic(h)) < 0)
return ret; return ret;
h->picture.poc = get_bits(&s->gb,8)*2; h->picture.poc = get_bits(&s->gb, 8) * 2;
/* get temporal distances and MV scaling factors */ /* get temporal distances and MV scaling factors */
if(h->pic_type != AV_PICTURE_TYPE_B) { if (h->pic_type != AV_PICTURE_TYPE_B) {
h->dist[0] = (h->picture.poc - h->DPB[0].poc + 512) % 512; h->dist[0] = (h->picture.poc - h->DPB[0].poc + 512) % 512;
} else { } else {
h->dist[0] = (h->DPB[0].poc - h->picture.poc + 512) % 512; h->dist[0] = (h->DPB[0].poc - h->picture.poc + 512) % 512;
...@@ -979,86 +994,86 @@ static int decode_pic(AVSContext *h) { ...@@ -979,86 +994,86 @@ static int decode_pic(AVSContext *h) {
h->dist[1] = (h->picture.poc - h->DPB[1].poc + 512) % 512; h->dist[1] = (h->picture.poc - h->DPB[1].poc + 512) % 512;
h->scale_den[0] = h->dist[0] ? 512/h->dist[0] : 0; h->scale_den[0] = h->dist[0] ? 512/h->dist[0] : 0;
h->scale_den[1] = h->dist[1] ? 512/h->dist[1] : 0; h->scale_den[1] = h->dist[1] ? 512/h->dist[1] : 0;
if(h->pic_type == AV_PICTURE_TYPE_B) { if (h->pic_type == AV_PICTURE_TYPE_B) {
h->sym_factor = h->dist[0]*h->scale_den[1]; h->sym_factor = h->dist[0] * h->scale_den[1];
} else { } else {
h->direct_den[0] = h->dist[0] ? 16384/h->dist[0] : 0; h->direct_den[0] = h->dist[0] ? 16384 / h->dist[0] : 0;
h->direct_den[1] = h->dist[1] ? 16384/h->dist[1] : 0; h->direct_den[1] = h->dist[1] ? 16384 / h->dist[1] : 0;
} }
if(s->low_delay) if (s->low_delay)
get_ue_golomb(&s->gb); //bbv_check_times get_ue_golomb(&s->gb); //bbv_check_times
h->progressive = get_bits1(&s->gb); h->progressive = get_bits1(&s->gb);
h->pic_structure = 1; h->pic_structure = 1;
if(!h->progressive) if (!h->progressive)
h->pic_structure = get_bits1(&s->gb); h->pic_structure = get_bits1(&s->gb);
if(!h->pic_structure && h->stc == PIC_PB_START_CODE) if (!h->pic_structure && h->stc == PIC_PB_START_CODE)
skip_bits1(&s->gb); //advanced_pred_mode_disable skip_bits1(&s->gb); //advanced_pred_mode_disable
skip_bits1(&s->gb); //top_field_first skip_bits1(&s->gb); //top_field_first
skip_bits1(&s->gb); //repeat_first_field skip_bits1(&s->gb); //repeat_first_field
h->qp_fixed = get_bits1(&s->gb); h->qp_fixed = get_bits1(&s->gb);
h->qp = get_bits(&s->gb,6); h->qp = get_bits(&s->gb, 6);
if(h->pic_type == AV_PICTURE_TYPE_I) { if (h->pic_type == AV_PICTURE_TYPE_I) {
if(!h->progressive && !h->pic_structure) if (!h->progressive && !h->pic_structure)
skip_bits1(&s->gb);//what is this? skip_bits1(&s->gb);//what is this?
skip_bits(&s->gb,4); //reserved bits skip_bits(&s->gb, 4); //reserved bits
} else { } else {
if(!(h->pic_type == AV_PICTURE_TYPE_B && h->pic_structure == 1)) if (!(h->pic_type == AV_PICTURE_TYPE_B && h->pic_structure == 1))
h->ref_flag = get_bits1(&s->gb); h->ref_flag = get_bits1(&s->gb);
skip_bits(&s->gb,4); //reserved bits skip_bits(&s->gb, 4); //reserved bits
h->skip_mode_flag = get_bits1(&s->gb); h->skip_mode_flag = get_bits1(&s->gb);
} }
h->loop_filter_disable = get_bits1(&s->gb); h->loop_filter_disable = get_bits1(&s->gb);
if(!h->loop_filter_disable && get_bits1(&s->gb)) { if (!h->loop_filter_disable && get_bits1(&s->gb)) {
h->alpha_offset = get_se_golomb(&s->gb); h->alpha_offset = get_se_golomb(&s->gb);
h->beta_offset = get_se_golomb(&s->gb); h->beta_offset = get_se_golomb(&s->gb);
} else { } else {
h->alpha_offset = h->beta_offset = 0; h->alpha_offset = h->beta_offset = 0;
} }
if(h->pic_type == AV_PICTURE_TYPE_I) { if (h->pic_type == AV_PICTURE_TYPE_I) {
do { do {
check_for_slice(h); check_for_slice(h);
decode_mb_i(h, 0); decode_mb_i(h, 0);
} while(ff_cavs_next_mb(h)); } while (ff_cavs_next_mb(h));
} else if(h->pic_type == AV_PICTURE_TYPE_P) { } else if (h->pic_type == AV_PICTURE_TYPE_P) {
do { do {
if(check_for_slice(h)) if (check_for_slice(h))
skip_count = -1; skip_count = -1;
if(h->skip_mode_flag && (skip_count < 0)) if (h->skip_mode_flag && (skip_count < 0))
skip_count = get_ue_golomb(&s->gb); skip_count = get_ue_golomb(&s->gb);
if(h->skip_mode_flag && skip_count--) { if (h->skip_mode_flag && skip_count--) {
decode_mb_p(h,P_SKIP); decode_mb_p(h, P_SKIP);
} else { } else {
mb_type = get_ue_golomb(&s->gb) + P_SKIP + h->skip_mode_flag; mb_type = get_ue_golomb(&s->gb) + P_SKIP + h->skip_mode_flag;
if(mb_type > P_8X8) if (mb_type > P_8X8)
decode_mb_i(h, mb_type - P_8X8 - 1); decode_mb_i(h, mb_type - P_8X8 - 1);
else else
decode_mb_p(h,mb_type); decode_mb_p(h, mb_type);
} }
} while(ff_cavs_next_mb(h)); } while (ff_cavs_next_mb(h));
} else { /* AV_PICTURE_TYPE_B */ } else { /* AV_PICTURE_TYPE_B */
do { do {
if(check_for_slice(h)) if (check_for_slice(h))
skip_count = -1; skip_count = -1;
if(h->skip_mode_flag && (skip_count < 0)) if (h->skip_mode_flag && (skip_count < 0))
skip_count = get_ue_golomb(&s->gb); skip_count = get_ue_golomb(&s->gb);
if(h->skip_mode_flag && skip_count--) { if (h->skip_mode_flag && skip_count--) {
decode_mb_b(h,B_SKIP); decode_mb_b(h, B_SKIP);
} else { } else {
mb_type = get_ue_golomb(&s->gb) + B_SKIP + h->skip_mode_flag; mb_type = get_ue_golomb(&s->gb) + B_SKIP + h->skip_mode_flag;
if(mb_type > B_8X8) if (mb_type > B_8X8)
decode_mb_i(h, mb_type - B_8X8 - 1); decode_mb_i(h, mb_type - B_8X8 - 1);
else else
decode_mb_b(h,mb_type); decode_mb_b(h, mb_type);
} }
} while(ff_cavs_next_mb(h)); } while (ff_cavs_next_mb(h));
} }
if(h->pic_type != AV_PICTURE_TYPE_B) { if (h->pic_type != AV_PICTURE_TYPE_B) {
if(h->DPB[1].f.data[0]) if (h->DPB[1].f.data[0])
s->avctx->release_buffer(s->avctx, &h->DPB[1].f); s->avctx->release_buffer(s->avctx, &h->DPB[1].f);
h->DPB[1] = h->DPB[0]; h->DPB[1] = h->DPB[0];
h->DPB[0] = h->picture; h->DPB[0] = h->picture;
memset(&h->picture,0,sizeof(Picture)); memset(&h->picture, 0, sizeof(Picture));
} }
return 0; return 0;
} }
...@@ -1069,13 +1084,14 @@ static int decode_pic(AVSContext *h) { ...@@ -1069,13 +1084,14 @@ static int decode_pic(AVSContext *h) {
* *
****************************************************************************/ ****************************************************************************/
static int decode_seq_header(AVSContext *h) { static int decode_seq_header(AVSContext *h)
{
MpegEncContext *s = &h->s; MpegEncContext *s = &h->s;
int frame_rate_code; int frame_rate_code;
int width, height; int width, height;
h->profile = get_bits(&s->gb,8); h->profile = get_bits(&s->gb, 8);
h->level = get_bits(&s->gb,8); h->level = get_bits(&s->gb, 8);
skip_bits1(&s->gb); //progressive sequence skip_bits1(&s->gb); //progressive sequence
width = get_bits(&s->gb, 14); width = get_bits(&s->gb, 14);
...@@ -1091,41 +1107,43 @@ static int decode_seq_header(AVSContext *h) { ...@@ -1091,41 +1107,43 @@ static int decode_seq_header(AVSContext *h) {
s->width = width; s->width = width;
s->height = height; s->height = height;
skip_bits(&s->gb,2); //chroma format skip_bits(&s->gb, 2); //chroma format
skip_bits(&s->gb,3); //sample_precision skip_bits(&s->gb, 3); //sample_precision
h->aspect_ratio = get_bits(&s->gb,4); h->aspect_ratio = get_bits(&s->gb, 4);
frame_rate_code = get_bits(&s->gb,4); frame_rate_code = get_bits(&s->gb, 4);
skip_bits(&s->gb,18);//bit_rate_lower skip_bits(&s->gb, 18); //bit_rate_lower
skip_bits1(&s->gb); //marker_bit skip_bits1(&s->gb); //marker_bit
skip_bits(&s->gb,12);//bit_rate_upper skip_bits(&s->gb, 12); //bit_rate_upper
s->low_delay = get_bits1(&s->gb); s->low_delay = get_bits1(&s->gb);
h->mb_width = (s->width + 15) >> 4; h->mb_width = (s->width + 15) >> 4;
h->mb_height = (s->height + 15) >> 4; h->mb_height = (s->height + 15) >> 4;
h->s.avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_code].num; h->s.avctx->time_base.den = ff_mpeg12_frame_rate_tab[frame_rate_code].num;
h->s.avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_code].den; h->s.avctx->time_base.num = ff_mpeg12_frame_rate_tab[frame_rate_code].den;
h->s.avctx->width = s->width; h->s.avctx->width = s->width;
h->s.avctx->height = s->height; h->s.avctx->height = s->height;
if(!h->top_qp) if (!h->top_qp)
ff_cavs_init_top_lines(h); ff_cavs_init_top_lines(h);
return 0; return 0;
} }
static void cavs_flush(AVCodecContext * avctx) { static void cavs_flush(AVCodecContext * avctx)
{
AVSContext *h = avctx->priv_data; AVSContext *h = avctx->priv_data;
h->got_keyframe = 0; h->got_keyframe = 0;
} }
static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt) { AVPacket *avpkt)
{
AVSContext *h = avctx->priv_data;
MpegEncContext *s = &h->s;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AVSContext *h = avctx->priv_data; AVFrame *picture = data;
MpegEncContext *s = &h->s; uint32_t stc = -1;
int input_size; int input_size;
const uint8_t *buf_end; const uint8_t *buf_end;
const uint8_t *buf_ptr; const uint8_t *buf_ptr;
AVFrame *picture = data;
uint32_t stc = -1;
s->avctx = avctx; s->avctx = avctx;
...@@ -1141,17 +1159,17 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -1141,17 +1159,17 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
buf_ptr = buf; buf_ptr = buf;
buf_end = buf + buf_size; buf_end = buf + buf_size;
for(;;) { for(;;) {
buf_ptr = avpriv_mpv_find_start_code(buf_ptr,buf_end, &stc); buf_ptr = avpriv_mpv_find_start_code(buf_ptr, buf_end, &stc);
if((stc & 0xFFFFFE00) || buf_ptr == buf_end) if ((stc & 0xFFFFFE00) || buf_ptr == buf_end)
return FFMAX(0, buf_ptr - buf - s->parse_context.last_index); return FFMAX(0, buf_ptr - buf - s->parse_context.last_index);
input_size = (buf_end - buf_ptr)*8; input_size = (buf_end - buf_ptr) * 8;
switch(stc) { switch (stc) {
case CAVS_START_CODE: case CAVS_START_CODE:
init_get_bits(&s->gb, buf_ptr, input_size); init_get_bits(&s->gb, buf_ptr, input_size);
decode_seq_header(h); decode_seq_header(h);
break; break;
case PIC_I_START_CODE: case PIC_I_START_CODE:
if(!h->got_keyframe) { if (!h->got_keyframe) {
if(h->DPB[0].f.data[0]) if(h->DPB[0].f.data[0])
avctx->release_buffer(avctx, &h->DPB[0].f); avctx->release_buffer(avctx, &h->DPB[0].f);
if(h->DPB[1].f.data[0]) if(h->DPB[1].f.data[0])
...@@ -1160,17 +1178,17 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -1160,17 +1178,17 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} }
case PIC_PB_START_CODE: case PIC_PB_START_CODE:
*got_frame = 0; *got_frame = 0;
if(!h->got_keyframe) if (!h->got_keyframe)
break; break;
if(!h->top_qp) if(!h->top_qp)
break; break;
init_get_bits(&s->gb, buf_ptr, input_size); init_get_bits(&s->gb, buf_ptr, input_size);
h->stc = stc; h->stc = stc;
if(decode_pic(h)) if (decode_pic(h))
break; break;
*got_frame = 1; *got_frame = 1;
if(h->pic_type != AV_PICTURE_TYPE_B) { if (h->pic_type != AV_PICTURE_TYPE_B) {
if(h->DPB[1].f.data[0]) { if (h->DPB[1].f.data[0]) {
*picture = h->DPB[1].f; *picture = h->DPB[1].f;
} else { } else {
*got_frame = 0; *got_frame = 0;
...@@ -1179,10 +1197,10 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -1179,10 +1197,10 @@ static int cavs_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
*picture = h->picture.f; *picture = h->picture.f;
break; break;
case EXT_START_CODE: case EXT_START_CODE:
//mpeg_decode_extension(avctx,buf_ptr, input_size); //mpeg_decode_extension(avctx, buf_ptr, input_size);
break; break;
case USER_START_CODE: case USER_START_CODE:
//mpeg_decode_user_data(avctx,buf_ptr, input_size); //mpeg_decode_user_data(avctx, buf_ptr, input_size);
break; break;
default: default:
if (stc <= SLICE_MAX_START_CODE) { if (stc <= SLICE_MAX_START_CODE) {
......
libavcodec/utils.c
View file @ 6ddda83c
...@@ -1296,7 +1296,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx, ...@@ -1296,7 +1296,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
const short *samples) const short *samples)
{ {
AVPacket pkt; AVPacket pkt;
AVFrame frame0 = {{0}}; AVFrame frame0 = { { 0 } };
AVFrame *frame; AVFrame *frame;
int ret, samples_size, got_packet; int ret, samples_size, got_packet;
...@@ -1666,7 +1666,7 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa ...@@ -1666,7 +1666,7 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa
int *frame_size_ptr, int *frame_size_ptr,
AVPacket *avpkt) AVPacket *avpkt)
{ {
AVFrame frame = {{0}}; AVFrame frame = { { 0 } };
int ret, got_frame = 0; int ret, got_frame = 0;
if (avctx->get_buffer != avcodec_default_get_buffer) { if (avctx->get_buffer != avcodec_default_get_buffer) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment