diff options
| author | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
|---|---|---|
| committer | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
| commit | a9b7bf3fb3e1334d8defd05ca4cfae870b4912e5 (patch) | |
| tree | 2dab453d94d5e003379a6cc895eceb84c80e23ec /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c | |
| parent | aafd49a91f7c2fa9c7103971c16fa6e1b29e8bfd (diff) | |
astyle formatting cleanup to make the sourcecode more accessible
switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1783 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c | 1673 |
1 files changed, 1067 insertions, 606 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c index c38c494c1..190791789 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vc1dec.c @@ -47,8 +47,9 @@ static const uint16_t table_mb_intra[64][2];
-static const uint16_t vlc_offs[] = {
- 0, 520, 552, 616, 1128, 1160, 1224, 1740, 1772, 1836, 1900, 2436,
+static const uint16_t vlc_offs[] =
+{
+ 0, 520, 552, 616, 1128, 1160, 1224, 1740, 1772, 1836, 1900, 2436,
2986, 3050, 3610, 4154, 4218, 4746, 5326, 5390, 5902, 6554, 7658, 8620,
9262, 10202, 10756, 11310, 12228, 15078
};
@@ -70,18 +71,18 @@ static int vc1_init_common(VC1Context *v) if(!done)
{
INIT_VLC_STATIC(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23,
- ff_vc1_bfraction_bits, 1, 1,
- ff_vc1_bfraction_codes, 1, 1, 1 << VC1_BFRACTION_VLC_BITS);
+ ff_vc1_bfraction_bits, 1, 1,
+ ff_vc1_bfraction_codes, 1, 1, 1 << VC1_BFRACTION_VLC_BITS);
INIT_VLC_STATIC(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4,
- ff_vc1_norm2_bits, 1, 1,
- ff_vc1_norm2_codes, 1, 1, 1 << VC1_NORM2_VLC_BITS);
+ ff_vc1_norm2_bits, 1, 1,
+ ff_vc1_norm2_codes, 1, 1, 1 << VC1_NORM2_VLC_BITS);
INIT_VLC_STATIC(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64,
- ff_vc1_norm6_bits, 1, 1,
- ff_vc1_norm6_codes, 2, 2, 556);
+ ff_vc1_norm6_bits, 1, 1,
+ ff_vc1_norm6_codes, 2, 2, 556);
INIT_VLC_STATIC(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7,
- ff_vc1_imode_bits, 1, 1,
- ff_vc1_imode_codes, 1, 1, 1 << VC1_IMODE_VLC_BITS);
- for (i=0; i<3; i++)
+ ff_vc1_imode_bits, 1, 1,
+ ff_vc1_imode_codes, 1, 1, 1 << VC1_IMODE_VLC_BITS);
+ for(i = 0; i < 3; i++)
{
ff_vc1_ttmb_vlc[i].table = &vlc_table[vlc_offs[i*3+0]];
ff_vc1_ttmb_vlc[i].table_allocated = vlc_offs[i*3+1] - vlc_offs[i*3+0];
@@ -99,7 +100,7 @@ static int vc1_init_common(VC1Context *v) ff_vc1_subblkpat_bits[i], 1, 1,
ff_vc1_subblkpat_codes[i], 1, 1, INIT_VLC_USE_NEW_STATIC);
}
- for(i=0; i<4; i++)
+ for(i = 0; i < 4; i++)
{
ff_vc1_4mv_block_pattern_vlc[i].table = &vlc_table[vlc_offs[i*3+9]];
ff_vc1_4mv_block_pattern_vlc[i].table_allocated = vlc_offs[i*3+10] - vlc_offs[i*3+9];
@@ -117,7 +118,8 @@ static int vc1_init_common(VC1Context *v) ff_vc1_mv_diff_bits[i], 1, 1,
ff_vc1_mv_diff_codes[i], 2, 2, INIT_VLC_USE_NEW_STATIC);
}
- for(i=0; i<8; i++){
+ for(i = 0; i < 8; i++)
+ {
ff_vc1_ac_coeff_table[i].table = &vlc_table[vlc_offs[i+21]];
ff_vc1_ac_coeff_table[i].table_allocated = vlc_offs[i+22] - vlc_offs[i+21];
init_vlc(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i],
@@ -145,7 +147,8 @@ static int vc1_init_common(VC1Context *v) * Imode types
* @{
*/
-enum Imode {
+enum Imode
+{
IMODE_RAW,
IMODE_NORM2,
IMODE_DIFF2,
@@ -164,10 +167,11 @@ static void vc1_loop_filter_iblk(MpegEncContext *s, int pq) int i, j;
if(!s->first_slice_line)
s->dsp.vc1_v_loop_filter16(s->dest[0], s->linesize, pq);
- s->dsp.vc1_v_loop_filter16(s->dest[0] + 8*s->linesize, s->linesize, pq);
- for(i = !s->mb_x*8; i < 16; i += 8)
+ s->dsp.vc1_v_loop_filter16(s->dest[0] + 8 * s->linesize, s->linesize, pq);
+ for(i = !s->mb_x * 8; i < 16; i += 8)
s->dsp.vc1_h_loop_filter16(s->dest[0] + i, s->linesize, pq);
- for(j = 0; j < 2; j++){
+ for(j = 0; j < 2; j++)
+ {
if(!s->first_slice_line)
s->dsp.vc1_v_loop_filter8(s->dest[j+1], s->uvlinesize, pq);
if(s->mb_x)
@@ -183,7 +187,8 @@ static void vc1_put_block(VC1Context *v, DCTELEM block[6][64]) int ys, us, vs;
DSPContext *dsp = &v->s.dsp;
- if(v->rangeredfrm) {
+ if(v->rangeredfrm)
+ {
int i, j, k;
for(k = 0; k < 6; k++)
for(j = 0; j < 8; j++)
@@ -202,7 +207,8 @@ static void vc1_put_block(VC1Context *v, DCTELEM block[6][64]) dsp->put_pixels_clamped(block[2], Y, ys);
dsp->put_pixels_clamped(block[3], Y + 8, ys);
- if(!(v->s.flags & CODEC_FLAG_GRAY)) {
+ if(!(v->s.flags & CODEC_FLAG_GRAY))
+ {
dsp->put_pixels_clamped(block[4], v->s.dest[1], us);
dsp->put_pixels_clamped(block[5], v->s.dest[2], vs);
}
@@ -224,21 +230,26 @@ static void vc1_mc_1mv(VC1Context *v, int dir) my = s->mv[dir][0][1];
// store motion vectors for further use in B frames
- if(s->pict_type == FF_P_TYPE) {
+ if(s->pict_type == FF_P_TYPE)
+ {
s->current_picture.motion_val[1][s->block_index[0]][0] = mx;
s->current_picture.motion_val[1][s->block_index[0]][1] = my;
}
uvmx = (mx + ((mx & 3) == 3)) >> 1;
uvmy = (my + ((my & 3) == 3)) >> 1;
- if(v->fastuvmc) {
- uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1));
- uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1));
+ if(v->fastuvmc)
+ {
+ uvmx = uvmx + ((uvmx < 0) ? (uvmx & 1) : -(uvmx & 1));
+ uvmy = uvmy + ((uvmy < 0) ? (uvmy & 1) : -(uvmy & 1));
}
- if(!dir) {
+ if(!dir)
+ {
srcY = s->last_picture.data[0];
srcU = s->last_picture.data[1];
srcV = s->last_picture.data[2];
- } else {
+ }
+ else
+ {
srcY = s->next_picture.data[0];
srcU = s->next_picture.data[1];
srcV = s->next_picture.data[2];
@@ -249,14 +260,17 @@ static void vc1_mc_1mv(VC1Context *v, int dir) uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
- if(v->profile != PROFILE_ADVANCED){
- src_x = av_clip( src_x, -16, s->mb_width * 16);
- src_y = av_clip( src_y, -16, s->mb_height * 16);
+ if(v->profile != PROFILE_ADVANCED)
+ {
+ src_x = av_clip(src_x, -16, s->mb_width * 16);
+ src_y = av_clip(src_y, -16, s->mb_height * 16);
uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
- }else{
- src_x = av_clip( src_x, -17, s->avctx->coded_width);
- src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
+ }
+ else
+ {
+ src_x = av_clip(src_x, -17, s->avctx->coded_width);
+ src_y = av_clip(src_y, -18, s->avctx->coded_height + 1);
uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
}
@@ -266,39 +280,46 @@ static void vc1_mc_1mv(VC1Context *v, int dir) srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
/* for grayscale we should not try to read from unknown area */
- if(s->flags & CODEC_FLAG_GRAY) {
+ if(s->flags & CODEC_FLAG_GRAY)
+ {
srcU = s->edge_emu_buffer + 18 * s->linesize;
srcV = s->edge_emu_buffer + 18 * s->linesize;
}
if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
- || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 16 - s->mspel*3
- || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 16 - s->mspel*3){
- uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
+ || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx & 3) - 16 - s->mspel * 3
+ || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my & 3) - 16 - s->mspel * 3)
+ {
+ uint8_t *uvbuf = s->edge_emu_buffer + 19 * s->linesize;
srcY -= s->mspel * (1 + s->linesize);
- ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
+ ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17 + s->mspel * 2, 17 + s->mspel * 2,
src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
srcY = s->edge_emu_buffer;
- ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1,
+ ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8 + 1, 8 + 1,
uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
- ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
+ ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8 + 1, 8 + 1,
uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
srcU = uvbuf;
srcV = uvbuf + 16;
/* if we deal with range reduction we need to scale source blocks */
- if(v->rangeredfrm) {
+ if(v->rangeredfrm)
+ {
int i, j;
uint8_t *src, *src2;
src = srcY;
- for(j = 0; j < 17 + s->mspel*2; j++) {
- for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
+ for(j = 0; j < 17 + s->mspel * 2; j++)
+ {
+ for(i = 0; i < 17 + s->mspel * 2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
src += s->linesize;
}
- src = srcU; src2 = srcV;
- for(j = 0; j < 9; j++) {
- for(i = 0; i < 9; i++) {
+ src = srcU;
+ src2 = srcV;
+ for(j = 0; j < 9; j++)
+ {
+ for(i = 0; i < 9; i++)
+ {
src[i] = ((src[i] - 128) >> 1) + 128;
src2[i] = ((src2[i] - 128) >> 1) + 128;
}
@@ -307,18 +328,23 @@ static void vc1_mc_1mv(VC1Context *v, int dir) }
}
/* if we deal with intensity compensation we need to scale source blocks */
- if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if(v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ {
int i, j;
uint8_t *src, *src2;
src = srcY;
- for(j = 0; j < 17 + s->mspel*2; j++) {
- for(i = 0; i < 17 + s->mspel*2; i++) src[i] = v->luty[src[i]];
+ for(j = 0; j < 17 + s->mspel * 2; j++)
+ {
+ for(i = 0; i < 17 + s->mspel * 2; i++) src[i] = v->luty[src[i]];
src += s->linesize;
}
- src = srcU; src2 = srcV;
- for(j = 0; j < 9; j++) {
- for(i = 0; i < 9; i++) {
+ src = srcU;
+ src2 = srcV;
+ for(j = 0; j < 9; j++)
+ {
+ for(i = 0; i < 9; i++)
+ {
src[i] = v->lutuv[src[i]];
src2[i] = v->lutuv[src2[i]];
}
@@ -329,14 +355,17 @@ static void vc1_mc_1mv(VC1Context *v, int dir) srcY += s->mspel * (1 + s->linesize);
}
- if(s->mspel) {
+ if(s->mspel)
+ {
dxy = ((my & 3) << 2) | (mx & 3);
dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] , srcY , s->linesize, v->rnd);
dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8, srcY + 8, s->linesize, v->rnd);
srcY += s->linesize * 8;
dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize , srcY , s->linesize, v->rnd);
dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd);
- } else { // hpel mc - always used for luma
+ }
+ else // hpel mc - always used for luma
+ {
dxy = (my & 2) | ((mx & 2) >> 1);
if(!v->rnd)
@@ -347,12 +376,15 @@ static void vc1_mc_1mv(VC1Context *v, int dir) if(s->flags & CODEC_FLAG_GRAY) return;
/* Chroma MC always uses qpel bilinear */
- uvmx = (uvmx&3)<<1;
- uvmy = (uvmy&3)<<1;
- if(!v->rnd){
+ uvmx = (uvmx & 3) << 1;
+ uvmy = (uvmy & 3) << 1;
+ if(!v->rnd)
+ {
dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
- }else{
+ }
+ else
+ {
dsp->put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}
@@ -373,57 +405,68 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n) my = s->mv[0][n][1];
srcY = s->last_picture.data[0];
- off = s->linesize * 4 * (n&2) + (n&1) * 8;
+ off = s->linesize * 4 * (n & 2) + (n & 1) * 8;
- src_x = s->mb_x * 16 + (n&1) * 8 + (mx >> 2);
- src_y = s->mb_y * 16 + (n&2) * 4 + (my >> 2);
+ src_x = s->mb_x * 16 + (n & 1) * 8 + (mx >> 2);
+ src_y = s->mb_y * 16 + (n & 2) * 4 + (my >> 2);
- if(v->profile != PROFILE_ADVANCED){
- src_x = av_clip( src_x, -16, s->mb_width * 16);
- src_y = av_clip( src_y, -16, s->mb_height * 16);
- }else{
- src_x = av_clip( src_x, -17, s->avctx->coded_width);
- src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
+ if(v->profile != PROFILE_ADVANCED)
+ {
+ src_x = av_clip(src_x, -16, s->mb_width * 16);
+ src_y = av_clip(src_y, -16, s->mb_height * 16);
+ }
+ else
+ {
+ src_x = av_clip(src_x, -17, s->avctx->coded_width);
+ src_y = av_clip(src_y, -18, s->avctx->coded_height + 1);
}
srcY += src_y * s->linesize + src_x;
if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
- || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 8 - s->mspel*2
- || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 8 - s->mspel*2){
+ || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx & 3) - 8 - s->mspel * 2
+ || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my & 3) - 8 - s->mspel * 2)
+ {
srcY -= s->mspel * (1 + s->linesize);
- ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9+s->mspel*2, 9+s->mspel*2,
+ ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 9 + s->mspel * 2, 9 + s->mspel * 2,
src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
srcY = s->edge_emu_buffer;
/* if we deal with range reduction we need to scale source blocks */
- if(v->rangeredfrm) {
+ if(v->rangeredfrm)
+ {
int i, j;
uint8_t *src;
src = srcY;
- for(j = 0; j < 9 + s->mspel*2; j++) {
- for(i = 0; i < 9 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
+ for(j = 0; j < 9 + s->mspel * 2; j++)
+ {
+ for(i = 0; i < 9 + s->mspel * 2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
src += s->linesize;
}
}
/* if we deal with intensity compensation we need to scale source blocks */
- if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if(v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ {
int i, j;
uint8_t *src;
src = srcY;
- for(j = 0; j < 9 + s->mspel*2; j++) {
- for(i = 0; i < 9 + s->mspel*2; i++) src[i] = v->luty[src[i]];
+ for(j = 0; j < 9 + s->mspel * 2; j++)
+ {
+ for(i = 0; i < 9 + s->mspel * 2; i++) src[i] = v->luty[src[i]];
src += s->linesize;
}
}
srcY += s->mspel * (1 + s->linesize);
}
- if(s->mspel) {
+ if(s->mspel)
+ {
dxy = ((my & 3) << 2) | (mx & 3);
dsp->put_vc1_mspel_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, v->rnd);
- } else { // hpel mc - always used for luma
+ }
+ else // hpel mc - always used for luma
+ {
dxy = (my & 2) | ((mx & 2) >> 1);
if(!v->rnd)
dsp->put_pixels_tab[1][dxy](s->dest[0] + off, srcY, s->linesize, 8);
@@ -434,10 +477,13 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n) static inline int median4(int a, int b, int c, int d)
{
- if(a < b) {
+ if(a < b)
+ {
if(c < d) return (FFMIN(b, d) + FFMAX(a, c)) / 2;
else return (FFMIN(b, c) + FFMAX(a, d)) / 2;
- } else {
+ }
+ else
+ {
if(c < d) return (FFMIN(a, d) + FFMAX(b, c)) / 2;
else return (FFMIN(a, c) + FFMAX(b, d)) / 2;
}
@@ -459,7 +505,8 @@ static void vc1_mc_4mv_chroma(VC1Context *v) if(!v->s.last_picture.data[0])return;
if(s->flags & CODEC_FLAG_GRAY) return;
- for(i = 0; i < 4; i++) {
+ for(i = 0; i < 4; i++)
+ {
mvx[i] = s->mv[0][i][0];
mvy[i] = s->mv[0][i][1];
intra[i] = v->mb_type[0][s->block_index[i]];
@@ -467,11 +514,15 @@ static void vc1_mc_4mv_chroma(VC1Context *v) /* calculate chroma MV vector from four luma MVs */
idx = (intra[3] << 3) | (intra[2] << 2) | (intra[1] << 1) | intra[0];
- if(!idx) { // all blocks are inter
+ if(!idx) // all blocks are inter
+ {
tx = median4(mvx[0], mvx[1], mvx[2], mvx[3]);
ty = median4(mvy[0], mvy[1], mvy[2], mvy[3]);
- } else if(count[idx] == 1) { // 3 inter blocks
- switch(idx) {
+ }
+ else if(count[idx] == 1) // 3 inter blocks
+ {
+ switch(idx)
+ {
case 0x1:
tx = mid_pred(mvx[1], mvx[2], mvx[3]);
ty = mid_pred(mvy[1], mvy[2], mvy[3]);
@@ -489,13 +540,25 @@ static void vc1_mc_4mv_chroma(VC1Context *v) ty = mid_pred(mvy[0], mvy[1], mvy[2]);
break;
}
- } else if(count[idx] == 2) {
+ }
+ else if(count[idx] == 2)
+ {
int t1 = 0, t2 = 0;
- for(i=0; i<3;i++) if(!intra[i]) {t1 = i; break;}
- for(i= t1+1; i<4; i++)if(!intra[i]) {t2 = i; break;}
+ for(i = 0; i < 3; i++) if(!intra[i])
+ {
+ t1 = i;
+ break;
+ }
+ for(i = t1 + 1; i < 4; i++)if(!intra[i])
+ {
+ t2 = i;
+ break;
+ }
tx = (mvx[t1] + mvx[t2]) / 2;
ty = (mvy[t1] + mvy[t2]) / 2;
- } else {
+ }
+ else
+ {
s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
return; //no need to do MC for inter blocks
@@ -503,20 +566,24 @@ static void vc1_mc_4mv_chroma(VC1Context *v) s->current_picture.motion_val[1][s->block_index[0]][0] = tx;
s->current_picture.motion_val[1][s->block_index[0]][1] = ty;
- uvmx = (tx + ((tx&3) == 3)) >> 1;
- uvmy = (ty + ((ty&3) == 3)) >> 1;
- if(v->fastuvmc) {
- uvmx = uvmx + ((uvmx<0)?(uvmx&1):-(uvmx&1));
- uvmy = uvmy + ((uvmy<0)?(uvmy&1):-(uvmy&1));
+ uvmx = (tx + ((tx & 3) == 3)) >> 1;
+ uvmy = (ty + ((ty & 3) == 3)) >> 1;
+ if(v->fastuvmc)
+ {
+ uvmx = uvmx + ((uvmx < 0) ? (uvmx & 1) : -(uvmx & 1));
+ uvmy = uvmy + ((uvmy < 0) ? (uvmy & 1) : -(uvmy & 1));
}
uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
- if(v->profile != PROFILE_ADVANCED){
+ if(v->profile != PROFILE_ADVANCED)
+ {
uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
- }else{
+ }
+ else
+ {
uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
}
@@ -525,22 +592,27 @@ static void vc1_mc_4mv_chroma(VC1Context *v) srcV = s->last_picture.data[2] + uvsrc_y * s->uvlinesize + uvsrc_x;
if(v->rangeredfrm || (v->mv_mode == MV_PMODE_INTENSITY_COMP)
|| (unsigned)uvsrc_x > (s->h_edge_pos >> 1) - 9
- || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9){
- ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8+1, 8+1,
+ || (unsigned)uvsrc_y > (s->v_edge_pos >> 1) - 9)
+ {
+ ff_emulated_edge_mc(s->edge_emu_buffer , srcU, s->uvlinesize, 8 + 1, 8 + 1,
uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
- ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8+1, 8+1,
+ ff_emulated_edge_mc(s->edge_emu_buffer + 16, srcV, s->uvlinesize, 8 + 1, 8 + 1,
uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
srcU = s->edge_emu_buffer;
srcV = s->edge_emu_buffer + 16;
/* if we deal with range reduction we need to scale source blocks */
- if(v->rangeredfrm) {
+ if(v->rangeredfrm)
+ {
int i, j;
uint8_t *src, *src2;
- src = srcU; src2 = srcV;
- for(j = 0; j < 9; j++) {
- for(i = 0; i < 9; i++) {
+ src = srcU;
+ src2 = srcV;
+ for(j = 0; j < 9; j++)
+ {
+ for(i = 0; i < 9; i++)
+ {
src[i] = ((src[i] - 128) >> 1) + 128;
src2[i] = ((src2[i] - 128) >> 1) + 128;
}
@@ -549,13 +621,17 @@ static void vc1_mc_4mv_chroma(VC1Context *v) }
}
/* if we deal with intensity compensation we need to scale source blocks */
- if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
+ if(v->mv_mode == MV_PMODE_INTENSITY_COMP)
+ {
int i, j;
uint8_t *src, *src2;
- src = srcU; src2 = srcV;
- for(j = 0; j < 9; j++) {
- for(i = 0; i < 9; i++) {
+ src = srcU;
+ src2 = srcV;
+ for(j = 0; j < 9; j++)
+ {
+ for(i = 0; i < 9; i++)
+ {
src[i] = v->lutuv[src[i]];
src2[i] = v->lutuv[src2[i]];
}
@@ -566,12 +642,15 @@ static void vc1_mc_4mv_chroma(VC1Context *v) }
/* Chroma MC always uses qpel bilinear */
- uvmx = (uvmx&3)<<1;
- uvmy = (uvmy&3)<<1;
- if(!v->rnd){
+ uvmx = (uvmx & 3) << 1;
+ uvmy = (uvmy & 3) << 1;
+ if(!v->rnd)
+ {
dsp->put_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
- }else{
+ }
+ else
+ {
dsp->put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->put_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}
@@ -687,12 +766,14 @@ static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, i wrap = s->b8_stride;
xy = s->block_index[n];
- if(s->mb_intra){
+ if(s->mb_intra)
+ {
s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = 0;
s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = 0;
s->current_picture.motion_val[1][xy][0] = 0;
s->current_picture.motion_val[1][xy][1] = 0;
- if(mv1) { /* duplicate motion data for 1-MV block */
+ if(mv1) /* duplicate motion data for 1-MV block */
+ {
s->current_picture.motion_val[0][xy + 1][0] = 0;
s->current_picture.motion_val[0][xy + 1][1] = 0;
s->current_picture.motion_val[0][xy + wrap][0] = 0;
@@ -713,9 +794,11 @@ static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, i A = s->current_picture.motion_val[0][xy - wrap];
if(mv1)
off = (s->mb_x == (s->mb_width - 1)) ? -1 : 2;
- else {
+ else
+ {
//in 4-MV mode different blocks have different B predictor position
- switch(n){
+ switch(n)
+ {
case 0:
off = (s->mb_x > 0) ? -1 : 1;
break;
@@ -731,31 +814,42 @@ static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, i }
B = s->current_picture.motion_val[0][xy - wrap + off];
- if(!s->first_slice_line || (n==2 || n==3)) { // predictor A is not out of bounds
- if(s->mb_width == 1) {
+ if(!s->first_slice_line || (n == 2 || n == 3)) // predictor A is not out of bounds
+ {
+ if(s->mb_width == 1)
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = mid_pred(A[0], B[0], C[0]);
py = mid_pred(A[1], B[1], C[1]);
}
- } else if(s->mb_x || (n==1 || n==3)) { // predictor C is not out of bounds
+ }
+ else if(s->mb_x || (n == 1 || n == 3)) // predictor C is not out of bounds
+ {
px = C[0];
py = C[1];
- } else {
+ }
+ else
+ {
px = py = 0;
}
/* Pullback MV as specified in 8.3.5.3.4 */
{
int qx, qy, X, Y;
- qx = (s->mb_x << 6) + ((n==1 || n==3) ? 32 : 0);
- qy = (s->mb_y << 6) + ((n==2 || n==3) ? 32 : 0);
+ qx = (s->mb_x << 6) + ((n == 1 || n == 3) ? 32 : 0);
+ qy = (s->mb_y << 6) + ((n == 2 || n == 3) ? 32 : 0);
X = (s->mb_width << 6) - 4;
Y = (s->mb_height << 6) - 4;
- if(mv1) {
+ if(mv1)
+ {
if(qx + px < -60) px = -60 - qx;
if(qy + py < -60) py = -60 - qy;
- } else {
+ }
+ else
+ {
if(qx + px < -28) px = -28 - qx;
if(qy + py < -28) py = -28 - qy;
}
@@ -763,29 +857,40 @@ static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, i if(qy + py > Y) py = Y - qy;
}
/* Calculate hybrid prediction as specified in 8.3.5.3.5 */
- if((!s->first_slice_line || (n==2 || n==3)) && (s->mb_x || (n==1 || n==3))) {
+ if((!s->first_slice_line || (n == 2 || n == 3)) && (s->mb_x || (n == 1 || n == 3)))
+ {
if(is_intra[xy - wrap])
sum = FFABS(px) + FFABS(py);
else
sum = FFABS(px - A[0]) + FFABS(py - A[1]);
- if(sum > 32) {
- if(get_bits1(&s->gb)) {
+ if(sum > 32)
+ {
+ if(get_bits1(&s->gb))
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = C[0];
py = C[1];
}
- } else {
+ }
+ else
+ {
if(is_intra[xy - 1])
sum = FFABS(px) + FFABS(py);
else
sum = FFABS(px - C[0]) + FFABS(py - C[1]);
- if(sum > 32) {
- if(get_bits1(&s->gb)) {
+ if(sum > 32)
+ {
+ if(get_bits1(&s->gb))
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = C[0];
py = C[1];
}
@@ -795,7 +900,8 @@ static inline void vc1_pred_mv(MpegEncContext *s, int n, int dmv_x, int dmv_y, i /* store MV using signed modulus of MV range defined in 4.11 */
s->mv[0][n][0] = s->current_picture.motion_val[0][xy][0] = ((px + dmv_x + r_x) & ((r_x << 1) - 1)) - r_x;
s->mv[0][n][1] = s->current_picture.motion_val[0][xy][1] = ((py + dmv_y + r_y) & ((r_y << 1) - 1)) - r_y;
- if(mv1) { /* duplicate motion data for 1-MV block */
+ if(mv1) /* duplicate motion data for 1-MV block */
+ {
s->current_picture.motion_val[0][xy + 1][0] = s->current_picture.motion_val[0][xy][0];
s->current_picture.motion_val[0][xy + 1][1] = s->current_picture.motion_val[0][xy][1];
s->current_picture.motion_val[0][xy + wrap][0] = s->current_picture.motion_val[0][xy][0];
@@ -820,9 +926,10 @@ static void vc1_interp_mc(VC1Context *v) my = s->mv[1][0][1];
uvmx = (mx + ((mx & 3) == 3)) >> 1;
uvmy = (my + ((my & 3) == 3)) >> 1;
- if(v->fastuvmc) {
- uvmx = uvmx + ((uvmx<0)?-(uvmx&1):(uvmx&1));
- uvmy = uvmy + ((uvmy<0)?-(uvmy&1):(uvmy&1));
+ if(v->fastuvmc)
+ {
+ uvmx = uvmx + ((uvmx < 0) ? -(uvmx & 1) : (uvmx & 1));
+ uvmy = uvmy + ((uvmy < 0) ? -(uvmy & 1) : (uvmy & 1));
}
srcY = s->next_picture.data[0];
srcU = s->next_picture.data[1];
@@ -833,14 +940,17 @@ static void vc1_interp_mc(VC1Context *v) uvsrc_x = s->mb_x * 8 + (uvmx >> 2);
uvsrc_y = s->mb_y * 8 + (uvmy >> 2);
- if(v->profile != PROFILE_ADVANCED){
- src_x = av_clip( src_x, -16, s->mb_width * 16);
- src_y = av_clip( src_y, -16, s->mb_height * 16);
+ if(v->profile != PROFILE_ADVANCED)
+ {
+ src_x = av_clip(src_x, -16, s->mb_width * 16);
+ src_y = av_clip(src_y, -16, s->mb_height * 16);
uvsrc_x = av_clip(uvsrc_x, -8, s->mb_width * 8);
uvsrc_y = av_clip(uvsrc_y, -8, s->mb_height * 8);
- }else{
- src_x = av_clip( src_x, -17, s->avctx->coded_width);
- src_y = av_clip( src_y, -18, s->avctx->coded_height + 1);
+ }
+ else
+ {
+ src_x = av_clip(src_x, -17, s->avctx->coded_width);
+ src_y = av_clip(src_y, -18, s->avctx->coded_height + 1);
uvsrc_x = av_clip(uvsrc_x, -8, s->avctx->coded_width >> 1);
uvsrc_y = av_clip(uvsrc_y, -8, s->avctx->coded_height >> 1);
}
@@ -850,39 +960,46 @@ static void vc1_interp_mc(VC1Context *v) srcV += uvsrc_y * s->uvlinesize + uvsrc_x;
/* for grayscale we should not try to read from unknown area */
- if(s->flags & CODEC_FLAG_GRAY) {
+ if(s->flags & CODEC_FLAG_GRAY)
+ {
srcU = s->edge_emu_buffer + 18 * s->linesize;
srcV = s->edge_emu_buffer + 18 * s->linesize;
}
if(v->rangeredfrm
- || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx&3) - 16 - s->mspel*3
- || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my&3) - 16 - s->mspel*3){
- uint8_t *uvbuf= s->edge_emu_buffer + 19 * s->linesize;
+ || (unsigned)(src_x - s->mspel) > s->h_edge_pos - (mx & 3) - 16 - s->mspel * 3
+ || (unsigned)(src_y - s->mspel) > s->v_edge_pos - (my & 3) - 16 - s->mspel * 3)
+ {
+ uint8_t *uvbuf = s->edge_emu_buffer + 19 * s->linesize;
srcY -= s->mspel * (1 + s->linesize);
- ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17+s->mspel*2, 17+s->mspel*2,
+ ff_emulated_edge_mc(s->edge_emu_buffer, srcY, s->linesize, 17 + s->mspel * 2, 17 + s->mspel * 2,
src_x - s->mspel, src_y - s->mspel, s->h_edge_pos, s->v_edge_pos);
srcY = s->edge_emu_buffer;
- ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8+1, 8+1,
+ ff_emulated_edge_mc(uvbuf , srcU, s->uvlinesize, 8 + 1, 8 + 1,
uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
- ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8+1, 8+1,
+ ff_emulated_edge_mc(uvbuf + 16, srcV, s->uvlinesize, 8 + 1, 8 + 1,
uvsrc_x, uvsrc_y, s->h_edge_pos >> 1, s->v_edge_pos >> 1);
srcU = uvbuf;
srcV = uvbuf + 16;
/* if we deal with range reduction we need to scale source blocks */
- if(v->rangeredfrm) {
+ if(v->rangeredfrm)
+ {
int i, j;
uint8_t *src, *src2;
src = srcY;
- for(j = 0; j < 17 + s->mspel*2; j++) {
- for(i = 0; i < 17 + s->mspel*2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
+ for(j = 0; j < 17 + s->mspel * 2; j++)
+ {
+ for(i = 0; i < 17 + s->mspel * 2; i++) src[i] = ((src[i] - 128) >> 1) + 128;
src += s->linesize;
}
- src = srcU; src2 = srcV;
- for(j = 0; j < 9; j++) {
- for(i = 0; i < 9; i++) {
+ src = srcU;
+ src2 = srcV;
+ for(j = 0; j < 9; j++)
+ {
+ for(i = 0; i < 9; i++)
+ {
src[i] = ((src[i] - 128) >> 1) + 128;
src2[i] = ((src2[i] - 128) >> 1) + 128;
}
@@ -893,14 +1010,17 @@ static void vc1_interp_mc(VC1Context *v) srcY += s->mspel * (1 + s->linesize);
}
- if(s->mspel) {
+ if(s->mspel)
+ {
dxy = ((my & 3) << 2) | (mx & 3);
dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] , srcY , s->linesize, v->rnd);
dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8, srcY + 8, s->linesize, v->rnd);
srcY += s->linesize * 8;
dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize , srcY , s->linesize, v->rnd);
dsp->avg_vc1_mspel_pixels_tab[dxy](s->dest[0] + 8 * s->linesize + 8, srcY + 8, s->linesize, v->rnd);
- } else { // hpel mc
+ }
+ else // hpel mc
+ {
dxy = (my & 2) | ((mx & 2) >> 1);
if(!v->rnd)
@@ -911,12 +1031,15 @@ static void vc1_interp_mc(VC1Context *v) if(s->flags & CODEC_FLAG_GRAY) return;
/* Chroma MC always uses qpel blilinear */
- uvmx = (uvmx&3)<<1;
- uvmy = (uvmy&3)<<1;
- if(!v->rnd){
+ uvmx = (uvmx & 3) << 1;
+ uvmy = (uvmy & 3) << 1;
+ if(!v->rnd)
+ {
dsp->avg_h264_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->avg_h264_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
- }else{
+ }
+ else
+ {
dsp->avg_no_rnd_vc1_chroma_pixels_tab[0](s->dest[1], srcU, s->uvlinesize, 8, uvmx, uvmy);
dsp->avg_no_rnd_vc1_chroma_pixels_tab[0](s->dest[2], srcV, s->uvlinesize, 8, uvmx, uvmy);
}
@@ -937,7 +1060,7 @@ static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs) n -= B_FRACTION_DEN;
if(!qs)
return 2 * ((value * n + B_FRACTION_DEN - 1) / (2 * B_FRACTION_DEN));
- return (value * n + B_FRACTION_DEN/2) / B_FRACTION_DEN;
+ return (value * n + B_FRACTION_DEN / 2) / B_FRACTION_DEN;
#endif
}
@@ -945,17 +1068,20 @@ static av_always_inline int scale_mv(int value, int bfrac, int inv, int qs) */
static inline void vc1_b_mc(VC1Context *v, int dmv_x[2], int dmv_y[2], int direct, int mode)
{
- if(v->use_ic) {
+ if(v->use_ic)
+ {
v->mv_mode2 = v->mv_mode;
v->mv_mode = MV_PMODE_INTENSITY_COMP;
}
- if(direct) {
+ if(direct)
+ {
vc1_mc_1mv(v, 0);
vc1_interp_mc(v);
if(v->use_ic) v->mv_mode = v->mv_mode2;
return;
}
- if(mode == BMV_TYPE_INTERPOLATED) {
+ if(mode == BMV_TYPE_INTERPOLATED)
+ {
vc1_mc_1mv(v, 0);
vc1_interp_mc(v);
if(v->use_ic) v->mv_mode = v->mv_mode2;
@@ -988,11 +1114,12 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int wrap = s->b8_stride;
xy = s->block_index[0];
- if(s->mb_intra) {
+ if(s->mb_intra)
+ {
s->current_picture.motion_val[0][xy][0] =
- s->current_picture.motion_val[0][xy][1] =
- s->current_picture.motion_val[1][xy][0] =
- s->current_picture.motion_val[1][xy][1] = 0;
+ s->current_picture.motion_val[0][xy][1] =
+ s->current_picture.motion_val[1][xy][0] =
+ s->current_picture.motion_val[1][xy][1] = 0;
return;
}
s->mv[0][0][0] = scale_mv(s->next_picture.motion_val[1][xy][0], v->bfraction, 0, s->quarter_sample);
@@ -1005,7 +1132,8 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int s->mv[0][0][1] = av_clip(s->mv[0][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
s->mv[1][0][0] = av_clip(s->mv[1][0][0], -60 - (s->mb_x << 6), (s->mb_width << 6) - 4 - (s->mb_x << 6));
s->mv[1][0][1] = av_clip(s->mv[1][0][1], -60 - (s->mb_y << 6), (s->mb_height << 6) - 4 - (s->mb_y << 6));
- if(direct) {
+ if(direct)
+ {
s->current_picture.motion_val[0][xy][0] = s->mv[0][0][0];
s->current_picture.motion_val[0][xy][1] = s->mv[0][0][1];
s->current_picture.motion_val[1][xy][0] = s->mv[1][0][0];
@@ -1013,31 +1141,41 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int return;
}
- if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
+ if((mvtype == BMV_TYPE_FORWARD) || (mvtype == BMV_TYPE_INTERPOLATED))
+ {
C = s->current_picture.motion_val[0][xy - 2];
A = s->current_picture.motion_val[0][xy - wrap*2];
off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
B = s->current_picture.motion_val[0][xy - wrap*2 + off];
if(!s->mb_x) C[0] = C[1] = 0;
- if(!s->first_slice_line) { // predictor A is not out of bounds
- if(s->mb_width == 1) {
+ if(!s->first_slice_line) // predictor A is not out of bounds
+ {
+ if(s->mb_width == 1)
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = mid_pred(A[0], B[0], C[0]);
py = mid_pred(A[1], B[1], C[1]);
}
- } else if(s->mb_x) { // predictor C is not out of bounds
+ }
+ else if(s->mb_x) // predictor C is not out of bounds
+ {
px = C[0];
py = C[1];
- } else {
+ }
+ else
+ {
px = py = 0;
}
/* Pullback MV as specified in 8.3.5.3.4 */
{
int qx, qy, X, Y;
- if(v->profile < PROFILE_ADVANCED) {
+ if(v->profile < PROFILE_ADVANCED)
+ {
qx = (s->mb_x << 5);
qy = (s->mb_y << 5);
X = (s->mb_width << 5) - 4;
@@ -1046,7 +1184,9 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int if(qy + py < -28) py = -28 - qy;
if(qx + px > X) px = X - qx;
if(qy + py > Y) py = Y - qy;
- } else {
+ }
+ else
+ {
qx = (s->mb_x << 6);
qy = (s->mb_y << 6);
X = (s->mb_width << 6) - 4;
@@ -1058,29 +1198,40 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int }
}
/* Calculate hybrid prediction as specified in 8.3.5.3.5 */
- if(0 && !s->first_slice_line && s->mb_x) {
+ if(0 && !s->first_slice_line && s->mb_x)
+ {
if(is_intra[xy - wrap])
sum = FFABS(px) + FFABS(py);
else
sum = FFABS(px - A[0]) + FFABS(py - A[1]);
- if(sum > 32) {
- if(get_bits1(&s->gb)) {
+ if(sum > 32)
+ {
+ if(get_bits1(&s->gb))
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = C[0];
py = C[1];
}
- } else {
+ }
+ else
+ {
if(is_intra[xy - 2])
sum = FFABS(px) + FFABS(py);
else
sum = FFABS(px - C[0]) + FFABS(py - C[1]);
- if(sum > 32) {
- if(get_bits1(&s->gb)) {
+ if(sum > 32)
+ {
+ if(get_bits1(&s->gb))
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = C[0];
py = C[1];
}
@@ -1091,31 +1242,41 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int s->mv[0][0][0] = ((px + dmv_x[0] + r_x) & ((r_x << 1) - 1)) - r_x;
s->mv[0][0][1] = ((py + dmv_y[0] + r_y) & ((r_y << 1) - 1)) - r_y;
}
- if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED)) {
+ if((mvtype == BMV_TYPE_BACKWARD) || (mvtype == BMV_TYPE_INTERPOLATED))
+ {
C = s->current_picture.motion_val[1][xy - 2];
A = s->current_picture.motion_val[1][xy - wrap*2];
off = (s->mb_x == (s->mb_width - 1)) ? -2 : 2;
B = s->current_picture.motion_val[1][xy - wrap*2 + off];
if(!s->mb_x) C[0] = C[1] = 0;
- if(!s->first_slice_line) { // predictor A is not out of bounds
- if(s->mb_width == 1) {
+ if(!s->first_slice_line) // predictor A is not out of bounds
+ {
+ if(s->mb_width == 1)
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = mid_pred(A[0], B[0], C[0]);
py = mid_pred(A[1], B[1], C[1]);
}
- } else if(s->mb_x) { // predictor C is not out of bounds
+ }
+ else if(s->mb_x) // predictor C is not out of bounds
+ {
px = C[0];
py = C[1];
- } else {
+ }
+ else
+ {
px = py = 0;
}
/* Pullback MV as specified in 8.3.5.3.4 */
{
int qx, qy, X, Y;
- if(v->profile < PROFILE_ADVANCED) {
+ if(v->profile < PROFILE_ADVANCED)
+ {
qx = (s->mb_x << 5);
qy = (s->mb_y << 5);
X = (s->mb_width << 5) - 4;
@@ -1124,7 +1285,9 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int if(qy + py < -28) py = -28 - qy;
if(qx + px > X) px = X - qx;
if(qy + py > Y) py = Y - qy;
- } else {
+ }
+ else
+ {
qx = (s->mb_x << 6);
qy = (s->mb_y << 6);
X = (s->mb_width << 6) - 4;
@@ -1136,29 +1299,40 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int }
}
/* Calculate hybrid prediction as specified in 8.3.5.3.5 */
- if(0 && !s->first_slice_line && s->mb_x) {
+ if(0 && !s->first_slice_line && s->mb_x)
+ {
if(is_intra[xy - wrap])
sum = FFABS(px) + FFABS(py);
else
sum = FFABS(px - A[0]) + FFABS(py - A[1]);
- if(sum > 32) {
- if(get_bits1(&s->gb)) {
+ if(sum > 32)
+ {
+ if(get_bits1(&s->gb))
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = C[0];
py = C[1];
}
- } else {
+ }
+ else
+ {
if(is_intra[xy - 2])
sum = FFABS(px) + FFABS(py);
else
sum = FFABS(px - C[0]) + FFABS(py - C[1]);
- if(sum > 32) {
- if(get_bits1(&s->gb)) {
+ if(sum > 32)
+ {
+ if(get_bits1(&s->gb))
+ {
px = A[0];
py = A[1];
- } else {
+ }
+ else
+ {
px = C[0];
py = C[1];
}
@@ -1186,23 +1360,24 @@ static inline void vc1_pred_b_mv(VC1Context *v, int dmv_x[2], int dmv_y[2], int * @param dir_ptr Prediction direction for use in AC prediction
*/
static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n,
- int16_t **dc_val_ptr, int *dir_ptr)
+ int16_t **dc_val_ptr, int *dir_ptr)
{
int a, b, c, wrap, pred, scale;
int16_t *dc_val;
- static const uint16_t dcpred[32] = {
- -1, 1024, 512, 341, 256, 205, 171, 146, 128,
- 114, 102, 93, 85, 79, 73, 68, 64,
- 60, 57, 54, 51, 49, 47, 45, 43,
- 41, 39, 38, 37, 35, 34, 33
+ static const uint16_t dcpred[32] =
+ {
+ -1, 1024, 512, 341, 256, 205, 171, 146, 128,
+ 114, 102, 93, 85, 79, 73, 68, 64,
+ 60, 57, 54, 51, 49, 47, 45, 43,
+ 41, 39, 38, 37, 35, 34, 33
};
/* find prediction - wmv3_dc_scale always used here in fact */
- if (n < 4) scale = s->y_dc_scale;
+ if(n < 4) scale = s->y_dc_scale;
else scale = s->c_dc_scale;
wrap = s->block_wrap[n];
- dc_val= s->dc_val[0] + s->block_index[n];
+ dc_val = s->dc_val[0] + s->block_index[n];
/* B A
* C X
@@ -1211,23 +1386,26 @@ static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n, b = dc_val[ - 1 - wrap];
a = dc_val[ - wrap];
- if (pq < 9 || !overlap)
+ if(pq < 9 || !overlap)
{
/* Set outer values */
- if (s->first_slice_line && (n!=2 && n!=3)) b=a=dcpred[scale];
- if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=dcpred[scale];
+ if(s->first_slice_line && (n != 2 && n != 3)) b = a = dcpred[scale];
+ if(s->mb_x == 0 && (n != 1 && n != 3)) b = c = dcpred[scale];
}
else
{
/* Set outer values */
- if (s->first_slice_line && (n!=2 && n!=3)) b=a=0;
- if (s->mb_x == 0 && (n!=1 && n!=3)) b=c=0;
+ if(s->first_slice_line && (n != 2 && n != 3)) b = a = 0;
+ if(s->mb_x == 0 && (n != 1 && n != 3)) b = c = 0;
}
- if (abs(a - b) <= abs(b - c)) {
+ if(abs(a - b) <= abs(b - c))
+ {
pred = c;
*dir_ptr = 1;//left
- } else {
+ }
+ else
+ {
pred = a;
*dir_ptr = 0;//top
}
@@ -1259,7 +1437,7 @@ static inline int vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, int q1, q2 = 0;
wrap = s->block_wrap[n];
- dc_val= s->dc_val[0] + s->block_index[n];
+ dc_val = s->dc_val[0] + s->block_index[n];
/* B A
* C X
@@ -1269,17 +1447,20 @@ static inline int vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, a = dc_val[ - wrap];
/* scale predictors if needed */
q1 = s->current_picture.qscale_table[mb_pos];
- if(c_avail && (n!= 1 && n!=3)) {
+ if(c_avail && (n != 1 && n != 3))
+ {
q2 = s->current_picture.qscale_table[mb_pos - 1];
if(q2 && q2 != q1)
c = (c * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18;
}
- if(a_avail && (n!= 2 && n!=3)) {
+ if(a_avail && (n != 2 && n != 3))
+ {
q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
if(q2 && q2 != q1)
a = (a * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18;
}
- if(a_avail && c_avail && (n!=3)) {
+ if(a_avail && c_avail && (n != 3))
+ {
int off = mb_pos;
if(n != 1) off--;
if(n != 2) off -= s->mb_stride;
@@ -1288,21 +1469,31 @@ static inline int vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, b = (b * s->y_dc_scale_table[q2] * ff_vc1_dqscale[s->y_dc_scale_table[q1] - 1] + 0x20000) >> 18;
}
- if(a_avail && c_avail) {
- if(abs(a - b) <= abs(b - c)) {
+ if(a_avail && c_avail)
+ {
+ if(abs(a - b) <= abs(b - c))
+ {
pred = c;
*dir_ptr = 1;//left
- } else {
+ }
+ else
+ {
pred = a;
*dir_ptr = 0;//top
}
- } else if(a_avail) {
+ }
+ else if(a_avail)
+ {
pred = a;
*dir_ptr = 0;//top
- } else if(c_avail) {
+ }
+ else if(c_avail)
+ {
pred = c;
*dir_ptr = 1;//left
- } else {
+ }
+ else
+ {
pred = 0;
*dir_ptr = 1;//left
}
@@ -1334,9 +1525,12 @@ static inline int vc1_coded_block_pred(MpegEncContext * s, int n, uint8_t **code b = s->coded_block[xy - 1 - wrap];
c = s->coded_block[xy - wrap];
- if (b == c) {
+ if(b == c)
+ {
pred = a;
- } else {
+ }
+ else
+ {
pred = c;
}
@@ -1361,25 +1555,32 @@ static void vc1_decode_ac_coeff(VC1Context *v, int *last, int *skip, int *value, int index, escape, run = 0, level = 0, lst = 0;
index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3);
- if (index != vc1_ac_sizes[codingset] - 1) {
+ if(index != vc1_ac_sizes[codingset] - 1)
+ {
run = vc1_index_decode_table[codingset][index][0];
level = vc1_index_decode_table[codingset][index][1];
lst = index >= vc1_last_decode_table[codingset];
if(get_bits1(gb))
level = -level;
- } else {
+ }
+ else
+ {
escape = decode210(gb);
- if (escape != 2) {
+ if(escape != 2)
+ {
index = get_vlc2(gb, ff_vc1_ac_coeff_table[codingset].table, AC_VLC_BITS, 3);
run = vc1_index_decode_table[codingset][index][0];
level = vc1_index_decode_table[codingset][index][1];
lst = index >= vc1_last_decode_table[codingset];
- if(escape == 0) {
+ if(escape == 0)
+ {
if(lst)
level += vc1_last_delta_level_table[codingset][run];
else
level += vc1_delta_level_table[codingset][run];
- } else {
+ }
+ else
+ {
if(lst)
run += vc1_last_delta_run_table[codingset][level] + 1;
else
@@ -1387,15 +1588,21 @@ static void vc1_decode_ac_coeff(VC1Context *v, int *last, int *skip, int *value, }
if(get_bits1(gb))
level = -level;
- } else {
+ }
+ else
+ {
int sign;
lst = get_bits1(gb);
- if(v->s.esc3_level_length == 0) {
- if(v->pq < 8 || v->dquantfrm) { // table 59
+ if(v->s.esc3_level_length == 0)
+ {
+ if(v->pq < 8 || v->dquantfrm) // table 59
+ {
v->s.esc3_level_length = get_bits(gb, 3);
if(!v->s.esc3_level_length)
v->s.esc3_level_length = get_bits(gb, 2) + 8;
- } else { //table 60
+ }
+ else //table 60
+ {
v->s.esc3_level_length = get_unary(gb, 1, 6) + 2;
}
v->s.esc3_run_length = 3 + get_bits(gb, 2);
@@ -1431,32 +1638,36 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded int dcdiff;
/* Get DC differential */
- if (n < 4) {
+ if(n < 4)
+ {
dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
- } else {
+ }
+ else
+ {
dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
}
- if (dcdiff < 0){
+ if(dcdiff < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n");
return -1;
}
- if (dcdiff)
+ if(dcdiff)
{
- if (dcdiff == 119 /* ESC index value */)
+ if(dcdiff == 119 /* ESC index value */)
{
/* TODO: Optimize */
- if (v->pq == 1) dcdiff = get_bits(gb, 10);
- else if (v->pq == 2) dcdiff = get_bits(gb, 9);
+ if(v->pq == 1) dcdiff = get_bits(gb, 10);
+ else if(v->pq == 2) dcdiff = get_bits(gb, 9);
else dcdiff = get_bits(gb, 8);
}
else
{
- if (v->pq == 1)
- dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3;
- else if (v->pq == 2)
- dcdiff = (dcdiff<<1) + get_bits1(gb) - 1;
+ if(v->pq == 1)
+ dcdiff = (dcdiff << 2) + get_bits(gb, 2) - 3;
+ else if(v->pq == 2)
+ dcdiff = (dcdiff << 1) + get_bits1(gb) - 1;
}
- if (get_bits1(gb))
+ if(get_bits1(gb))
dcdiff = -dcdiff;
}
@@ -1465,13 +1676,17 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded *dc_val = dcdiff;
/* Store the quantized DC coeff, used for prediction */
- if (n < 4) {
+ if(n < 4)
+ {
block[0] = dcdiff * s->y_dc_scale;
- } else {
+ }
+ else
+ {
block[0] = dcdiff * s->c_dc_scale;
}
/* Skip ? */
- if (!coded) {
+ if(!coded)
+ {
goto not_coded;
}
@@ -1486,12 +1701,14 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded scale = v->pq * 2 + v->halfpq;
- if(v->s.ac_pred) {
+ if(v->s.ac_pred)
+ {
if(!dc_pred_dir)
zz_table = wmv1_scantable[2];
else
zz_table = wmv1_scantable[3];
- } else
+ }
+ else
zz_table = wmv1_scantable[1];
ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
@@ -1501,7 +1718,8 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded else //top
ac_val -= 16 * s->block_wrap[n];
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, codingset);
i += skip;
if(i > 63)
@@ -1510,24 +1728,30 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded }
/* apply AC prediction if needed */
- if(s->ac_pred) {
- if(dc_pred_dir) { //left
+ if(s->ac_pred)
+ {
+ if(dc_pred_dir) //left
+ {
for(k = 1; k < 8; k++)
block[k << 3] += ac_val[k];
- } else { //top
+ }
+ else //top
+ {
for(k = 1; k < 8; k++)
block[k] += ac_val[k + 8];
}
}
/* save AC coeffs for further prediction */
- for(k = 1; k < 8; k++) {
+ for(k = 1; k < 8; k++)
+ {
ac_val2[k] = block[k << 3];
ac_val2[k + 8] = block[k];
}
/* scale AC coeffs */
for(k = 1; k < 64; k++)
- if(block[k]) {
+ if(block[k])
+ {
block[k] *= scale;
if(!v->pquantizer)
block[k] += (block[k] < 0) ? -v->pq : v->pq;
@@ -1537,7 +1761,8 @@ static int vc1_decode_i_block(VC1Context *v, DCTELEM block[64], int n, int coded }
not_coded:
- if(!coded) {
+ if(!coded)
+ {
int k, scale;
ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
ac_val2 = ac_val;
@@ -1545,26 +1770,35 @@ not_coded: i = 0;
scale = v->pq * 2 + v->halfpq;
memset(ac_val2, 0, 16 * 2);
- if(dc_pred_dir) {//left
+ if(dc_pred_dir) //left
+ {
ac_val -= 16;
if(s->ac_pred)
memcpy(ac_val2, ac_val, 8 * 2);
- } else {//top
+ }
+ else //top
+ {
ac_val -= 16 * s->block_wrap[n];
if(s->ac_pred)
memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
}
/* apply AC prediction if needed */
- if(s->ac_pred) {
- if(dc_pred_dir) { //left
- for(k = 1; k < 8; k++) {
+ if(s->ac_pred)
+ {
+ if(dc_pred_dir) //left
+ {
+ for(k = 1; k < 8; k++)
+ {
block[k << 3] = ac_val[k] * scale;
if(!v->pquantizer && block[k << 3])
block[k << 3] += (block[k << 3] < 0) ? -v->pq : v->pq;
}
- } else { //top
- for(k = 1; k < 8; k++) {
+ }
+ else //top
+ {
+ for(k = 1; k < 8; k++)
+ {
block[k] = ac_val[k + 8] * scale;
if(!v->pquantizer && block[k])
block[k] += (block[k] < 0) ? -v->pq : v->pq;
@@ -1602,32 +1836,36 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
/* Get DC differential */
- if (n < 4) {
+ if(n < 4)
+ {
dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
- } else {
+ }
+ else
+ {
dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
}
- if (dcdiff < 0){
+ if(dcdiff < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n");
return -1;
}
- if (dcdiff)
+ if(dcdiff)
{
- if (dcdiff == 119 /* ESC index value */)
+ if(dcdiff == 119 /* ESC index value */)
{
/* TODO: Optimize */
- if (mquant == 1) dcdiff = get_bits(gb, 10);
- else if (mquant == 2) dcdiff = get_bits(gb, 9);
+ if(mquant == 1) dcdiff = get_bits(gb, 10);
+ else if(mquant == 2) dcdiff = get_bits(gb, 9);
else dcdiff = get_bits(gb, 8);
}
else
{
- if (mquant == 1)
- dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3;
- else if (mquant == 2)
- dcdiff = (dcdiff<<1) + get_bits1(gb) - 1;
+ if(mquant == 1)
+ dcdiff = (dcdiff << 2) + get_bits(gb, 2) - 3;
+ else if(mquant == 2)
+ dcdiff = (dcdiff << 1) + get_bits1(gb) - 1;
}
- if (get_bits1(gb))
+ if(get_bits1(gb))
dcdiff = -dcdiff;
}
@@ -1636,9 +1874,12 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c *dc_val = dcdiff;
/* Store the quantized DC coeff, used for prediction */
- if (n < 4) {
+ if(n < 4)
+ {
block[0] = dcdiff * s->y_dc_scale;
- } else {
+ }
+ else
+ {
block[0] = dcdiff * s->c_dc_scale;
}
@@ -1660,24 +1901,28 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c q1 = s->current_picture.qscale_table[mb_pos];
if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1];
if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
- if(dc_pred_dir && n==1) q2 = q1;
- if(!dc_pred_dir && n==2) q2 = q1;
- if(n==3) q2 = q1;
+ if(dc_pred_dir && n == 1) q2 = q1;
+ if(!dc_pred_dir && n == 2) q2 = q1;
+ if(n == 3) q2 = q1;
- if(coded) {
+ if(coded)
+ {
int last = 0, skip, value;
const int8_t *zz_table;
int k;
- if(v->s.ac_pred) {
+ if(v->s.ac_pred)
+ {
if(!dc_pred_dir)
zz_table = wmv1_scantable[2];
else
zz_table = wmv1_scantable[3];
- } else
+ }
+ else
zz_table = wmv1_scantable[1];
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, codingset);
i += skip;
if(i > 63)
@@ -1686,62 +1931,83 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c }
/* apply AC prediction if needed */
- if(use_pred) {
+ if(use_pred)
+ {
/* scale predictors if needed*/
- if(q2 && q1!=q2) {
+ if(q2 && q1 != q2)
+ {
q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
- if(dc_pred_dir) { //left
+ if(dc_pred_dir) //left
+ {
for(k = 1; k < 8; k++)
block[k << 3] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
- } else { //top
+ }
+ else //top
+ {
for(k = 1; k < 8; k++)
block[k] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
}
- } else {
- if(dc_pred_dir) { //left
+ }
+ else
+ {
+ if(dc_pred_dir) //left
+ {
for(k = 1; k < 8; k++)
block[k << 3] += ac_val[k];
- } else { //top
+ }
+ else //top
+ {
for(k = 1; k < 8; k++)
block[k] += ac_val[k + 8];
}
}
}
/* save AC coeffs for further prediction */
- for(k = 1; k < 8; k++) {
+ for(k = 1; k < 8; k++)
+ {
ac_val2[k] = block[k << 3];
ac_val2[k + 8] = block[k];
}
/* scale AC coeffs */
for(k = 1; k < 64; k++)
- if(block[k]) {
+ if(block[k])
+ {
block[k] *= scale;
if(!v->pquantizer)
block[k] += (block[k] < 0) ? -mquant : mquant;
}
if(use_pred) i = 63;
- } else { // no AC coeffs
+ }
+ else // no AC coeffs
+ {
int k;
memset(ac_val2, 0, 16 * 2);
- if(dc_pred_dir) {//left
- if(use_pred) {
+ if(dc_pred_dir) //left
+ {
+ if(use_pred)
+ {
memcpy(ac_val2, ac_val, 8 * 2);
- if(q2 && q1!=q2) {
+ if(q2 && q1 != q2)
+ {
q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
for(k = 1; k < 8; k++)
ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
}
}
- } else {//top
- if(use_pred) {
+ }
+ else //top
+ {
+ if(use_pred)
+ {
memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
- if(q2 && q1!=q2) {
+ if(q2 && q1 != q2)
+ {
q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
for(k = 1; k < 8; k++)
@@ -1751,15 +2017,21 @@ static int vc1_decode_i_block_adv(VC1Context *v, DCTELEM block[64], int n, int c }
/* apply AC prediction if needed */
- if(use_pred) {
- if(dc_pred_dir) { //left
- for(k = 1; k < 8; k++) {
+ if(use_pred)
+ {
+ if(dc_pred_dir) //left
+ {
+ for(k = 1; k < 8; k++)
+ {
block[k << 3] = ac_val2[k] * scale;
if(!v->pquantizer && block[k << 3])
block[k << 3] += (block[k << 3] < 0) ? -mquant : mquant;
}
- } else { //top
- for(k = 1; k < 8; k++) {
+ }
+ else //top
+ {
+ for(k = 1; k < 8; k++)
+ {
block[k] = ac_val2[k + 8] * scale;
if(!v->pquantizer && block[k])
block[k] += (block[k] < 0) ? -mquant : mquant;
@@ -1799,39 +2071,43 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c s->dsp.clear_block(block);
/* XXX: Guard against dumb values of mquant */
- mquant = (mquant < 1) ? 0 : ( (mquant>31) ? 31 : mquant );
+ mquant = (mquant < 1) ? 0 : ((mquant > 31) ? 31 : mquant);
/* Set DC scale - y and c use the same */
s->y_dc_scale = s->y_dc_scale_table[mquant];
s->c_dc_scale = s->c_dc_scale_table[mquant];
/* Get DC differential */
- if (n < 4) {
+ if(n < 4)
+ {
dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_luma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
- } else {
+ }
+ else
+ {
dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3);
}
- if (dcdiff < 0){
+ if(dcdiff < 0)
+ {
av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n");
return -1;
}
- if (dcdiff)
+ if(dcdiff)
{
- if (dcdiff == 119 /* ESC index value */)
+ if(dcdiff == 119 /* ESC index value */)
{
/* TODO: Optimize */
- if (mquant == 1) dcdiff = get_bits(gb, 10);
- else if (mquant == 2) dcdiff = get_bits(gb, 9);
+ if(mquant == 1) dcdiff = get_bits(gb, 10);
+ else if(mquant == 2) dcdiff = get_bits(gb, 9);
else dcdiff = get_bits(gb, 8);
}
else
{
- if (mquant == 1)
- dcdiff = (dcdiff<<2) + get_bits(gb, 2) - 3;
- else if (mquant == 2)
- dcdiff = (dcdiff<<1) + get_bits1(gb) - 1;
+ if(mquant == 1)
+ dcdiff = (dcdiff << 2) + get_bits(gb, 2) - 3;
+ else if(mquant == 2)
+ dcdiff = (dcdiff << 1) + get_bits1(gb) - 1;
}
- if (get_bits1(gb))
+ if(get_bits1(gb))
dcdiff = -dcdiff;
}
@@ -1841,9 +2117,12 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c /* Store the quantized DC coeff, used for prediction */
- if (n < 4) {
+ if(n < 4)
+ {
block[0] = dcdiff * s->y_dc_scale;
- } else {
+ }
+ else
+ {
block[0] = dcdiff * s->c_dc_scale;
}
@@ -1867,18 +2146,20 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c q1 = s->current_picture.qscale_table[mb_pos];
if(dc_pred_dir && c_avail && mb_pos) q2 = s->current_picture.qscale_table[mb_pos - 1];
if(!dc_pred_dir && a_avail && mb_pos >= s->mb_stride) q2 = s->current_picture.qscale_table[mb_pos - s->mb_stride];
- if(dc_pred_dir && n==1) q2 = q1;
- if(!dc_pred_dir && n==2) q2 = q1;
- if(n==3) q2 = q1;
+ if(dc_pred_dir && n == 1) q2 = q1;
+ if(!dc_pred_dir && n == 2) q2 = q1;
+ if(n == 3) q2 = q1;
- if(coded) {
+ if(coded)
+ {
int last = 0, skip, value;
const int8_t *zz_table;
int k;
zz_table = wmv1_scantable[0];
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, codingset);
i += skip;
if(i > 63)
@@ -1887,62 +2168,83 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c }
/* apply AC prediction if needed */
- if(use_pred) {
+ if(use_pred)
+ {
/* scale predictors if needed*/
- if(q2 && q1!=q2) {
+ if(q2 && q1 != q2)
+ {
q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
- if(dc_pred_dir) { //left
+ if(dc_pred_dir) //left
+ {
for(k = 1; k < 8; k++)
block[k << 3] += (ac_val[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
- } else { //top
+ }
+ else //top
+ {
for(k = 1; k < 8; k++)
block[k] += (ac_val[k + 8] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
}
- } else {
- if(dc_pred_dir) { //left
+ }
+ else
+ {
+ if(dc_pred_dir) //left
+ {
for(k = 1; k < 8; k++)
block[k << 3] += ac_val[k];
- } else { //top
+ }
+ else //top
+ {
for(k = 1; k < 8; k++)
block[k] += ac_val[k + 8];
}
}
}
/* save AC coeffs for further prediction */
- for(k = 1; k < 8; k++) {
+ for(k = 1; k < 8; k++)
+ {
ac_val2[k] = block[k << 3];
ac_val2[k + 8] = block[k];
}
/* scale AC coeffs */
for(k = 1; k < 64; k++)
- if(block[k]) {
+ if(block[k])
+ {
block[k] *= scale;
if(!v->pquantizer)
block[k] += (block[k] < 0) ? -mquant : mquant;
}
if(use_pred) i = 63;
- } else { // no AC coeffs
+ }
+ else // no AC coeffs
+ {
int k;
memset(ac_val2, 0, 16 * 2);
- if(dc_pred_dir) {//left
- if(use_pred) {
+ if(dc_pred_dir) //left
+ {
+ if(use_pred)
+ {
memcpy(ac_val2, ac_val, 8 * 2);
- if(q2 && q1!=q2) {
+ if(q2 && q1 != q2)
+ {
q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
for(k = 1; k < 8; k++)
ac_val2[k] = (ac_val2[k] * q2 * ff_vc1_dqscale[q1 - 1] + 0x20000) >> 18;
}
}
- } else {//top
- if(use_pred) {
+ }
+ else //top
+ {
+ if(use_pred)
+ {
memcpy(ac_val2 + 8, ac_val + 8, 8 * 2);
- if(q2 && q1!=q2) {
+ if(q2 && q1 != q2)
+ {
q1 = q1 * 2 + ((q1 == v->pq) ? v->halfpq : 0) - 1;
q2 = q2 * 2 + ((q2 == v->pq) ? v->halfpq : 0) - 1;
for(k = 1; k < 8; k++)
@@ -1952,15 +2254,21 @@ static int vc1_decode_intra_block(VC1Context *v, DCTELEM block[64], int n, int c }
/* apply AC prediction if needed */
- if(use_pred) {
- if(dc_pred_dir) { //left
- for(k = 1; k < 8; k++) {
+ if(use_pred)
+ {
+ if(dc_pred_dir) //left
+ {
+ for(k = 1; k < 8; k++)
+ {
block[k << 3] = ac_val2[k] * scale;
if(!v->pquantizer && block[k << 3])
block[k << 3] += (block[k << 3] < 0) ? -mquant : mquant;
}
- } else { //top
- for(k = 1; k < 8; k++) {
+ }
+ else //top
+ {
+ for(k = 1; k < 8; k++)
+ {
block[k] = ac_val2[k + 8] * scale;
if(!v->pquantizer && block[k])
block[k] += (block[k] < 0) ? -mquant : mquant;
@@ -1989,13 +2297,16 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan s->dsp.clear_block(block);
- if(ttmb == -1) {
+ if(ttmb == -1)
+ {
ttblk = ff_vc1_ttblk_to_tt[v->tt_index][get_vlc2(gb, ff_vc1_ttblk_vlc[v->tt_index].table, VC1_TTBLK_VLC_BITS, 1)];
}
- if(ttblk == TT_4X4) {
+ if(ttblk == TT_4X4)
+ {
subblkpat = ~(get_vlc2(gb, ff_vc1_subblkpat_vlc[v->tt_index].table, VC1_SUBBLKPAT_VLC_BITS, 1) + 1);
}
- if((ttblk != TT_8X8 && ttblk != TT_4X4) && (v->ttmbf || (ttmb != -1 && (ttmb & 8) && !first_block))) {
+ if((ttblk != TT_8X8 && ttblk != TT_4X4) && (v->ttmbf || (ttmb != -1 && (ttmb & 8) && !first_block)))
+ {
subblkpat = decode012(gb);
if(subblkpat) subblkpat ^= 3; //swap decoded pattern bits
if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM) ttblk = TT_8X4;
@@ -2004,20 +2315,24 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan scale = 2 * mquant + ((v->pq == mquant) ? v->halfpq : 0);
// convert transforms like 8X4_TOP to generic TT and SUBBLKPAT
- if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM) {
+ if(ttblk == TT_8X4_TOP || ttblk == TT_8X4_BOTTOM)
+ {
subblkpat = 2 - (ttblk == TT_8X4_TOP);
ttblk = TT_8X4;
}
- if(ttblk == TT_4X8_RIGHT || ttblk == TT_4X8_LEFT) {
+ if(ttblk == TT_4X8_RIGHT || ttblk == TT_4X8_LEFT)
+ {
subblkpat = 2 - (ttblk == TT_4X8_LEFT);
ttblk = TT_4X8;
}
- switch(ttblk) {
+ switch(ttblk)
+ {
case TT_8X8:
pat = 0xF;
i = 0;
last = 0;
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
i += skip;
if(i > 63)
@@ -2027,10 +2342,12 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan if(!v->pquantizer)
block[idx] += (block[idx] < 0) ? -mquant : mquant;
}
- if(!skip_block){
- if(i==1)
+ if(!skip_block)
+ {
+ if(i == 1)
s->dsp.vc1_inv_trans_8x8_dc(dst, linesize, block);
- else{
+ else
+ {
s->dsp.vc1_inv_trans_8x8(block);
s->dsp.add_pixels_clamped(block, dst, linesize);
}
@@ -2042,11 +2359,13 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan break;
case TT_4X4:
pat = ~subblkpat & 0xF;
- for(j = 0; j < 4; j++) {
+ for(j = 0; j < 4; j++)
+ {
last = subblkpat & (1 << (3 - j));
i = 0;
off = (j & 1) * 4 + (j & 2) * 16;
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
i += skip;
if(i > 15)
@@ -2056,71 +2375,78 @@ static int vc1_decode_p_block(VC1Context *v, DCTELEM block[64], int n, int mquan if(!v->pquantizer)
block[idx + off] += (block[idx + off] < 0) ? -mquant : mquant;
}
- if(!(subblkpat & (1 << (3 - j))) && !skip_block){
- if(i==1)
- s->dsp.vc1_inv_trans_4x4_dc(dst + (j&1)*4 + (j&2)*2*linesize, linesize, block + off);
+ if(!(subblkpat & (1 << (3 - j))) && !skip_block)
+ {
+ if(i == 1)
+ s->dsp.vc1_inv_trans_4x4_dc(dst + (j & 1) * 4 + (j & 2) * 2 * linesize, linesize, block + off);
else
- s->dsp.vc1_inv_trans_4x4(dst + (j&1)*4 + (j&2)*2*linesize, linesize, block + off);
- if(apply_filter && (j&2 ? pat & (1<<(j-2)) : (cbp_top & (1 << (j + 2)))))
- s->dsp.vc1_v_loop_filter4(dst + (j&1)*4 + (j&2)*2*linesize, linesize, v->pq);
- if(apply_filter && (j&1 ? pat & (1<<(j-1)) : (cbp_left & (1 << (j + 1)))))
- s->dsp.vc1_h_loop_filter4(dst + (j&1)*4 + (j&2)*2*linesize, linesize, v->pq);
+ s->dsp.vc1_inv_trans_4x4(dst + (j & 1) * 4 + (j & 2) * 2 * linesize, linesize, block + off);
+ if(apply_filter && (j & 2 ? pat & (1 << (j - 2)) : (cbp_top & (1 << (j + 2)))))
+ s->dsp.vc1_v_loop_filter4(dst + (j & 1) * 4 + (j & 2) * 2 * linesize, linesize, v->pq);
+ if(apply_filter && (j & 1 ? pat & (1 << (j - 1)) : (cbp_left & (1 << (j + 1)))))
+ s->dsp.vc1_h_loop_filter4(dst + (j & 1) * 4 + (j & 2) * 2 * linesize, linesize, v->pq);
}
}
break;
case TT_8X4:
- pat = ~((subblkpat & 2)*6 + (subblkpat & 1)*3) & 0xF;
- for(j = 0; j < 2; j++) {
+ pat = ~((subblkpat & 2) * 6 + (subblkpat & 1) * 3) & 0xF;
+ for(j = 0; j < 2; j++)
+ {
last = subblkpat & (1 << (1 - j));
i = 0;
off = j * 32;
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
i += skip;
if(i > 31)
break;
- idx = v->zz_8x4[i++]+off;
+ idx = v->zz_8x4[i++] + off;
block[idx] = value * scale;
if(!v->pquantizer)
block[idx] += (block[idx] < 0) ? -mquant : mquant;
}
- if(!(subblkpat & (1 << (1 - j))) && !skip_block){
- if(i==1)
- s->dsp.vc1_inv_trans_8x4_dc(dst + j*4*linesize, linesize, block + off);
+ if(!(subblkpat & (1 << (1 - j))) && !skip_block)
+ {
+ if(i == 1)
+ s->dsp.vc1_inv_trans_8x4_dc(dst + j * 4 * linesize, linesize, block + off);
else
- s->dsp.vc1_inv_trans_8x4(dst + j*4*linesize, linesize, block + off);
+ s->dsp.vc1_inv_trans_8x4(dst + j * 4 * linesize, linesize, block + off);
if(apply_filter && j ? pat & 0x3 : (cbp_top & 0xC))
- s->dsp.vc1_v_loop_filter8(dst + j*4*linesize, linesize, v->pq);
+ s->dsp.vc1_v_loop_filter8(dst + j * 4 * linesize, linesize, v->pq);
if(apply_filter && cbp_left & (2 << j))
- s->dsp.vc1_h_loop_filter4(dst + j*4*linesize, linesize, v->pq);
+ s->dsp.vc1_h_loop_filter4(dst + j * 4 * linesize, linesize, v->pq);
}
}
break;
case TT_4X8:
- pat = ~(subblkpat*5) & 0xF;
- for(j = 0; j < 2; j++) {
+ pat = ~(subblkpat * 5) & 0xF;
+ for(j = 0; j < 2; j++)
+ {
last = subblkpat & (1 << (1 - j));
i = 0;
off = j * 4;
- while (!last) {
+ while(!last)
+ {
vc1_decode_ac_coeff(v, &last, &skip, &value, v->codingset2);
i += skip;
if(i > 31)
break;
- idx = v->zz_4x8[i++]+off;
+ idx = v->zz_4x8[i++] + off;
block[idx] = value * scale;
if(!v->pquantizer)
block[idx] += (block[idx] < 0) ? -mquant : mquant;
}
- if(!(subblkpat & (1 << (1 - j))) && !skip_block){
- if(i==1)
- s->dsp.vc1_inv_trans_4x8_dc(dst + j*4, linesize, block + off);
+ if(!(subblkpat & (1 << (1 - j))) && !skip_block)
+ {
+ if(i == 1)
+ s->dsp.vc1_inv_trans_4x8_dc(dst + j * 4, linesize, block + off);
else
- s->dsp.vc1_inv_trans_4x8(dst + j*4, linesize, block + off);
+ s->dsp.vc1_inv_trans_4x8(dst + j * 4, linesize, block + off);
if(apply_filter && cbp_top & (2 << j))
- s->dsp.vc1_v_loop_filter4(dst + j*4, linesize, v->pq);
+ s->dsp.vc1_v_loop_filter4(dst + j * 4, linesize, v->pq);
if(apply_filter && j ? pat & 0x5 : (cbp_left & 0xA))
- s->dsp.vc1_h_loop_filter8(dst + j*4, linesize, v->pq);
+ s->dsp.vc1_h_loop_filter8(dst + j * 4, linesize, v->pq);
}
}
break;
@@ -2157,23 +2483,24 @@ static int vc1_decode_p_mb(VC1Context *v) mquant = v->pq; /* Loosy initialization */
- if (v->mv_type_is_raw)
+ if(v->mv_type_is_raw)
fourmv = get_bits1(gb);
else
fourmv = v->mv_type_mb_plane[mb_pos];
- if (v->skip_is_raw)
+ if(v->skip_is_raw)
skipped = get_bits1(gb);
else
skipped = v->s.mbskip_table[mb_pos];
apply_loop_filter = s->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY);
- if (!fourmv) /* 1MV mode */
+ if(!fourmv) /* 1MV mode */
{
- if (!skipped)
+ if(!skipped)
{
GET_MVDATA(dmv_x, dmv_y);
- if (s->mb_intra) {
+ if(s->mb_intra)
+ {
s->current_picture.motion_val[1][s->block_index[0]][0] = 0;
s->current_picture.motion_val[1][s->block_index[0]][1] = 0;
}
@@ -2181,15 +2508,15 @@ static int vc1_decode_p_mb(VC1Context *v) vc1_pred_mv(s, 0, dmv_x, dmv_y, 1, v->range_x, v->range_y, v->mb_type[0]);
/* FIXME Set DC val for inter block ? */
- if (s->mb_intra && !mb_has_coeffs)
+ if(s->mb_intra && !mb_has_coeffs)
{
GET_MQUANT();
s->ac_pred = get_bits1(gb);
cbp = 0;
}
- else if (mb_has_coeffs)
+ else if(mb_has_coeffs)
{
- if (s->mb_intra) s->ac_pred = get_bits1(gb);
+ if(s->mb_intra) s->ac_pred = get_bits1(gb);
cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
GET_MQUANT();
}
@@ -2200,19 +2527,20 @@ static int vc1_decode_p_mb(VC1Context *v) }
s->current_picture.qscale_table[mb_pos] = mquant;
- if (!v->ttmbf && !s->mb_intra && mb_has_coeffs)
+ if(!v->ttmbf && !s->mb_intra && mb_has_coeffs)
ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table,
VC1_TTMB_VLC_BITS, 2);
if(!s->mb_intra) vc1_mc_1mv(v, 0);
dst_idx = 0;
- for (i=0; i<6; i++)
+ for(i = 0; i < 6; i++)
{
s->dc_val[0][s->block_index[i]] = 0;
dst_idx += i >> 2;
val = ((cbp >> (5 - i)) & 1);
off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
v->mb_type[0][s->block_index[i]] = s->mb_intra;
- if(s->mb_intra) {
+ if(s->mb_intra)
+ {
/* check if prediction blocks A and C are available */
v->a_avail = v->c_avail = 0;
if(i == 2 || i == 3 || !s->first_slice_line)
@@ -2220,25 +2548,30 @@ static int vc1_decode_p_mb(VC1Context *v) if(i == 1 || i == 3 || s->mb_x)
v->c_avail = v->mb_type[0][s->block_index[i] - 1];
- vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset);
- if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
+ vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i & 4) ? v->codingset2 : v->codingset);
+ if((i > 3) && (s->flags & CODEC_FLAG_GRAY)) continue;
s->dsp.vc1_inv_trans_8x8(s->block[i]);
if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
- if(v->pq >= 9 && v->overlap) {
+ if(v->pq >= 9 && v->overlap)
+ {
if(v->c_avail)
s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
if(v->a_avail)
s->dsp.vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
}
- if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
+ if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1))
+ {
int left_cbp, top_cbp;
- if(i & 4){
+ if(i & 4)
+ {
left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
- }else{
- left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
- top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
+ }
+ else
+ {
+ left_cbp = (i & 1) ? (cbp >> ((i - 1) * 4)) : (v->cbp[s->mb_x - 1] >> ((i + 1) * 4));
+ top_cbp = (i & 2) ? (cbp >> ((i - 2) * 4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i + 2) * 4));
}
if(left_cbp & 0xC)
s->dsp.vc1_v_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
@@ -2246,23 +2579,29 @@ static int vc1_decode_p_mb(VC1Context *v) s->dsp.vc1_h_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
}
block_cbp |= 0xF << (i << 2);
- } else if(val) {
+ }
+ else if(val)
+ {
int left_cbp = 0, top_cbp = 0, filter = 0;
- if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
+ if(apply_loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1))
+ {
filter = 1;
- if(i & 4){
+ if(i & 4)
+ {
left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
- }else{
- left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
- top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
+ }
+ else
+ {
+ left_cbp = (i & 1) ? (cbp >> ((i - 1) * 4)) : (v->cbp[s->mb_x - 1] >> ((i + 1) * 4));
+ top_cbp = (i & 2) ? (cbp >> ((i - 2) * 4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i + 2) * 4));
}
if(left_cbp & 0xC)
s->dsp.vc1_v_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
if(top_cbp & 0xA)
s->dsp.vc1_h_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
}
- pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp);
+ pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i & 4) ? s->uvlinesize : s->linesize, (i & 4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp);
block_cbp |= pat << (i << 2);
if(!v->ttmbf && ttmb < 8) ttmb = -1;
first_block = 0;
@@ -2272,7 +2611,8 @@ static int vc1_decode_p_mb(VC1Context *v) else //Skipped
{
s->mb_intra = 0;
- for(i = 0; i < 6; i++) {
+ for(i = 0; i < 6; i++)
+ {
v->mb_type[0][s->block_index[i]] = 0;
s->dc_val[0][s->block_index[i]] = 0;
}
@@ -2285,22 +2625,24 @@ static int vc1_decode_p_mb(VC1Context *v) } //1MV mode
else //4MV mode
{
- if (!skipped /* unskipped MB */)
+ if(!skipped /* unskipped MB */)
{
int intra_count = 0, coded_inter = 0;
int is_intra[6], is_coded[6];
/* Get CBPCY */
cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
- for (i=0; i<6; i++)
+ for(i = 0; i < 6; i++)
{
val = ((cbp >> (5 - i)) & 1);
s->dc_val[0][s->block_index[i]] = 0;
s->mb_intra = 0;
- if(i < 4) {
+ if(i < 4)
+ {
dmv_x = dmv_y = 0;
s->mb_intra = 0;
mb_has_coeffs = 0;
- if(val) {
+ if(val)
+ {
GET_MVDATA(dmv_x, dmv_y);
}
vc1_pred_mv(s, i, dmv_x, dmv_y, 0, v->range_x, v->range_y, v->mb_type[0]);
@@ -2309,7 +2651,8 @@ static int vc1_decode_p_mb(VC1Context *v) is_intra[i] = s->mb_intra;
is_coded[i] = mb_has_coeffs;
}
- if(i&4){
+ if(i & 4)
+ {
is_intra[i] = (intra_count >= 3);
is_coded[i] = val;
}
@@ -2325,10 +2668,12 @@ static int vc1_decode_p_mb(VC1Context *v) /* test if block is intra and has pred */
{
int intrapred = 0;
- for(i=0; i<6; i++)
- if(is_intra[i]) {
- if(((!s->first_slice_line || (i==2 || i==3)) && v->mb_type[0][s->block_index[i] - s->block_wrap[i]])
- || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) {
+ for(i = 0; i < 6; i++)
+ if(is_intra[i])
+ {
+ if(((!s->first_slice_line || (i == 2 || i == 3)) && v->mb_type[0][s->block_index[i] - s->block_wrap[i]])
+ || ((s->mb_x || (i == 1 || i == 3)) && v->mb_type[0][s->block_index[i] - 1]))
+ {
intrapred = 1;
break;
}
@@ -2336,14 +2681,15 @@ static int vc1_decode_p_mb(VC1Context *v) if(intrapred)s->ac_pred = get_bits1(gb);
else s->ac_pred = 0;
}
- if (!v->ttmbf && coded_inter)
+ if(!v->ttmbf && coded_inter)
ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index].table, VC1_TTMB_VLC_BITS, 2);
- for (i=0; i<6; i++)
+ for(i = 0; i < 6; i++)
{
dst_idx += i >> 2;
off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
s->mb_intra = is_intra[i];
- if (is_intra[i]) {
+ if(is_intra[i])
+ {
/* check if prediction blocks A and C are available */
v->a_avail = v->c_avail = 0;
if(i == 2 || i == 3 || !s->first_slice_line)
@@ -2351,25 +2697,30 @@ static int vc1_decode_p_mb(VC1Context *v) if(i == 1 || i == 3 || s->mb_x)
v->c_avail = v->mb_type[0][s->block_index[i] - 1];
- vc1_decode_intra_block(v, s->block[i], i, is_coded[i], mquant, (i&4)?v->codingset2:v->codingset);
- if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
+ vc1_decode_intra_block(v, s->block[i], i, is_coded[i], mquant, (i & 4) ? v->codingset2 : v->codingset);
+ if((i > 3) && (s->flags & CODEC_FLAG_GRAY)) continue;
s->dsp.vc1_inv_trans_8x8(s->block[i]);
if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
- s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize);
- if(v->pq >= 9 && v->overlap) {
+ s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, (i & 4) ? s->uvlinesize : s->linesize);
+ if(v->pq >= 9 && v->overlap)
+ {
if(v->c_avail)
s->dsp.vc1_h_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
if(v->a_avail)
s->dsp.vc1_v_overlap(s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
}
- if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
+ if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1))
+ {
int left_cbp, top_cbp;
- if(i & 4){
+ if(i & 4)
+ {
left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
- }else{
- left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
- top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
+ }
+ else
+ {
+ left_cbp = (i & 1) ? (cbp >> ((i - 1) * 4)) : (v->cbp[s->mb_x - 1] >> ((i + 1) * 4));
+ top_cbp = (i & 2) ? (cbp >> ((i - 2) * 4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i + 2) * 4));
}
if(left_cbp & 0xC)
s->dsp.vc1_v_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
@@ -2377,23 +2728,29 @@ static int vc1_decode_p_mb(VC1Context *v) s->dsp.vc1_h_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
}
block_cbp |= 0xF << (i << 2);
- } else if(is_coded[i]) {
+ }
+ else if(is_coded[i])
+ {
int left_cbp = 0, top_cbp = 0, filter = 0;
- if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1)){
+ if(v->s.loop_filter && s->mb_x && s->mb_x != (s->mb_width - 1) && s->mb_y && s->mb_y != (s->mb_height - 1))
+ {
filter = 1;
- if(i & 4){
+ if(i & 4)
+ {
left_cbp = v->cbp[s->mb_x - 1] >> (i * 4);
top_cbp = v->cbp[s->mb_x - s->mb_stride] >> (i * 4);
- }else{
- left_cbp = (i & 1) ? (cbp >> ((i-1)*4)) : (v->cbp[s->mb_x - 1] >> ((i+1)*4));
- top_cbp = (i & 2) ? (cbp >> ((i-2)*4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i+2)*4));
+ }
+ else
+ {
+ left_cbp = (i & 1) ? (cbp >> ((i - 1) * 4)) : (v->cbp[s->mb_x - 1] >> ((i + 1) * 4));
+ top_cbp = (i & 2) ? (cbp >> ((i - 2) * 4)) : (v->cbp[s->mb_x - s->mb_stride] >> ((i + 2) * 4));
}
if(left_cbp & 0xC)
s->dsp.vc1_v_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
if(top_cbp & 0xA)
s->dsp.vc1_h_loop_filter8(s->dest[dst_idx] + off, i & 4 ? s->uvlinesize : s->linesize, v->pq);
}
- pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp);
+ pat = vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i & 4) ? s->uvlinesize : s->linesize, (i & 4) && (s->flags & CODEC_FLAG_GRAY), filter, left_cbp, top_cbp);
block_cbp |= pat << (i << 2);
if(!v->ttmbf && ttmb < 8) ttmb = -1;
first_block = 0;
@@ -2405,11 +2762,12 @@ static int vc1_decode_p_mb(VC1Context *v) {
s->mb_intra = 0;
s->current_picture.qscale_table[mb_pos] = 0;
- for (i=0; i<6; i++) {
+ for(i = 0; i < 6; i++)
+ {
v->mb_type[0][s->block_index[i]] = 0;
s->dc_val[0][s->block_index[i]] = 0;
}
- for (i=0; i<4; i++)
+ for(i = 0; i < 4; i++)
{
vc1_pred_mv(s, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0]);
vc1_mc_4mv_luma(v, i);
@@ -2448,36 +2806,41 @@ static void vc1_decode_b_mb(VC1Context *v) mquant = v->pq; /* Loosy initialization */
s->mb_intra = 0;
- if (v->dmb_is_raw)
+ if(v->dmb_is_raw)
direct = get_bits1(gb);
else
direct = v->direct_mb_plane[mb_pos];
- if (v->skip_is_raw)
+ if(v->skip_is_raw)
skipped = get_bits1(gb);
else
skipped = v->s.mbskip_table[mb_pos];
dmv_x[0] = dmv_x[1] = dmv_y[0] = dmv_y[1] = 0;
- for(i = 0; i < 6; i++) {
+ for(i = 0; i < 6; i++)
+ {
v->mb_type[0][s->block_index[i]] = 0;
s->dc_val[0][s->block_index[i]] = 0;
}
s->current_picture.qscale_table[mb_pos] = 0;
- if (!direct) {
- if (!skipped) {
+ if(!direct)
+ {
+ if(!skipped)
+ {
GET_MVDATA(dmv_x[0], dmv_y[0]);
dmv_x[1] = dmv_x[0];
dmv_y[1] = dmv_y[0];
}
- if(skipped || !s->mb_intra) {
+ if(skipped || !s->mb_intra)
+ {
bmvtype = decode012(gb);
- switch(bmvtype) {
+ switch(bmvtype)
+ {
case 0:
- bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_BACKWARD : BMV_TYPE_FORWARD;
+ bmvtype = (v->bfraction >= (B_FRACTION_DEN / 2)) ? BMV_TYPE_BACKWARD : BMV_TYPE_FORWARD;
break;
case 1:
- bmvtype = (v->bfraction >= (B_FRACTION_DEN/2)) ? BMV_TYPE_FORWARD : BMV_TYPE_BACKWARD;
+ bmvtype = (v->bfraction >= (B_FRACTION_DEN / 2)) ? BMV_TYPE_FORWARD : BMV_TYPE_BACKWARD;
break;
case 2:
bmvtype = BMV_TYPE_INTERPOLATED;
@@ -2488,13 +2851,15 @@ static void vc1_decode_b_mb(VC1Context *v) for(i = 0; i < 6; i++)
v->mb_type[0][s->block_index[i]] = s->mb_intra;
- if (skipped) {
+ if(skipped)
+ {
if(direct) bmvtype = BMV_TYPE_INTERPOLATED;
vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
return;
}
- if (direct) {
+ if(direct)
+ {
cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
GET_MQUANT();
s->mb_intra = 0;
@@ -2504,23 +2869,31 @@ static void vc1_decode_b_mb(VC1Context *v) dmv_x[0] = dmv_y[0] = dmv_x[1] = dmv_y[1] = 0;
vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
- } else {
- if(!mb_has_coeffs && !s->mb_intra) {
+ }
+ else
+ {
+ if(!mb_has_coeffs && !s->mb_intra)
+ {
/* no coded blocks - effectively skipped */
vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
return;
}
- if(s->mb_intra && !mb_has_coeffs) {
+ if(s->mb_intra && !mb_has_coeffs)
+ {
GET_MQUANT();
s->current_picture.qscale_table[mb_pos] = mquant;
s->ac_pred = get_bits1(gb);
cbp = 0;
vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
- } else {
- if(bmvtype == BMV_TYPE_INTERPOLATED) {
+ }
+ else
+ {
+ if(bmvtype == BMV_TYPE_INTERPOLATED)
+ {
GET_MVDATA(dmv_x[0], dmv_y[0]);
- if(!mb_has_coeffs) {
+ if(!mb_has_coeffs)
+ {
/* interpolated skipped block */
vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
@@ -2528,7 +2901,8 @@ static void vc1_decode_b_mb(VC1Context *v) }
}
vc1_pred_b_mv(v, dmv_x, dmv_y, direct, bmvtype);
- if(!s->mb_intra) {
+ if(!s->mb_intra)
+ {
vc1_b_mc(v, dmv_x, dmv_y, direct, bmvtype);
}
if(s->mb_intra)
@@ -2541,14 +2915,15 @@ static void vc1_decode_b_mb(VC1Context *v) }
}
dst_idx = 0;
- for (i=0; i<6; i++)
+ for(i = 0; i < 6; i++)
{
s->dc_val[0][s->block_index[i]] = 0;
dst_idx += i >> 2;
val = ((cbp >> (5 - i)) & 1);
off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize);
v->mb_type[0][s->block_index[i]] = s->mb_intra;
- if(s->mb_intra) {
+ if(s->mb_intra)
+ {
/* check if prediction blocks A and C are available */
v->a_avail = v->c_avail = 0;
if(i == 2 || i == 3 || !s->first_slice_line)
@@ -2556,13 +2931,15 @@ static void vc1_decode_b_mb(VC1Context *v) if(i == 1 || i == 3 || s->mb_x)
v->c_avail = v->mb_type[0][s->block_index[i] - 1];
- vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i&4)?v->codingset2:v->codingset);
- if((i>3) && (s->flags & CODEC_FLAG_GRAY)) continue;
+ vc1_decode_intra_block(v, s->block[i], i, val, mquant, (i & 4) ? v->codingset2 : v->codingset);
+ if((i > 3) && (s->flags & CODEC_FLAG_GRAY)) continue;
s->dsp.vc1_inv_trans_8x8(s->block[i]);
if(v->rangeredfrm) for(j = 0; j < 64; j++) s->block[i][j] <<= 1;
s->dsp.put_signed_pixels_clamped(s->block[i], s->dest[dst_idx] + off, s->linesize >> ((i & 4) >> 2));
- } else if(val) {
- vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i&4)?s->uvlinesize:s->linesize, (i&4) && (s->flags & CODEC_FLAG_GRAY), 0, 0, 0);
+ }
+ else if(val)
+ {
+ vc1_decode_p_block(v, s->block[i], i, mquant, ttmb, first_block, s->dest[dst_idx] + off, (i & 4) ? s->uvlinesize : s->linesize, (i & 4) && (s->flags & CODEC_FLAG_GRAY), 0, 0, 0);
if(!v->ttmbf && ttmb < 8) ttmb = -1;
first_block = 0;
}
@@ -2580,7 +2957,8 @@ static void vc1_decode_i_blocks(VC1Context *v) int mb_pos;
/* select codingmode used for VLC tables selection */
- switch(v->y_ac_table_index){
+ switch(v->y_ac_table_index)
+ {
case 0:
v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
break;
@@ -2592,7 +2970,8 @@ static void vc1_decode_i_blocks(VC1Context *v) break;
}
- switch(v->c_ac_table_index){
+ switch(v->c_ac_table_index)
+ {
case 0:
v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
break;
@@ -2612,10 +2991,12 @@ static void vc1_decode_i_blocks(VC1Context *v) s->mb_x = s->mb_y = 0;
s->mb_intra = 1;
s->first_slice_line = 1;
- for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
+ for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++)
+ {
s->mb_x = 0;
ff_init_block_index(s);
- for(; s->mb_x < s->mb_width; s->mb_x++) {
+ for(; s->mb_x < s->mb_width; s->mb_x++)
+ {
ff_update_block_index(s);
s->dsp.clear_blocks(s->block[0]);
mb_pos = s->mb_x + s->mb_y * s->mb_width;
@@ -2628,40 +3009,48 @@ static void vc1_decode_i_blocks(VC1Context *v) cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
v->s.ac_pred = get_bits1(&v->s.gb);
- for(k = 0; k < 6; k++) {
+ for(k = 0; k < 6; k++)
+ {
val = ((cbp >> (5 - k)) & 1);
- if (k < 4) {
+ if(k < 4)
+ {
int pred = vc1_coded_block_pred(&v->s, k, &coded_val);
val = val ^ pred;
*coded_val = val;
}
cbp |= val << (5 - k);
- vc1_decode_i_block(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2);
+ vc1_decode_i_block(v, s->block[k], k, val, (k < 4) ? v->codingset : v->codingset2);
s->dsp.vc1_inv_trans_8x8(s->block[k]);
- if(v->pq >= 9 && v->overlap) {
+ if(v->pq >= 9 && v->overlap)
+ {
for(j = 0; j < 64; j++) s->block[k][j] += 128;
}
}
vc1_put_block(v, s->block);
- if(v->pq >= 9 && v->overlap) {
- if(s->mb_x) {
+ if(v->pq >= 9 && v->overlap)
+ {
+ if(s->mb_x)
+ {
s->dsp.vc1_h_overlap(s->dest[0], s->linesize);
s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
- if(!(s->flags & CODEC_FLAG_GRAY)) {
+ if(!(s->flags & CODEC_FLAG_GRAY))
+ {
s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize);
s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize);
}
}
s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize);
s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
- if(!s->first_slice_line) {
+ if(!s->first_slice_line)
+ {
s->dsp.vc1_v_overlap(s->dest[0], s->linesize);
s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize);
- if(!(s->flags & CODEC_FLAG_GRAY)) {
+ if(!(s->flags & CODEC_FLAG_GRAY))
+ {
s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize);
s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize);
}
@@ -2671,8 +3060,9 @@ static void vc1_decode_i_blocks(VC1Context *v) }
if(v->s.loop_filter) vc1_loop_filter_iblk(s, v->pq);
- if(get_bits_count(&s->gb) > v->bits) {
- ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
+ if(get_bits_count(&s->gb) > v->bits)
+ {
+ ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END | DC_END | MV_END));
av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits);
return;
}
@@ -2680,7 +3070,7 @@ static void vc1_decode_i_blocks(VC1Context *v) ff_draw_horiz_band(s, s->mb_y * 16, 16);
s->first_slice_line = 0;
}
- ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
+ ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END | DC_END | MV_END));
}
/** Decode blocks of I-frame for advanced profile
@@ -2698,7 +3088,8 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) GetBitContext *gb = &s->gb;
/* select codingmode used for VLC tables selection */
- switch(v->y_ac_table_index){
+ switch(v->y_ac_table_index)
+ {
case 0:
v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
break;
@@ -2710,7 +3101,8 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) break;
}
- switch(v->c_ac_table_index){
+ switch(v->c_ac_table_index)
+ {
case 0:
v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
break;
@@ -2726,10 +3118,12 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) s->mb_x = s->mb_y = 0;
s->mb_intra = 1;
s->first_slice_line = 1;
- for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
+ for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++)
+ {
s->mb_x = 0;
ff_init_block_index(s);
- for(;s->mb_x < s->mb_width; s->mb_x++) {
+ for(; s->mb_x < s->mb_width; s->mb_x++)
+ {
ff_update_block_index(s);
s->dsp.clear_blocks(s->block[0]);
mb_pos = s->mb_x + s->mb_y * s->mb_stride;
@@ -2744,12 +3138,14 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) else
v->s.ac_pred = v->acpred_plane[mb_pos];
- if(v->condover == CONDOVER_SELECT) {
+ if(v->condover == CONDOVER_SELECT)
+ {
if(v->overflg_is_raw)
overlap = get_bits1(&v->s.gb);
else
overlap = v->over_flags_plane[mb_pos];
- } else
+ }
+ else
overlap = (v->condover == CONDOVER_ALL);
GET_MQUANT();
@@ -2759,41 +3155,48 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) s->y_dc_scale = s->y_dc_scale_table[mquant];
s->c_dc_scale = s->c_dc_scale_table[mquant];
- for(k = 0; k < 6; k++) {
+ for(k = 0; k < 6; k++)
+ {
val = ((cbp >> (5 - k)) & 1);
- if (k < 4) {
+ if(k < 4)
+ {
int pred = vc1_coded_block_pred(&v->s, k, &coded_val);
val = val ^ pred;
*coded_val = val;
}
cbp |= val << (5 - k);
- v->a_avail = !s->first_slice_line || (k==2 || k==3);
- v->c_avail = !!s->mb_x || (k==1 || k==3);
+ v->a_avail = !s->first_slice_line || (k == 2 || k == 3);
+ v->c_avail = !!s->mb_x || (k == 1 || k == 3);
- vc1_decode_i_block_adv(v, s->block[k], k, val, (k<4)? v->codingset : v->codingset2, mquant);
+ vc1_decode_i_block_adv(v, s->block[k], k, val, (k < 4) ? v->codingset : v->codingset2, mquant);
s->dsp.vc1_inv_trans_8x8(s->block[k]);
for(j = 0; j < 64; j++) s->block[k][j] += 128;
}
vc1_put_block(v, s->block);
- if(overlap) {
- if(s->mb_x) {
+ if(overlap)
+ {
+ if(s->mb_x)
+ {
s->dsp.vc1_h_overlap(s->dest[0], s->linesize);
s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize, s->linesize);
- if(!(s->flags & CODEC_FLAG_GRAY)) {
+ if(!(s->flags & CODEC_FLAG_GRAY))
+ {
s->dsp.vc1_h_overlap(s->dest[1], s->uvlinesize);
s->dsp.vc1_h_overlap(s->dest[2], s->uvlinesize);
}
}
s->dsp.vc1_h_overlap(s->dest[0] + 8, s->linesize);
s->dsp.vc1_h_overlap(s->dest[0] + 8 * s->linesize + 8, s->linesize);
- if(!s->first_slice_line) {
+ if(!s->first_slice_line)
+ {
s->dsp.vc1_v_overlap(s->dest[0], s->linesize);
s->dsp.vc1_v_overlap(s->dest[0] + 8, s->linesize);
- if(!(s->flags & CODEC_FLAG_GRAY)) {
+ if(!(s->flags & CODEC_FLAG_GRAY))
+ {
s->dsp.vc1_v_overlap(s->dest[1], s->uvlinesize);
s->dsp.vc1_v_overlap(s->dest[2], s->uvlinesize);
}
@@ -2803,8 +3206,9 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) }
if(v->s.loop_filter) vc1_loop_filter_iblk(s, v->pq);
- if(get_bits_count(&s->gb) > v->bits) {
- ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
+ if(get_bits_count(&s->gb) > v->bits)
+ {
+ ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END | DC_END | MV_END));
av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i\n", get_bits_count(&s->gb), v->bits);
return;
}
@@ -2812,7 +3216,7 @@ static void vc1_decode_i_blocks_adv(VC1Context *v) ff_draw_horiz_band(s, s->mb_y * 16, 16);
s->first_slice_line = 0;
}
- ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
+ ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END | DC_END | MV_END));
}
static void vc1_decode_p_blocks(VC1Context *v)
@@ -2820,7 +3224,8 @@ static void vc1_decode_p_blocks(VC1Context *v) MpegEncContext *s = &v->s;
/* select codingmode used for VLC tables selection */
- switch(v->c_ac_table_index){
+ switch(v->c_ac_table_index)
+ {
case 0:
v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
break;
@@ -2832,7 +3237,8 @@ static void vc1_decode_p_blocks(VC1Context *v) break;
}
- switch(v->c_ac_table_index){
+ switch(v->c_ac_table_index)
+ {
case 0:
v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
break;
@@ -2845,17 +3251,20 @@ static void vc1_decode_p_blocks(VC1Context *v) }
s->first_slice_line = 1;
- memset(v->cbp_base, 0, sizeof(v->cbp_base[0])*2*s->mb_stride);
- for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
+ memset(v->cbp_base, 0, sizeof(v->cbp_base[0]) * 2 * s->mb_stride);
+ for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++)
+ {
s->mb_x = 0;
ff_init_block_index(s);
- for(; s->mb_x < s->mb_width; s->mb_x++) {
+ for(; s->mb_x < s->mb_width; s->mb_x++)
+ {
ff_update_block_index(s);
vc1_decode_p_mb(v);
- if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
- ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
- av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits,s->mb_x,s->mb_y);
+ if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0)
+ {
+ ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END | DC_END | MV_END));
+ av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits, s->mb_x, s->mb_y);
return;
}
}
@@ -2863,7 +3272,7 @@ static void vc1_decode_p_blocks(VC1Context *v) ff_draw_horiz_band(s, s->mb_y * 16, 16);
s->first_slice_line = 0;
}
- ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
+ ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END | DC_END | MV_END));
}
static void vc1_decode_b_blocks(VC1Context *v)
@@ -2871,7 +3280,8 @@ static void vc1_decode_b_blocks(VC1Context *v) MpegEncContext *s = &v->s;
/* select codingmode used for VLC tables selection */
- switch(v->c_ac_table_index){
+ switch(v->c_ac_table_index)
+ {
case 0:
v->codingset = (v->pqindex <= 8) ? CS_HIGH_RATE_INTRA : CS_LOW_MOT_INTRA;
break;
@@ -2883,7 +3293,8 @@ static void vc1_decode_b_blocks(VC1Context *v) break;
}
- switch(v->c_ac_table_index){
+ switch(v->c_ac_table_index)
+ {
case 0:
v->codingset2 = (v->pqindex <= 8) ? CS_HIGH_RATE_INTER : CS_LOW_MOT_INTER;
break;
@@ -2896,16 +3307,19 @@ static void vc1_decode_b_blocks(VC1Context *v) }
s->first_slice_line = 1;
- for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
+ for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++)
+ {
s->mb_x = 0;
ff_init_block_index(s);
- for(; s->mb_x < s->mb_width; s->mb_x++) {
+ for(; s->mb_x < s->mb_width; s->mb_x++)
+ {
ff_update_block_index(s);
vc1_decode_b_mb(v);
- if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0) {
- ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END|DC_END|MV_END));
- av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits,s->mb_x,s->mb_y);
+ if(get_bits_count(&s->gb) > v->bits || get_bits_count(&s->gb) < 0)
+ {
+ ff_er_add_slice(s, 0, 0, s->mb_x, s->mb_y, (AC_END | DC_END | MV_END));
+ av_log(s->avctx, AV_LOG_ERROR, "Bits overconsumption: %i > %i at %ix%i\n", get_bits_count(&s->gb), v->bits, s->mb_x, s->mb_y);
return;
}
if(v->s.loop_filter) vc1_loop_filter_iblk(s, v->pq);
@@ -2913,16 +3327,17 @@ static void vc1_decode_b_blocks(VC1Context *v) ff_draw_horiz_band(s, s->mb_y * 16, 16);
s->first_slice_line = 0;
}
- ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
+ ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END | DC_END | MV_END));
}
static void vc1_decode_skip_blocks(VC1Context *v)
{
MpegEncContext *s = &v->s;
- ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
+ ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END | DC_END | MV_END));
s->first_slice_line = 1;
- for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
+ for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++)
+ {
s->mb_x = 0;
ff_init_block_index(s);
ff_update_block_index(s);
@@ -2939,11 +3354,15 @@ static void vc1_decode_blocks(VC1Context *v) {
v->s.esc3_level_length = 0;
- if(v->x8_type){
- ff_intrax8_decode_picture(&v->x8, 2*v->pq+v->halfpq, v->pq*(!v->pquantizer) );
- }else{
+ if(v->x8_type)
+ {
+ ff_intrax8_decode_picture(&v->x8, 2 * v->pq + v->halfpq, v->pq*(!v->pquantizer));
+ }
+ else
+ {
- switch(v->s.pict_type) {
+ switch(v->s.pict_type)
+ {
case FF_I_TYPE:
if(v->profile == PROFILE_ADVANCED)
vc1_decode_i_blocks_adv(v);
@@ -2957,12 +3376,14 @@ static void vc1_decode_blocks(VC1Context *v) vc1_decode_p_blocks(v);
break;
case FF_B_TYPE:
- if(v->bi_type){
+ if(v->bi_type)
+ {
if(v->profile == PROFILE_ADVANCED)
vc1_decode_i_blocks_adv(v);
else
vc1_decode_i_blocks(v);
- }else
+ }
+ else
vc1_decode_b_blocks(v);
break;
}
@@ -2979,8 +3400,8 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) MpegEncContext *s = &v->s;
GetBitContext gb;
- if (!avctx->extradata_size || !avctx->extradata) return -1;
- if (!(avctx->flags & CODEC_FLAG_GRAY))
+ if(!avctx->extradata_size || !avctx->extradata) return -1;
+ if(!(avctx->flags & CODEC_FLAG_GRAY))
avctx->pix_fmt = PIX_FMT_YUV420P; /* ffdshow custom code */
else
avctx->pix_fmt = PIX_FMT_GRAY8;
@@ -2988,19 +3409,20 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) avctx->flags |= CODEC_FLAG_EMU_EDGE;
v->s.flags |= CODEC_FLAG_EMU_EDGE;
- if(avctx->idct_algo==FF_IDCT_AUTO){
- avctx->idct_algo=FF_IDCT_WMV2;
+ if(avctx->idct_algo == FF_IDCT_AUTO)
+ {
+ avctx->idct_algo = FF_IDCT_WMV2;
}
if(ff_h263_decode_init(avctx) < 0)
return -1;
- if (vc1_init_common(v) < 0) return -1;
+ if(vc1_init_common(v) < 0) return -1;
// only for ff_msmp4_mb_i_table
- if (ff_msmpeg4_decode_init(avctx) < 0) return -1;
+ if(ff_msmpeg4_decode_init(avctx) < 0) return -1;
avctx->coded_width = avctx->width;
avctx->coded_height = avctx->height;
- if (avctx->codec_id == CODEC_ID_WMV3)
+ if(avctx->codec_id == CODEC_ID_WMV3)
{
int count = 0;
@@ -3009,22 +3431,24 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) // the last byte of the extradata is a version number, 1 for the
// samples we can decode
- init_get_bits(&gb, avctx->extradata, avctx->extradata_size*8);
+ init_get_bits(&gb, avctx->extradata, avctx->extradata_size * 8);
- if (vc1_decode_sequence_header(avctx, v, &gb) < 0)
- return -1;
+ if(vc1_decode_sequence_header(avctx, v, &gb) < 0)
+ return -1;
- count = avctx->extradata_size*8 - get_bits_count(&gb);
- if (count>0)
+ count = avctx->extradata_size * 8 - get_bits_count(&gb);
+ if(count > 0)
{
av_log(avctx, AV_LOG_INFO, "Extra data: %i bits left, value: %X\n",
count, get_bits(&gb, count));
}
- else if (count < 0)
+ else if(count < 0)
{
av_log(avctx, AV_LOG_INFO, "Read %i bits in overflow\n", -count);
}
- } else { // VC1/WVC1
+ }
+ else // VC1/WVC1
+ {
const uint8_t *start = avctx->extradata;
uint8_t *end = avctx->extradata + avctx->extradata_size;
const uint8_t *next;
@@ -3032,7 +3456,8 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) uint8_t *buf2 = NULL;
int seq_initialized = 0, ep_initialized = 0;
- if(avctx->extradata_size < 16) {
+ if(avctx->extradata_size < 16)
+ {
av_log(avctx, AV_LOG_ERROR, "Extradata size too small: %i\n", avctx->extradata_size);
return -1;
}
@@ -3040,22 +3465,26 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) buf2 = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
start = find_next_marker(start, end); // in WVC1 extradata first byte is its size, but can be 0 in mkv
next = start;
- for(; next < end; start = next){
+ for(; next < end; start = next)
+ {
next = find_next_marker(start + 4, end);
size = next - start - 4;
if(size <= 0) continue;
buf2_size = vc1_unescape_buffer(start + 4, size, buf2);
init_get_bits(&gb, buf2, buf2_size * 8);
- switch(AV_RB32(start)){
+ switch(AV_RB32(start))
+ {
case VC1_CODE_SEQHDR:
- if(vc1_decode_sequence_header(avctx, v, &gb) < 0){
+ if(vc1_decode_sequence_header(avctx, v, &gb) < 0)
+ {
av_free(buf2);
return -1;
}
seq_initialized = 1;
break;
case VC1_CODE_ENTRYPOINT:
- if(vc1_decode_entry_point(avctx, v, &gb) < 0){
+ if(vc1_decode_entry_point(avctx, v, &gb) < 0)
+ {
av_free(buf2);
return -1;
}
@@ -3064,16 +3493,17 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) }
}
av_free(buf2);
- if(!seq_initialized || !ep_initialized){
+ if(!seq_initialized || !ep_initialized)
+ {
av_log(avctx, AV_LOG_ERROR, "Incomplete extradata\n");
return -1;
}
}
- avctx->has_b_frames= !!(avctx->max_b_frames);
+ avctx->has_b_frames = !!(avctx->max_b_frames);
s->low_delay = !avctx->has_b_frames;
- s->mb_width = (avctx->coded_width+15)>>4;
- s->mb_height = (avctx->coded_height+15)>>4;
+ s->mb_width = (avctx->coded_width + 15) >> 4;
+ s->mb_height = (avctx->coded_height + 15) >> 4;
/* Allocate mb bitplanes */
v->mv_type_mb_plane = av_malloc(s->mb_stride * s->mb_height);
@@ -3091,7 +3521,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) v->mb_type[2] = v->mb_type[1] + s->mb_stride * (s->mb_height + 1);
/* Init coded blocks info */
- if (v->profile == PROFILE_ADVANCED)
+ if(v->profile == PROFILE_ADVANCED)
{
// if (alloc_bitplane(&v->over_flags_plane, s->mb_width, s->mb_height) < 0)
// return -1;
@@ -3099,7 +3529,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) // return -1;
}
- ff_intrax8_common_init(&v->x8,s);
+ ff_intrax8_common_init(&v->x8, s);
return 0;
}
@@ -3117,11 +3547,13 @@ static int vc1_decode_frame(AVCodecContext *avctx, uint8_t *buf2 = NULL;
/* no supplementary picture */
- if (buf_size == 0) {
+ if(buf_size == 0)
+ {
/* special case for last picture */
- if (s->low_delay==0 && s->next_picture_ptr) {
- *pict= *(AVFrame*)s->next_picture_ptr;
- s->next_picture_ptr= NULL;
+ if(s->low_delay == 0 && s->next_picture_ptr)
+ {
+ *pict = *(AVFrame*)s->next_picture_ptr;
+ s->next_picture_ptr = NULL;
*data_size = sizeof(AVFrame);
}
@@ -3131,32 +3563,37 @@ static int vc1_decode_frame(AVCodecContext *avctx, /* We need to set current_picture_ptr before reading the header,
* otherwise we cannot store anything in there. */
- if(s->current_picture_ptr==NULL || s->current_picture_ptr->data[0]){
- int i= ff_find_unused_picture(s, 0);
- s->current_picture_ptr= &s->picture[i];
+ if(s->current_picture_ptr == NULL || s->current_picture_ptr->data[0])
+ {
+ int i = ff_find_unused_picture(s, 0);
+ s->current_picture_ptr = &s->picture[i];
}
//for advanced profile we may need to parse and unescape data
- if (avctx->codec_id == CODEC_ID_VC1) {
+ if(avctx->codec_id == CODEC_ID_VC1)
+ {
int buf_size2 = 0;
buf2 = av_mallocz(buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if(IS_MARKER(AV_RB32(buf))){ /* frame starts with marker and needs to be parsed */
+ if(IS_MARKER(AV_RB32(buf))) /* frame starts with marker and needs to be parsed */
+ {
const uint8_t *start, *end, *next;
int size;
next = buf;
- for(start = buf, end = buf + buf_size; next < end; start = next){
+ for(start = buf, end = buf + buf_size; next < end; start = next)
+ {
next = find_next_marker(start + 4, end);
size = next - start - 4;
if(size <= 0) continue;
- switch(AV_RB32(start)){
+ switch(AV_RB32(start))
+ {
case VC1_CODE_FRAME:
buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
break;
case VC1_CODE_ENTRYPOINT: /* it should be before frame data */
buf_size2 = vc1_unescape_buffer(start + 4, size, buf2);
- init_get_bits(&s->gb, buf2, buf_size2*8);
+ init_get_bits(&s->gb, buf2, buf_size2 * 8);
vc1_decode_entry_point(avctx, v, &s->gb);
break;
case VC1_CODE_SLICE:
@@ -3165,11 +3602,14 @@ static int vc1_decode_frame(AVCodecContext *avctx, return -1;
}
}
- }else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)){ /* WVC1 interlaced stores both fields divided by marker */
+ }
+ else if(v->interlace && ((buf[0] & 0xC0) == 0xC0)) /* WVC1 interlaced stores both fields divided by marker */
+ {
const uint8_t *divider;
divider = find_next_marker(buf, buf + buf_size);
- if((divider == (buf + buf_size)) || AV_RB32(divider) != VC1_CODE_FIELD){
+ if((divider == (buf + buf_size)) || AV_RB32(divider) != VC1_CODE_FIELD)
+ {
av_log(avctx, AV_LOG_ERROR, "Error in WVC1 interlaced frame\n");
av_free(buf2);
return -1;
@@ -3179,89 +3619,108 @@ static int vc1_decode_frame(AVCodecContext *avctx, // TODO
if(!v->warn_interlaced++)
av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced WVC1 support is not implemented\n");
- av_free(buf2);return -1;
- }else{
+ av_free(buf2);
+ return -1;
+ }
+ else
+ {
buf_size2 = vc1_unescape_buffer(buf, buf_size, buf2);
}
- init_get_bits(&s->gb, buf2, buf_size2*8);
- } else
- init_get_bits(&s->gb, buf, buf_size*8);
+ init_get_bits(&s->gb, buf2, buf_size2 * 8);
+ }
+ else
+ init_get_bits(&s->gb, buf, buf_size * 8);
// do parse frame header
- if(v->profile < PROFILE_ADVANCED) {
- if(vc1_parse_frame_header(v, &s->gb) == -1) {
+ if(v->profile < PROFILE_ADVANCED)
+ {
+ if(vc1_parse_frame_header(v, &s->gb) == -1)
+ {
av_free(buf2);
return -1;
}
- } else {
- if(vc1_parse_frame_header_adv(v, &s->gb) == -1) {
+ }
+ else
+ {
+ if(vc1_parse_frame_header_adv(v, &s->gb) == -1)
+ {
av_free(buf2);
return -1;
}
}
- if(s->pict_type != FF_I_TYPE && !v->res_rtm_flag){
+ if(s->pict_type != FF_I_TYPE && !v->res_rtm_flag)
+ {
av_free(buf2);
return -1;
}
// for hurry_up==5
- s->current_picture.pict_type= s->pict_type;
- s->current_picture.key_frame= s->pict_type == FF_I_TYPE;
+ s->current_picture.pict_type = s->pict_type;
+ s->current_picture.key_frame = s->pict_type == FF_I_TYPE;
/* skip B-frames if we don't have reference frames */
- if(s->last_picture_ptr==NULL && (s->pict_type==FF_B_TYPE || s->dropable)){
+ if(s->last_picture_ptr == NULL && (s->pict_type == FF_B_TYPE || s->dropable))
+ {
av_free(buf2);
return -1;//buf_size;
}
/* skip b frames if we are in a hurry */
- if(avctx->hurry_up && s->pict_type==FF_B_TYPE) return -1;//buf_size;
- if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE)
- || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=FF_I_TYPE)
- || avctx->skip_frame >= AVDISCARD_ALL) {
+ if(avctx->hurry_up && s->pict_type == FF_B_TYPE) return -1; //buf_size;
+ if((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == FF_B_TYPE)
+ || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != FF_I_TYPE)
+ || avctx->skip_frame >= AVDISCARD_ALL)
+ {
av_free(buf2);
return buf_size;
}
/* skip everything if we are in a hurry>=5 */
- if(avctx->hurry_up>=5) {
+ if(avctx->hurry_up >= 5)
+ {
av_free(buf2);
return -1;//buf_size;
}
- if(s->next_p_frame_damaged){
- if(s->pict_type==FF_B_TYPE)
+ if(s->next_p_frame_damaged)
+ {
+ if(s->pict_type == FF_B_TYPE)
return buf_size;
else
- s->next_p_frame_damaged=0;
+ s->next_p_frame_damaged = 0;
}
- if(MPV_frame_start(s, avctx) < 0) {
+ if(MPV_frame_start(s, avctx) < 0)
+ {
av_free(buf2);
return -1;
}
- s->me.qpel_put= s->dsp.put_qpel_pixels_tab;
- s->me.qpel_avg= s->dsp.avg_qpel_pixels_tab;
+ s->me.qpel_put = s->dsp.put_qpel_pixels_tab;
+ s->me.qpel_avg = s->dsp.avg_qpel_pixels_tab;
- ff_er_frame_start(s);
+ ff_er_frame_start(s);
- v->bits = buf_size * 8;
- vc1_decode_blocks(v);
+ v->bits = buf_size * 8;
+ vc1_decode_blocks(v);
//av_log(s->avctx, AV_LOG_INFO, "Consumed %i/%i bits\n", get_bits_count(&s->gb), buf_size*8);
// if(get_bits_count(&s->gb) > buf_size * 8)
// return -1;
- ff_er_frame_end(s);
+ ff_er_frame_end(s);
MPV_frame_end(s);
-assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
-assert(s->current_picture.pict_type == s->pict_type);
- if (s->pict_type == FF_B_TYPE || s->low_delay) {
- *pict= *(AVFrame*)s->current_picture_ptr;
- } else if (s->last_picture_ptr != NULL) {
- *pict= *(AVFrame*)s->last_picture_ptr;
+ assert(s->current_picture.pict_type == s->current_picture_ptr->pict_type);
+ assert(s->current_picture.pict_type == s->pict_type);
+ if(s->pict_type == FF_B_TYPE || s->low_delay)
+ {
+ *pict = *(AVFrame*)s->current_picture_ptr;
+ }
+ else if(s->last_picture_ptr != NULL)
+ {
+ *pict = *(AVFrame*)s->last_picture_ptr;
}
- if(s->last_picture_ptr || s->low_delay){
+ if(s->last_picture_ptr || s->low_delay)
+ {
*data_size = sizeof(AVFrame);
ff_print_debug_info(s, pict);
}
@@ -3292,7 +3751,8 @@ static av_cold int vc1_decode_end(AVCodecContext *avctx) }
-AVCodec vc1_decoder = {
+AVCodec vc1_decoder =
+{
"vc1",
CODEC_TYPE_VIDEO,
CODEC_ID_VC1,
@@ -3310,7 +3770,8 @@ AVCodec vc1_decoder = { };
#if CONFIG_WMV3_DECODER
-AVCodec wmv3_decoder = {
+AVCodec wmv3_decoder =
+{
"wmv3",
CODEC_TYPE_VIDEO,
CODEC_ID_WMV3,
|