Mercurial > libavcodec.hg
diff ulti.c @ 2979:bfabfdf9ce55 libavcodec
COSMETICS: tabs --> spaces, some prettyprinting
| author | diego |
|---|---|
| date | Thu, 22 Dec 2005 01:10:11 +0000 |
| parents | ef2149182f1c |
| children | 0b546eab515d |
line wrap: on
line diff
--- a/ulti.c Wed Dec 21 17:50:40 2005 +0000 +++ b/ulti.c Thu Dec 22 01:10:11 2005 +0000 @@ -79,7 +79,7 @@ /* convert Ultimotion YUV block (sixteen 6-bit Y samples and two 4-bit chroma samples) into standard YUV and put it into frame */ static void ulti_convert_yuv(AVFrame *frame, int x, int y, - uint8_t *luma,int chroma) + uint8_t *luma,int chroma) { uint8_t *y_plane, *cr_plane, *cb_plane; int i; @@ -94,31 +94,31 @@ for(i = 0; i < 16; i++){ - y_plane[i & 3] = ulti_lumas[luma[i]]; - if((i & 3) == 3) { //next row - y_plane += frame->linesize[0]; - } + y_plane[i & 3] = ulti_lumas[luma[i]]; + if((i & 3) == 3) { //next row + y_plane += frame->linesize[0]; + } } } /* generate block like in MS Video1 */ static void ulti_pattern(AVFrame *frame, int x, int y, - int f0, int f1, int Y0, int Y1, int chroma) + int f0, int f1, int Y0, int Y1, int chroma) { uint8_t Luma[16]; int mask, i; for(mask = 0x80, i = 0; mask; mask >>= 1, i++) { - if(f0 & mask) - Luma[i] = Y1; - else - Luma[i] = Y0; + if(f0 & mask) + Luma[i] = Y1; + else + Luma[i] = Y0; } for(mask = 0x80, i = 8; mask; mask >>= 1, i++) { - if(f1 & mask) - Luma[i] = Y1; - else - Luma[i] = Y0; + if(f1 & mask) + Luma[i] = Y1; + else + Luma[i] = Y0; } ulti_convert_yuv(frame, x, y, Luma, chroma); @@ -129,70 +129,70 @@ { uint8_t Luma[16]; if(angle & 8) { //reverse order - int t; - angle &= 0x7; - t = Y[0]; - Y[0] = Y[3]; - Y[3] = t; - t = Y[1]; - Y[1] = Y[2]; - Y[2] = t; + int t; + angle &= 0x7; + t = Y[0]; + Y[0] = Y[3]; + Y[3] = t; + t = Y[1]; + Y[1] = Y[2]; + Y[2] = t; } switch(angle){ case 0: - Luma[0] = Y[0]; Luma[1] = Y[1]; Luma[2] = Y[2]; Luma[3] = Y[3]; - Luma[4] = Y[0]; Luma[5] = Y[1]; Luma[6] = Y[2]; Luma[7] = Y[3]; - Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[2]; Luma[11] = Y[3]; - Luma[12] = Y[0]; Luma[13] = Y[1]; Luma[14] = Y[2]; Luma[15] = Y[3]; - break; + Luma[0] = Y[0]; Luma[1] = Y[1]; Luma[2] = Y[2]; Luma[3] = Y[3]; + Luma[4] = Y[0]; Luma[5] = Y[1]; Luma[6] = Y[2]; Luma[7] = Y[3]; + Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[2]; Luma[11] = Y[3]; + Luma[12] = Y[0]; Luma[13] = Y[1]; Luma[14] = Y[2]; Luma[15] = Y[3]; + break; case 1: - Luma[0] = Y[1]; Luma[1] = Y[2]; Luma[2] = Y[3]; Luma[3] = Y[3]; - Luma[4] = Y[0]; Luma[5] = Y[1]; Luma[6] = Y[2]; Luma[7] = Y[3]; - Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[2]; Luma[11] = Y[3]; - Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[1]; Luma[15] = Y[2]; - break; + Luma[0] = Y[1]; Luma[1] = Y[2]; Luma[2] = Y[3]; Luma[3] = Y[3]; + Luma[4] = Y[0]; Luma[5] = Y[1]; Luma[6] = Y[2]; Luma[7] = Y[3]; + Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[2]; Luma[11] = Y[3]; + Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[1]; Luma[15] = Y[2]; + break; case 2: - Luma[0] = Y[1]; Luma[1] = Y[2]; Luma[2] = Y[3]; Luma[3] = Y[3]; - Luma[4] = Y[1]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[3]; - Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[2]; - Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[1]; Luma[15] = Y[2]; - break; + Luma[0] = Y[1]; Luma[1] = Y[2]; Luma[2] = Y[3]; Luma[3] = Y[3]; + Luma[4] = Y[1]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[3]; + Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[2]; + Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[1]; Luma[15] = Y[2]; + break; case 3: - Luma[0] = Y[2]; Luma[1] = Y[3]; Luma[2] = Y[3]; Luma[3] = Y[3]; - Luma[4] = Y[1]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[3]; - Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[2]; - Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[0]; Luma[15] = Y[1]; - break; + Luma[0] = Y[2]; Luma[1] = Y[3]; Luma[2] = Y[3]; Luma[3] = Y[3]; + Luma[4] = Y[1]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[3]; + Luma[8] = Y[0]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[2]; + Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[0]; Luma[15] = Y[1]; + break; case 4: - Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[3]; Luma[3] = Y[3]; - Luma[4] = Y[2]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[2]; - Luma[8] = Y[1]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[1]; - Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[0]; Luma[15] = Y[0]; - break; + Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[3]; Luma[3] = Y[3]; + Luma[4] = Y[2]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[2]; + Luma[8] = Y[1]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[1]; + Luma[12] = Y[0]; Luma[13] = Y[0]; Luma[14] = Y[0]; Luma[15] = Y[0]; + break; case 5: - Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[3]; Luma[3] = Y[2]; - Luma[4] = Y[3]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[1]; - Luma[8] = Y[2]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[0]; - Luma[12] = Y[1]; Luma[13] = Y[0]; Luma[14] = Y[0]; Luma[15] = Y[0]; - break; + Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[3]; Luma[3] = Y[2]; + Luma[4] = Y[3]; Luma[5] = Y[2]; Luma[6] = Y[2]; Luma[7] = Y[1]; + Luma[8] = Y[2]; Luma[9] = Y[1]; Luma[10] = Y[1]; Luma[11] = Y[0]; + Luma[12] = Y[1]; Luma[13] = Y[0]; Luma[14] = Y[0]; Luma[15] = Y[0]; + break; case 6: - Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[2]; Luma[3] = Y[2]; - Luma[4] = Y[3]; Luma[5] = Y[2]; Luma[6] = Y[1]; Luma[7] = Y[1]; - Luma[8] = Y[2]; Luma[9] = Y[2]; Luma[10] = Y[1]; Luma[11] = Y[0]; - Luma[12] = Y[1]; Luma[13] = Y[1]; Luma[14] = Y[0]; Luma[15] = Y[0]; - break; + Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[2]; Luma[3] = Y[2]; + Luma[4] = Y[3]; Luma[5] = Y[2]; Luma[6] = Y[1]; Luma[7] = Y[1]; + Luma[8] = Y[2]; Luma[9] = Y[2]; Luma[10] = Y[1]; Luma[11] = Y[0]; + Luma[12] = Y[1]; Luma[13] = Y[1]; Luma[14] = Y[0]; Luma[15] = Y[0]; + break; case 7: - Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[2]; Luma[3] = Y[1]; - Luma[4] = Y[3]; Luma[5] = Y[2]; Luma[6] = Y[1]; Luma[7] = Y[0]; - Luma[8] = Y[3]; Luma[9] = Y[2]; Luma[10] = Y[1]; Luma[11] = Y[0]; - Luma[12] = Y[2]; Luma[13] = Y[1]; Luma[14] = Y[0]; Luma[15] = Y[0]; - break; + Luma[0] = Y[3]; Luma[1] = Y[3]; Luma[2] = Y[2]; Luma[3] = Y[1]; + Luma[4] = Y[3]; Luma[5] = Y[2]; Luma[6] = Y[1]; Luma[7] = Y[0]; + Luma[8] = Y[3]; Luma[9] = Y[2]; Luma[10] = Y[1]; Luma[11] = Y[0]; + Luma[12] = Y[2]; Luma[13] = Y[1]; Luma[14] = Y[0]; Luma[15] = Y[0]; + break; default: - Luma[0] = Y[0]; Luma[1] = Y[0]; Luma[2] = Y[1]; Luma[3] = Y[1]; - Luma[4] = Y[0]; Luma[5] = Y[0]; Luma[6] = Y[1]; Luma[7] = Y[1]; - Luma[8] = Y[2]; Luma[9] = Y[2]; Luma[10] = Y[3]; Luma[11] = Y[3]; - Luma[12] = Y[2]; Luma[13] = Y[2]; Luma[14] = Y[3]; Luma[15] = Y[3]; - break; + Luma[0] = Y[0]; Luma[1] = Y[0]; Luma[2] = Y[1]; Luma[3] = Y[1]; + Luma[4] = Y[0]; Luma[5] = Y[0]; Luma[6] = Y[1]; Luma[7] = Y[1]; + Luma[8] = Y[2]; Luma[9] = Y[2]; Luma[10] = Y[3]; Luma[11] = Y[3]; + Luma[12] = Y[2]; Luma[13] = Y[2]; Luma[14] = Y[3]; Luma[15] = Y[3]; + break; } ulti_convert_yuv(frame, x, y, Luma, chroma); @@ -224,178 +224,178 @@ } while(!done) { - int idx; - if(blocks >= s->blocks || y >= s->height) - break;//all blocks decoded + int idx; + if(blocks >= s->blocks || y >= s->height) + break;//all blocks decoded - idx = *buf++; - if((idx & 0xF8) == 0x70) { - switch(idx) { - case 0x70: //change modifier - modifier = *buf++; - if(modifier>1) - av_log(avctx, AV_LOG_INFO, "warning: modifier must be 0 or 1, got %i\n", modifier); - break; - case 0x71: // set uniq flag - uniq = 1; - break; - case 0x72: //toggle mode - mode = !mode; - break; - case 0x73: //end-of-frame - done = 1; - break; - case 0x74: //skip some blocks - skip = *buf++; - if ((blocks + skip) >= s->blocks) - break; - blocks += skip; - x += skip * 8; - while(x >= s->width) { - x -= s->width; - y += 8; - } - break; - default: - av_log(avctx, AV_LOG_INFO, "warning: unknown escape 0x%02X\n", idx); - } - } else { //handle one block - int code; - int cf; - int angle = 0; - uint8_t Y[4]; // luma samples of block - int tx = 0, ty = 0; //coords of subblock - int chroma = 0; - if (mode || uniq) { - uniq = 0; - cf = 1; - chroma = 0; - } else { - cf = 0; - if (idx) - chroma = *buf++; - } - for (i = 0; i < 4; i++) { // for every subblock - code = (idx >> (6 - i*2)) & 3; //extract 2 bits - if(!code) //skip subblock - continue; - if(cf) - chroma = *buf++; - tx = x + block_coords[i * 2]; - ty = y + block_coords[(i * 2) + 1]; - switch(code) { - case 1: - tmp = *buf++; + idx = *buf++; + if((idx & 0xF8) == 0x70) { + switch(idx) { + case 0x70: //change modifier + modifier = *buf++; + if(modifier>1) + av_log(avctx, AV_LOG_INFO, "warning: modifier must be 0 or 1, got %i\n", modifier); + break; + case 0x71: // set uniq flag + uniq = 1; + break; + case 0x72: //toggle mode + mode = !mode; + break; + case 0x73: //end-of-frame + done = 1; + break; + case 0x74: //skip some blocks + skip = *buf++; + if ((blocks + skip) >= s->blocks) + break; + blocks += skip; + x += skip * 8; + while(x >= s->width) { + x -= s->width; + y += 8; + } + break; + default: + av_log(avctx, AV_LOG_INFO, "warning: unknown escape 0x%02X\n", idx); + } + } else { //handle one block + int code; + int cf; + int angle = 0; + uint8_t Y[4]; // luma samples of block + int tx = 0, ty = 0; //coords of subblock + int chroma = 0; + if (mode || uniq) { + uniq = 0; + cf = 1; + chroma = 0; + } else { + cf = 0; + if (idx) + chroma = *buf++; + } + for (i = 0; i < 4; i++) { // for every subblock + code = (idx >> (6 - i*2)) & 3; //extract 2 bits + if(!code) //skip subblock + continue; + if(cf) + chroma = *buf++; + tx = x + block_coords[i * 2]; + ty = y + block_coords[(i * 2) + 1]; + switch(code) { + case 1: + tmp = *buf++; - angle = angle_by_index[(tmp >> 6) & 0x3]; + angle = angle_by_index[(tmp >> 6) & 0x3]; - Y[0] = tmp & 0x3F; - Y[1] = Y[0]; + Y[0] = tmp & 0x3F; + Y[1] = Y[0]; - if (angle) { - Y[2] = Y[0]+1; - if (Y[2] > 0x3F) - Y[2] = 0x3F; - Y[3] = Y[2]; - } else { - Y[2] = Y[0]; - Y[3] = Y[0]; - } - break; + if (angle) { + Y[2] = Y[0]+1; + if (Y[2] > 0x3F) + Y[2] = 0x3F; + Y[3] = Y[2]; + } else { + Y[2] = Y[0]; + Y[3] = Y[0]; + } + break; - case 2: - if (modifier) { // unpack four luma samples - tmp = (*buf++) << 16; - tmp += (*buf++) << 8; - tmp += *buf++; + case 2: + if (modifier) { // unpack four luma samples + tmp = (*buf++) << 16; + tmp += (*buf++) << 8; + tmp += *buf++; - Y[0] = (tmp >> 18) & 0x3F; - Y[1] = (tmp >> 12) & 0x3F; - Y[2] = (tmp >> 6) & 0x3F; - Y[3] = tmp & 0x3F; - angle = 16; - } else { // retrieve luma samples from codebook - tmp = (*buf++) << 8; - tmp += (*buf++); + Y[0] = (tmp >> 18) & 0x3F; + Y[1] = (tmp >> 12) & 0x3F; + Y[2] = (tmp >> 6) & 0x3F; + Y[3] = tmp & 0x3F; + angle = 16; + } else { // retrieve luma samples from codebook + tmp = (*buf++) << 8; + tmp += (*buf++); - angle = (tmp >> 12) & 0xF; - tmp &= 0xFFF; - tmp <<= 2; - Y[0] = s->ulti_codebook[tmp]; - Y[1] = s->ulti_codebook[tmp + 1]; - Y[2] = s->ulti_codebook[tmp + 2]; - Y[3] = s->ulti_codebook[tmp + 3]; - } - break; + angle = (tmp >> 12) & 0xF; + tmp &= 0xFFF; + tmp <<= 2; + Y[0] = s->ulti_codebook[tmp]; + Y[1] = s->ulti_codebook[tmp + 1]; + Y[2] = s->ulti_codebook[tmp + 2]; + Y[3] = s->ulti_codebook[tmp + 3]; + } + break; - case 3: - if (modifier) { // all 16 luma samples - uint8_t Luma[16]; + case 3: + if (modifier) { // all 16 luma samples + uint8_t Luma[16]; - tmp = (*buf++) << 16; - tmp += (*buf++) << 8; - tmp += *buf++; - Luma[0] = (tmp >> 18) & 0x3F; - Luma[1] = (tmp >> 12) & 0x3F; - Luma[2] = (tmp >> 6) & 0x3F; - Luma[3] = tmp & 0x3F; + tmp = (*buf++) << 16; + tmp += (*buf++) << 8; + tmp += *buf++; + Luma[0] = (tmp >> 18) & 0x3F; + Luma[1] = (tmp >> 12) & 0x3F; + Luma[2] = (tmp >> 6) & 0x3F; + Luma[3] = tmp & 0x3F; - tmp = (*buf++) << 16; - tmp += (*buf++) << 8; - tmp += *buf++; - Luma[4] = (tmp >> 18) & 0x3F; - Luma[5] = (tmp >> 12) & 0x3F; - Luma[6] = (tmp >> 6) & 0x3F; - Luma[7] = tmp & 0x3F; + tmp = (*buf++) << 16; + tmp += (*buf++) << 8; + tmp += *buf++; + Luma[4] = (tmp >> 18) & 0x3F; + Luma[5] = (tmp >> 12) & 0x3F; + Luma[6] = (tmp >> 6) & 0x3F; + Luma[7] = tmp & 0x3F; - tmp = (*buf++) << 16; - tmp += (*buf++) << 8; - tmp += *buf++; - Luma[8] = (tmp >> 18) & 0x3F; - Luma[9] = (tmp >> 12) & 0x3F; - Luma[10] = (tmp >> 6) & 0x3F; - Luma[11] = tmp & 0x3F; + tmp = (*buf++) << 16; + tmp += (*buf++) << 8; + tmp += *buf++; + Luma[8] = (tmp >> 18) & 0x3F; + Luma[9] = (tmp >> 12) & 0x3F; + Luma[10] = (tmp >> 6) & 0x3F; + Luma[11] = tmp & 0x3F; - tmp = (*buf++) << 16; - tmp += (*buf++) << 8; - tmp += *buf++; - Luma[12] = (tmp >> 18) & 0x3F; - Luma[13] = (tmp >> 12) & 0x3F; - Luma[14] = (tmp >> 6) & 0x3F; - Luma[15] = tmp & 0x3F; + tmp = (*buf++) << 16; + tmp += (*buf++) << 8; + tmp += *buf++; + Luma[12] = (tmp >> 18) & 0x3F; + Luma[13] = (tmp >> 12) & 0x3F; + Luma[14] = (tmp >> 6) & 0x3F; + Luma[15] = tmp & 0x3F; - ulti_convert_yuv(&s->frame, tx, ty, Luma, chroma); - } else { - tmp = *buf++; - if(tmp & 0x80) { - angle = (tmp >> 4) & 0x7; - tmp = (tmp << 8) + *buf++; - Y[0] = (tmp >> 6) & 0x3F; - Y[1] = tmp & 0x3F; - Y[2] = (*buf++) & 0x3F; - Y[3] = (*buf++) & 0x3F; - ulti_grad(&s->frame, tx, ty, Y, chroma, angle); //draw block - } else { // some patterns - int f0, f1; - f0 = *buf++; - f1 = tmp; - Y[0] = (*buf++) & 0x3F; - Y[1] = (*buf++) & 0x3F; - ulti_pattern(&s->frame, tx, ty, f1, f0, Y[0], Y[1], chroma); - } - } - break; - } - if(code != 3) - ulti_grad(&s->frame, tx, ty, Y, chroma, angle); // draw block - } - blocks++; - x += 8; - if(x >= s->width) { - x = 0; - y += 8; - } - } + ulti_convert_yuv(&s->frame, tx, ty, Luma, chroma); + } else { + tmp = *buf++; + if(tmp & 0x80) { + angle = (tmp >> 4) & 0x7; + tmp = (tmp << 8) + *buf++; + Y[0] = (tmp >> 6) & 0x3F; + Y[1] = tmp & 0x3F; + Y[2] = (*buf++) & 0x3F; + Y[3] = (*buf++) & 0x3F; + ulti_grad(&s->frame, tx, ty, Y, chroma, angle); //draw block + } else { // some patterns + int f0, f1; + f0 = *buf++; + f1 = tmp; + Y[0] = (*buf++) & 0x3F; + Y[1] = (*buf++) & 0x3F; + ulti_pattern(&s->frame, tx, ty, f1, f0, Y[0], Y[1], chroma); + } + } + break; + } + if(code != 3) + ulti_grad(&s->frame, tx, ty, Y, chroma, angle); // draw block + } + blocks++; + x += 8; + if(x >= s->width) { + x = 0; + y += 8; + } + } } *data_size=sizeof(AVFrame);