Skip to content

F
ffmpeg.wasm-core
Commit 76de302d authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

cosmetics: indentation, prettyprinting 

Originally committed as revision 15908 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7f8205da
Show whitespace changes
Inline Side-by-side
Showing with 768 additions and 768 deletions
libavcodec/svq3.c
View file @ 76de302d
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
/ /
o-->o-->o-->o o-->o-->o-->o
*/ */
static const uint8_t svq3_scan[16]={ static const uint8_t svq3_scan[16] = {
0+0*4, 1+0*4, 2+0*4, 2+1*4, 0+0*4, 1+0*4, 2+0*4, 2+1*4,
2+2*4, 3+0*4, 3+1*4, 3+2*4, 2+2*4, 3+0*4, 3+1*4, 3+2*4,
0+1*4, 0+2*4, 1+1*4, 1+2*4, 0+1*4, 0+2*4, 1+1*4, 1+2*4,
...@@ -116,44 +116,45 @@ static const uint32_t svq3_dequant_coeff[32] = { ...@@ -116,44 +116,45 @@ static const uint32_t svq3_dequant_coeff[32] = {
static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp)
{ {
const int qmul= svq3_dequant_coeff[qp]; const int qmul = svq3_dequant_coeff[qp];
#define stride 16 #define stride 16
int i; int i;
int temp[16]; int temp[16];
static const int x_offset[4]={0, 1*stride, 4* stride, 5*stride}; static const int x_offset[4] = {0, 1*stride, 4* stride, 5*stride};
static const int y_offset[4]={0, 2*stride, 8* stride, 10*stride}; static const int y_offset[4] = {0, 2*stride, 8* stride, 10*stride};
for(i=0; i<4; i++){ for (i = 0; i < 4; i++){
const int offset= y_offset[i]; const int offset = y_offset[i];
const int z0= 13*(block[offset+stride*0] + block[offset+stride*4]); const int z0 = 13*(block[offset+stride*0] + block[offset+stride*4]);
const int z1= 13*(block[offset+stride*0] - block[offset+stride*4]); const int z1 = 13*(block[offset+stride*0] - block[offset+stride*4]);
const int z2= 7* block[offset+stride*1] - 17*block[offset+stride*5]; const int z2 = 7* block[offset+stride*1] - 17*block[offset+stride*5];
const int z3= 17* block[offset+stride*1] + 7*block[offset+stride*5]; const int z3 = 17* block[offset+stride*1] + 7*block[offset+stride*5];
temp[4*i+0]= z0+z3; temp[4*i+0] = z0+z3;
temp[4*i+1]= z1+z2; temp[4*i+1] = z1+z2;
temp[4*i+2]= z1-z2; temp[4*i+2] = z1-z2;
temp[4*i+3]= z0-z3; temp[4*i+3] = z0-z3;
} }
for(i=0; i<4; i++){ for (i = 0; i < 4; i++){
const int offset= x_offset[i]; const int offset = x_offset[i];
const int z0= 13*(temp[4*0+i] + temp[4*2+i]); const int z0 = 13*(temp[4*0+i] + temp[4*2+i]);
const int z1= 13*(temp[4*0+i] - temp[4*2+i]); const int z1 = 13*(temp[4*0+i] - temp[4*2+i]);
const int z2= 7* temp[4*1+i] - 17*temp[4*3+i]; const int z2 = 7* temp[4*1+i] - 17*temp[4*3+i];
const int z3= 17* temp[4*1+i] + 7*temp[4*3+i]; const int z3 = 17* temp[4*1+i] + 7*temp[4*3+i];
block[stride*0 +offset]= ((z0 + z3)*qmul + 0x80000)>>20; block[stride*0 +offset] = ((z0 + z3)*qmul + 0x80000) >> 20;
block[stride*2 +offset]= ((z1 + z2)*qmul + 0x80000)>>20; block[stride*2 +offset] = ((z1 + z2)*qmul + 0x80000) >> 20;
block[stride*8 +offset]= ((z1 - z2)*qmul + 0x80000)>>20; block[stride*8 +offset] = ((z1 - z2)*qmul + 0x80000) >> 20;
block[stride*10+offset]= ((z0 - z3)*qmul + 0x80000)>>20; block[stride*10+offset] = ((z0 - z3)*qmul + 0x80000) >> 20;
} }
} }
#undef stride #undef stride
static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc) static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp,
int dc)
{ {
const int qmul= svq3_dequant_coeff[qp]; const int qmul = svq3_dequant_coeff[qp];
int i; int i;
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
...@@ -162,29 +163,29 @@ static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, in ...@@ -162,29 +163,29 @@ static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, in
block[0] = 0; block[0] = 0;
} }
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
const int z0= 13*(block[0 + 4*i] + block[2 + 4*i]); const int z0 = 13*(block[0 + 4*i] + block[2 + 4*i]);
const int z1= 13*(block[0 + 4*i] - block[2 + 4*i]); const int z1 = 13*(block[0 + 4*i] - block[2 + 4*i]);
const int z2= 7* block[1 + 4*i] - 17*block[3 + 4*i]; const int z2 = 7* block[1 + 4*i] - 17*block[3 + 4*i];
const int z3= 17* block[1 + 4*i] + 7*block[3 + 4*i]; const int z3 = 17* block[1 + 4*i] + 7*block[3 + 4*i];
block[0 + 4*i]= z0 + z3; block[0 + 4*i] = z0 + z3;
block[1 + 4*i]= z1 + z2; block[1 + 4*i] = z1 + z2;
block[2 + 4*i]= z1 - z2; block[2 + 4*i] = z1 - z2;
block[3 + 4*i]= z0 - z3; block[3 + 4*i] = z0 - z3;
} }
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
const int z0= 13*(block[i + 4*0] + block[i + 4*2]); const int z0 = 13*(block[i + 4*0] + block[i + 4*2]);
const int z1= 13*(block[i + 4*0] - block[i + 4*2]); const int z1 = 13*(block[i + 4*0] - block[i + 4*2]);
const int z2= 7* block[i + 4*1] - 17*block[i + 4*3]; const int z2 = 7* block[i + 4*1] - 17*block[i + 4*3];
const int z3= 17* block[i + 4*1] + 7*block[i + 4*3]; const int z3 = 17* block[i + 4*1] + 7*block[i + 4*3];
const int rr= (dc + 0x80000); const int rr = (dc + 0x80000);
dst[i + stride*0]= cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ]; dst[i + stride*0] = cm[ dst[i + stride*0] + (((z0 + z3)*qmul + rr) >> 20) ];
dst[i + stride*1]= cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ]; dst[i + stride*1] = cm[ dst[i + stride*1] + (((z1 + z2)*qmul + rr) >> 20) ];
dst[i + stride*2]= cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ]; dst[i + stride*2] = cm[ dst[i + stride*2] + (((z1 - z2)*qmul + rr) >> 20) ];
dst[i + stride*3]= cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ]; dst[i + stride*3] = cm[ dst[i + stride*3] + (((z0 - z3)*qmul + rr) >> 20) ];
} }
} }
...@@ -198,8 +199,8 @@ static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block, ...@@ -198,8 +199,8 @@ static inline int svq3_decode_block(GetBitContext *gb, DCTELEM *block,
const int intra = (3 * type) >> 2; const int intra = (3 * type) >> 2;
const uint8_t *const scan = scan_patterns[type]; const uint8_t *const scan = scan_patterns[type];
for (limit=(16 >> intra); index < 16; index=limit, limit+=8) { for (limit = (16 >> intra); index < 16; index = limit, limit += 8) {
for (; (vlc = svq3_get_ue_golomb (gb)) != 0; index++) { for (; (vlc = svq3_get_ue_golomb(gb)) != 0; index++) {
if (vlc == INVALID_VLC) if (vlc == INVALID_VLC)
return -1; return -1;
...@@ -253,7 +254,7 @@ static inline void svq3_mc_dir_part(MpegEncContext *s, ...@@ -253,7 +254,7 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture; const Picture *pic = (dir == 0) ? &s->last_picture : &s->next_picture;
uint8_t *src, *dest; uint8_t *src, *dest;
int i, emu = 0; int i, emu = 0;
int blocksize= 2 - (width>>3); //16->0, 8->1, 4->2 int blocksize = 2 - (width>>3); //16->0, 8->1, 4->2
mx += x; mx += x;
my += y; my += y;
...@@ -274,11 +275,11 @@ static inline void svq3_mc_dir_part(MpegEncContext *s, ...@@ -274,11 +275,11 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
src = pic->data[0] + mx + my*s->linesize; src = pic->data[0] + mx + my*s->linesize;
if (emu) { if (emu) {
ff_emulated_edge_mc (s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1), ff_emulated_edge_mc(s->edge_emu_buffer, src, s->linesize, (width + 1), (height + 1),
mx, my, s->h_edge_pos, s->v_edge_pos); mx, my, s->h_edge_pos, s->v_edge_pos);
src = s->edge_emu_buffer; src = s->edge_emu_buffer;
} }
if(thirdpel) if (thirdpel)
(avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height); (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->linesize, width, height);
else else
(avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height); (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->linesize, height);
...@@ -290,16 +291,16 @@ static inline void svq3_mc_dir_part(MpegEncContext *s, ...@@ -290,16 +291,16 @@ static inline void svq3_mc_dir_part(MpegEncContext *s,
height = (height >> 1); height = (height >> 1);
blocksize++; blocksize++;
for (i=1; i < 3; i++) { for (i = 1; i < 3; i++) {
dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize; dest = s->current_picture.data[i] + (x >> 1) + (y >> 1)*s->uvlinesize;
src = pic->data[i] + mx + my*s->uvlinesize; src = pic->data[i] + mx + my*s->uvlinesize;
if (emu) { if (emu) {
ff_emulated_edge_mc (s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1), ff_emulated_edge_mc(s->edge_emu_buffer, src, s->uvlinesize, (width + 1), (height + 1),
mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1)); mx, my, (s->h_edge_pos >> 1), (s->v_edge_pos >> 1));
src = s->edge_emu_buffer; src = s->edge_emu_buffer;
} }
if(thirdpel) if (thirdpel)
(avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height); (avg ? s->dsp.avg_tpel_pixels_tab : s->dsp.put_tpel_pixels_tab)[dxy](dest, src, s->uvlinesize, width, height);
else else
(avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height); (avg ? s->dsp.avg_pixels_tab : s->dsp.put_pixels_tab)[blocksize][dxy](dest, src, s->uvlinesize, height);
...@@ -318,39 +319,39 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir, ...@@ -318,39 +319,39 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width; const int h_edge_pos = 6*(s->h_edge_pos - part_width ) - extra_width;
const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width; const int v_edge_pos = 6*(s->v_edge_pos - part_height) - extra_width;
for (i=0; i < 16; i+=part_height) { for (i = 0; i < 16; i += part_height) {
for (j=0; j < 16; j+=part_width) { for (j = 0; j < 16; j += part_width) {
const int b_xy = (4*s->mb_x+(j>>2)) + (4*s->mb_y+(i>>2))*h->b_stride; const int b_xy = (4*s->mb_x + (j >> 2)) + (4*s->mb_y + (i >> 2))*h->b_stride;
int dxy; int dxy;
x = 16*s->mb_x + j; x = 16*s->mb_x + j;
y = 16*s->mb_y + i; y = 16*s->mb_y + i;
k = ((j>>2)&1) + ((i>>1)&2) + ((j>>1)&4) + (i&8); k = ((j >> 2) & 1) + ((i >> 1) & 2) + ((j >> 1) & 4) + (i & 8);
if (mode != PREDICT_MODE) { if (mode != PREDICT_MODE) {
pred_motion (h, k, (part_width >> 2), dir, 1, &mx, &my); pred_motion(h, k, (part_width >> 2), dir, 1, &mx, &my);
} else { } else {
mx = s->next_picture.motion_val[0][b_xy][0]<<1; mx = s->next_picture.motion_val[0][b_xy][0]<<1;
my = s->next_picture.motion_val[0][b_xy][1]<<1; my = s->next_picture.motion_val[0][b_xy][1]<<1;
if (dir == 0) { if (dir == 0) {
mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; mx = ((mx * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1;
my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1)>>1; my = ((my * h->frame_num_offset) / h->prev_frame_num_offset + 1) >> 1;
} else { } else {
mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; mx = ((mx * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1;
my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1)>>1; my = ((my * (h->frame_num_offset - h->prev_frame_num_offset)) / h->prev_frame_num_offset + 1) >> 1;
} }
} }
/* clip motion vector prediction to frame border */ /* clip motion vector prediction to frame border */
mx = av_clip (mx, extra_width - 6*x, h_edge_pos - 6*x); mx = av_clip(mx, extra_width - 6*x, h_edge_pos - 6*x);
my = av_clip (my, extra_width - 6*y, v_edge_pos - 6*y); my = av_clip(my, extra_width - 6*y, v_edge_pos - 6*y);
/* get (optional) motion vector differential */ /* get (optional) motion vector differential */
if (mode == PREDICT_MODE) { if (mode == PREDICT_MODE) {
dx = dy = 0; dx = dy = 0;
} else { } else {
dy = svq3_get_se_golomb (&s->gb); dy = svq3_get_se_golomb(&s->gb);
dx = svq3_get_se_golomb (&s->gb); dx = svq3_get_se_golomb(&s->gb);
if (dx == INVALID_VLC || dy == INVALID_VLC) { if (dx == INVALID_VLC || dy == INVALID_VLC) {
av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n"); av_log(h->s.avctx, AV_LOG_ERROR, "invalid MV vlc\n");
...@@ -363,26 +364,26 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir, ...@@ -363,26 +364,26 @@ static inline int svq3_mc_dir(H264Context *h, int size, int mode, int dir,
int fx, fy; int fx, fy;
mx = ((mx + 1)>>1) + dx; mx = ((mx + 1)>>1) + dx;
my = ((my + 1)>>1) + dy; my = ((my + 1)>>1) + dy;
fx= ((unsigned)(mx + 0x3000))/3 - 0x1000; fx = ((unsigned)(mx + 0x3000))/3 - 0x1000;
fy= ((unsigned)(my + 0x3000))/3 - 0x1000; fy = ((unsigned)(my + 0x3000))/3 - 0x1000;
dxy= (mx - 3*fx) + 4*(my - 3*fy); dxy = (mx - 3*fx) + 4*(my - 3*fy);
svq3_mc_dir_part (s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg); svq3_mc_dir_part(s, x, y, part_width, part_height, fx, fy, dxy, 1, dir, avg);
mx += mx; mx += mx;
my += my; my += my;
} else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) { } else if (mode == HALFPEL_MODE || mode == PREDICT_MODE) {
mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000; mx = ((unsigned)(mx + 1 + 0x3000))/3 + dx - 0x1000;
my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000; my = ((unsigned)(my + 1 + 0x3000))/3 + dy - 0x1000;
dxy= (mx&1) + 2*(my&1); dxy = (mx&1) + 2*(my&1);
svq3_mc_dir_part (s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg); svq3_mc_dir_part(s, x, y, part_width, part_height, mx>>1, my>>1, dxy, 0, dir, avg);
mx *= 3; mx *= 3;
my *= 3; my *= 3;
} else { } else {
mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000; mx = ((unsigned)(mx + 3 + 0x6000))/6 + dx - 0x1000;
my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000; my = ((unsigned)(my + 3 + 0x6000))/6 + dy - 0x1000;
svq3_mc_dir_part (s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg); svq3_mc_dir_part(s, x, y, part_width, part_height, mx, my, 0, 0, dir, avg);
mx *= 6; mx *= 6;
my *= 6; my *= 6;
} }
...@@ -430,18 +431,18 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -430,18 +431,18 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
if (mb_type == 0) { /* SKIP */ if (mb_type == 0) { /* SKIP */
if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) { if (s->pict_type == FF_P_TYPE || s->next_picture.mb_type[mb_xy] == -1) {
svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0); svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 0, 0);
if (s->pict_type == FF_B_TYPE) { if (s->pict_type == FF_B_TYPE) {
svq3_mc_dir_part (s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1); svq3_mc_dir_part(s, 16*s->mb_x, 16*s->mb_y, 16, 16, 0, 0, 0, 0, 1, 1);
} }
mb_type = MB_TYPE_SKIP; mb_type = MB_TYPE_SKIP;
} else { } else {
mb_type= FFMIN(s->next_picture.mb_type[mb_xy], 6); mb_type = FFMIN(s->next_picture.mb_type[mb_xy], 6);
if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 0, 0) < 0) if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 0, 0) < 0)
return -1; return -1;
if(svq3_mc_dir (h, mb_type, PREDICT_MODE, 1, 1) < 0) if (svq3_mc_dir(h, mb_type, PREDICT_MODE, 1, 1) < 0)
return -1; return -1;
mb_type = MB_TYPE_16x16; mb_type = MB_TYPE_16x16;
...@@ -464,25 +465,25 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -464,25 +465,25 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
N??11111 N??11111
*/ */
for (m=0; m < 2; m++) { for (m = 0; m < 2; m++) {
if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) { if (s->mb_x > 0 && h->intra4x4_pred_mode[mb_xy - 1][0] != -1) {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
*(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride]; *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - 1 + i*h->b_stride];
} }
} else { } else {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
*(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0; *(uint32_t *) h->mv_cache[m][scan8[0] - 1 + i*8] = 0;
} }
} }
if (s->mb_y > 0) { if (s->mb_y > 0) {
memcpy (h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t)); memcpy(h->mv_cache[m][scan8[0] - 1*8], s->current_picture.motion_val[m][b_xy - h->b_stride], 4*2*sizeof(int16_t));
memset (&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4); memset(&h->ref_cache[m][scan8[0] - 1*8], (h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1, 4);
if (s->mb_x < (s->mb_width - 1)) { if (s->mb_x < (s->mb_width - 1)) {
*(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4]; *(uint32_t *) h->mv_cache[m][scan8[0] + 4 - 1*8] = *(uint32_t *) s->current_picture.motion_val[m][b_xy - h->b_stride + 4];
h->ref_cache[m][scan8[0] + 4 - 1*8] = h->ref_cache[m][scan8[0] + 4 - 1*8] =
(h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 || (h->intra4x4_pred_mode[mb_xy - s->mb_stride + 1][0] == -1 ||
h->intra4x4_pred_mode[mb_xy - s->mb_stride][4] == -1) ? PART_NOT_AVAILABLE : 1; h->intra4x4_pred_mode[mb_xy - s->mb_stride ][4] == -1) ? PART_NOT_AVAILABLE : 1;
}else }else
h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE; h->ref_cache[m][scan8[0] + 4 - 1*8] = PART_NOT_AVAILABLE;
if (s->mb_x > 0) { if (s->mb_x > 0) {
...@@ -491,7 +492,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -491,7 +492,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
}else }else
h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE; h->ref_cache[m][scan8[0] - 1 - 1*8] = PART_NOT_AVAILABLE;
}else }else
memset (&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8); memset(&h->ref_cache[m][scan8[0] - 1*8 - 1], PART_NOT_AVAILABLE, 8);
if (s->pict_type != FF_B_TYPE) if (s->pict_type != FF_B_TYPE)
break; break;
...@@ -499,34 +500,34 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -499,34 +500,34 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
/* decode motion vector(s) and form prediction(s) */ /* decode motion vector(s) and form prediction(s) */
if (s->pict_type == FF_P_TYPE) { if (s->pict_type == FF_P_TYPE) {
if(svq3_mc_dir (h, (mb_type - 1), mode, 0, 0) < 0) if (svq3_mc_dir(h, (mb_type - 1), mode, 0, 0) < 0)
return -1; return -1;
} else { /* FF_B_TYPE */ } else { /* FF_B_TYPE */
if (mb_type != 2) { if (mb_type != 2) {
if(svq3_mc_dir (h, 0, mode, 0, 0) < 0) if (svq3_mc_dir(h, 0, mode, 0, 0) < 0)
return -1; return -1;
} else { } else {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
} }
} }
if (mb_type != 1) { if (mb_type != 1) {
if(svq3_mc_dir (h, 0, mode, 1, (mb_type == 3)) < 0) if (svq3_mc_dir(h, 0, mode, 1, (mb_type == 3)) < 0)
return -1; return -1;
} else { } else {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
} }
} }
} }
mb_type = MB_TYPE_16x16; mb_type = MB_TYPE_16x16;
} else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */ } else if (mb_type == 8 || mb_type == 33) { /* INTRA4x4 */
memset (h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t)); memset(h->intra4x4_pred_mode_cache, -1, 8*5*sizeof(int8_t));
if (mb_type == 8) { if (mb_type == 8) {
if (s->mb_x > 0) { if (s->mb_x > 0) {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i]; h->intra4x4_pred_mode_cache[scan8[0] - 1 + i*8] = h->intra4x4_pred_mode[mb_xy - 1][i];
} }
if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) { if (h->intra4x4_pred_mode_cache[scan8[0] - 1] == -1) {
...@@ -545,8 +546,8 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -545,8 +546,8 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
} }
/* decode prediction codes for luma blocks */ /* decode prediction codes for luma blocks */
for (i=0; i < 16; i+=2) { for (i = 0; i < 16; i+=2) {
vlc = svq3_get_ue_golomb (&s->gb); vlc = svq3_get_ue_golomb(&s->gb);
if (vlc >= 25){ if (vlc >= 25){
av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc); av_log(h->s.avctx, AV_LOG_ERROR, "luma prediction:%d\n", vlc);
...@@ -565,21 +566,21 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -565,21 +566,21 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
} }
} }
} else { /* mb_type == 33, DC_128_PRED block type */ } else { /* mb_type == 33, DC_128_PRED block type */
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4); memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_PRED, 4);
} }
} }
write_back_intra_pred_mode (h); write_back_intra_pred_mode(h);
if (mb_type == 8) { if (mb_type == 8) {
check_intra4x4_pred_mode (h); check_intra4x4_pred_mode(h);
h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF; h->top_samples_available = (s->mb_y == 0) ? 0x33FF : 0xFFFF;
h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF; h->left_samples_available = (s->mb_x == 0) ? 0x5F5F : 0xFFFF;
} else { } else {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
memset (&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4); memset(&h->intra4x4_pred_mode_cache[scan8[0] + 8*i], DC_128_PRED, 4);
} }
h->top_samples_available = 0x33FF; h->top_samples_available = 0x33FF;
...@@ -591,7 +592,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -591,7 +592,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
dir = i_mb_type_info[mb_type - 8].pred_mode; dir = i_mb_type_info[mb_type - 8].pred_mode;
dir = (dir >> 1) ^ 3*(dir & 1) ^ 1; dir = (dir >> 1) ^ 3*(dir & 1) ^ 1;
if ((h->intra16x16_pred_mode = check_intra_pred_mode (h, dir)) == -1){ if ((h->intra16x16_pred_mode = check_intra_pred_mode(h, dir)) == -1){
av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n"); av_log(h->s.avctx, AV_LOG_ERROR, "check_intra_pred_mode = -1\n");
return -1; return -1;
} }
...@@ -601,25 +602,25 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -601,25 +602,25 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
} }
if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) { if (!IS_INTER(mb_type) && s->pict_type != FF_I_TYPE) {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
memset (s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.motion_val[0][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
} }
if (s->pict_type == FF_B_TYPE) { if (s->pict_type == FF_B_TYPE) {
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
memset (s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t)); memset(s->current_picture.motion_val[1][b_xy + i*h->b_stride], 0, 4*2*sizeof(int16_t));
} }
} }
} }
if (!IS_INTRA4x4(mb_type)) { if (!IS_INTRA4x4(mb_type)) {
memset (h->intra4x4_pred_mode[mb_xy], DC_PRED, 8); memset(h->intra4x4_pred_mode[mb_xy], DC_PRED, 8);
} }
if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) { if (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE) {
memset (h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t)); memset(h->non_zero_count_cache + 8, 0, 4*9*sizeof(uint8_t));
s->dsp.clear_blocks(h->mb); s->dsp.clear_blocks(h->mb);
} }
if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) { if (!IS_INTRA16x16(mb_type) && (!IS_SKIP(mb_type) || s->pict_type == FF_B_TYPE)) {
if ((vlc = svq3_get_ue_golomb (&s->gb)) >= 48){ if ((vlc = svq3_get_ue_golomb(&s->gb)) >= 48){
av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc); av_log(h->s.avctx, AV_LOG_ERROR, "cbp_vlc=%d\n", vlc);
return -1; return -1;
} }
...@@ -627,7 +628,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -627,7 +628,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc]; cbp = IS_INTRA(mb_type) ? golomb_to_intra4x4_cbp[vlc] : golomb_to_inter_cbp[vlc];
} }
if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) { if (IS_INTRA16x16(mb_type) || (s->pict_type != FF_I_TYPE && s->adaptive_quant && cbp)) {
s->qscale += svq3_get_se_golomb (&s->gb); s->qscale += svq3_get_se_golomb(&s->gb);
if (s->qscale > 31){ if (s->qscale > 31){
av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale); av_log(h->s.avctx, AV_LOG_ERROR, "qscale:%d\n", s->qscale);
...@@ -635,7 +636,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -635,7 +636,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
} }
} }
if (IS_INTRA16x16(mb_type)) { if (IS_INTRA16x16(mb_type)) {
if (svq3_decode_block (&s->gb, h->mb, 0, 0)){ if (svq3_decode_block(&s->gb, h->mb, 0, 0)){
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n"); av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding intra luma dc\n");
return -1; return -1;
} }
...@@ -645,13 +646,13 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -645,13 +646,13 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
const int index = IS_INTRA16x16(mb_type) ? 1 : 0; const int index = IS_INTRA16x16(mb_type) ? 1 : 0;
const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1); const int type = ((s->qscale < 24 && IS_INTRA4x4(mb_type)) ? 2 : 1);
for (i=0; i < 4; i++) { for (i = 0; i < 4; i++) {
if ((cbp & (1 << i))) { if ((cbp & (1 << i))) {
for (j=0; j < 4; j++) { for (j = 0; j < 4; j++) {
k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j); k = index ? ((j&1) + 2*(i&1) + 2*(j&2) + 4*(i&2)) : (4*i + j);
h->non_zero_count_cache[ scan8[k] ] = 1; h->non_zero_count_cache[ scan8[k] ] = 1;
if (svq3_decode_block (&s->gb, &h->mb[16*k], index, type)){ if (svq3_decode_block(&s->gb, &h->mb[16*k], index, type)){
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n"); av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding block\n");
return -1; return -1;
} }
...@@ -660,18 +661,18 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -660,18 +661,18 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
} }
if ((cbp & 0x30)) { if ((cbp & 0x30)) {
for (i=0; i < 2; ++i) { for (i = 0; i < 2; ++i) {
if (svq3_decode_block (&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){ if (svq3_decode_block(&s->gb, &h->mb[16*(16 + 4*i)], 0, 3)){
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n"); av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma dc block\n");
return -1; return -1;
} }
} }
if ((cbp & 0x20)) { if ((cbp & 0x20)) {
for (i=0; i < 8; i++) { for (i = 0; i < 8; i++) {
h->non_zero_count_cache[ scan8[16+i] ] = 1; h->non_zero_count_cache[ scan8[16+i] ] = 1;
if (svq3_decode_block (&s->gb, &h->mb[16*(16 + i)], 1, 1)){ if (svq3_decode_block(&s->gb, &h->mb[16*(16 + i)], 1, 1)){
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n"); av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding chroma ac block\n");
return -1; return -1;
} }
...@@ -683,7 +684,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type) ...@@ -683,7 +684,7 @@ static int svq3_decode_mb(H264Context *h, unsigned int mb_type)
s->current_picture.mb_type[mb_xy] = mb_type; s->current_picture.mb_type[mb_xy] = mb_type;
if (IS_INTRA(mb_type)) { if (IS_INTRA(mb_type)) {
h->chroma_pred_mode = check_intra_pred_mode (h, DC_PRED8x8); h->chroma_pred_mode = check_intra_pred_mode(h, DC_PRED8x8);
} }
return 0; return 0;
...@@ -695,7 +696,7 @@ static int svq3_decode_slice_header(H264Context *h) ...@@ -695,7 +696,7 @@ static int svq3_decode_slice_header(H264Context *h)
const int mb_xy = h->mb_xy; const int mb_xy = h->mb_xy;
int i, header; int i, header;
header = get_bits (&s->gb, 8); header = get_bits(&s->gb, 8);
if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) { if (((header & 0x9F) != 1 && (header & 0x9F) != 2) || (header & 0x60) == 0) {
/* TODO: what? */ /* TODO: what? */
...@@ -704,9 +705,9 @@ static int svq3_decode_slice_header(H264Context *h) ...@@ -704,9 +705,9 @@ static int svq3_decode_slice_header(H264Context *h)
} else { } else {
int length = (header >> 5) & 3; int length = (header >> 5) & 3;
h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits (&s->gb, 8*length) + 8*length; h->next_slice_index = get_bits_count(&s->gb) + 8*show_bits(&s->gb, 8*length) + 8*length;
if (h->next_slice_index > s->gb.size_in_bits){ if (h->next_slice_index > s->gb.size_in_bits) {
av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n"); av_log(h->s.avctx, AV_LOG_ERROR, "slice after bitstream end\n");
return -1; return -1;
} }
...@@ -719,12 +720,12 @@ static int svq3_decode_slice_header(H264Context *h) ...@@ -719,12 +720,12 @@ static int svq3_decode_slice_header(H264Context *h)
AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1], header ^ h->svq3_watermark_key); AV_WL32(&s->gb.buffer[(get_bits_count(&s->gb)>>3)+1], header ^ h->svq3_watermark_key);
} }
if (length > 0) { if (length > 0) {
memcpy ((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3], memcpy((uint8_t *) &s->gb.buffer[get_bits_count(&s->gb) >> 3],
&s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1)); &s->gb.buffer[s->gb.size_in_bits >> 3], (length - 1));
} }
} }
if ((i = svq3_get_ue_golomb (&s->gb)) == INVALID_VLC || i >= 3){ if ((i = svq3_get_ue_golomb(&s->gb)) == INVALID_VLC || i >= 3){
av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i); av_log(h->s.avctx, AV_LOG_ERROR, "illegal slice type %d \n", i);
return -1; return -1;
} }
...@@ -733,37 +734,37 @@ static int svq3_decode_slice_header(H264Context *h) ...@@ -733,37 +734,37 @@ static int svq3_decode_slice_header(H264Context *h)
if ((header & 0x9F) == 2) { if ((header & 0x9F) == 2) {
i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1)); i = (s->mb_num < 64) ? 6 : (1 + av_log2 (s->mb_num - 1));
s->mb_skip_run = get_bits (&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width)); s->mb_skip_run = get_bits(&s->gb, i) - (s->mb_x + (s->mb_y * s->mb_width));
} else { } else {
skip_bits1 (&s->gb); skip_bits1(&s->gb);
s->mb_skip_run = 0; s->mb_skip_run = 0;
} }
h->slice_num = get_bits (&s->gb, 8); h->slice_num = get_bits(&s->gb, 8);
s->qscale = get_bits (&s->gb, 5); s->qscale = get_bits(&s->gb, 5);
s->adaptive_quant = get_bits1 (&s->gb); s->adaptive_quant = get_bits1(&s->gb);
/* unknown fields */ /* unknown fields */
skip_bits1 (&s->gb); skip_bits1(&s->gb);
if (h->unknown_svq3_flag) { if (h->unknown_svq3_flag) {
skip_bits1 (&s->gb); skip_bits1(&s->gb);
} }
skip_bits1 (&s->gb); skip_bits1(&s->gb);
skip_bits (&s->gb, 2); skip_bits(&s->gb, 2);
while (get_bits1 (&s->gb)) { while (get_bits1(&s->gb)) {
skip_bits (&s->gb, 8); skip_bits(&s->gb, 8);
} }
/* reset intra predictors and invalidate motion vector references */ /* reset intra predictors and invalidate motion vector references */
if (s->mb_x > 0) { if (s->mb_x > 0) {
memset (h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t)); memset(h->intra4x4_pred_mode[mb_xy - 1], -1, 4*sizeof(int8_t));
memset (h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x); memset(h->intra4x4_pred_mode[mb_xy - s->mb_x], -1, 8*sizeof(int8_t)*s->mb_x);
} }
if (s->mb_y > 0) { if (s->mb_y > 0) {
memset (h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x)); memset(h->intra4x4_pred_mode[mb_xy - s->mb_stride], -1, 8*sizeof(int8_t)*(s->mb_width - s->mb_x));
if (s->mb_x > 0) { if (s->mb_x > 0) {
h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1; h->intra4x4_pred_mode[mb_xy - s->mb_stride - 1][3] = -1;
...@@ -795,54 +796,54 @@ static int svq3_decode_frame(AVCodecContext *avctx, ...@@ -795,54 +796,54 @@ static int svq3_decode_frame(AVCodecContext *avctx,
h->unknown_svq3_flag = 0; h->unknown_svq3_flag = 0;
h->chroma_qp[0] = h->chroma_qp[1] = 4; h->chroma_qp[0] = h->chroma_qp[1] = 4;
if (MPV_common_init (s) < 0) if (MPV_common_init(s) < 0)
return -1; return -1;
h->b_stride = 4*s->mb_width; h->b_stride = 4*s->mb_width;
alloc_tables (h); alloc_tables(h);
/* prowl for the "SEQH" marker in the extradata */ /* prowl for the "SEQH" marker in the extradata */
extradata = (unsigned char *)avctx->extradata; extradata = (unsigned char *)avctx->extradata;
for (m = 0; m < avctx->extradata_size; m++) { for (m = 0; m < avctx->extradata_size; m++) {
if (!memcmp (extradata, "SEQH", 4)) if (!memcmp(extradata, "SEQH", 4))
break; break;
extradata++; extradata++;
} }
/* if a match was found, parse the extra data */ /* if a match was found, parse the extra data */
if (extradata && !memcmp (extradata, "SEQH", 4)) { if (extradata && !memcmp(extradata, "SEQH", 4)) {
GetBitContext gb; GetBitContext gb;
size = AV_RB32(&extradata[4]); size = AV_RB32(&extradata[4]);
init_get_bits (&gb, extradata + 8, size*8); init_get_bits(&gb, extradata + 8, size*8);
/* 'frame size code' and optional 'width, height' */ /* 'frame size code' and optional 'width, height' */
if (get_bits (&gb, 3) == 7) { if (get_bits(&gb, 3) == 7) {
skip_bits (&gb, 12); skip_bits(&gb, 12);
skip_bits (&gb, 12); skip_bits(&gb, 12);
} }
h->halfpel_flag = get_bits1 (&gb); h->halfpel_flag = get_bits1(&gb);
h->thirdpel_flag = get_bits1 (&gb); h->thirdpel_flag = get_bits1(&gb);
/* unknown fields */ /* unknown fields */
skip_bits1 (&gb); skip_bits1(&gb);
skip_bits1 (&gb); skip_bits1(&gb);
skip_bits1 (&gb); skip_bits1(&gb);
skip_bits1 (&gb); skip_bits1(&gb);
s->low_delay = get_bits1 (&gb); s->low_delay = get_bits1(&gb);
/* unknown field */ /* unknown field */
skip_bits1 (&gb); skip_bits1(&gb);
while (get_bits1 (&gb)) { while (get_bits1(&gb)) {
skip_bits (&gb, 8); skip_bits(&gb, 8);
} }
h->unknown_svq3_flag = get_bits1 (&gb); h->unknown_svq3_flag = get_bits1(&gb);
avctx->has_b_frames = !s->low_delay; avctx->has_b_frames = !s->low_delay;
if (h->unknown_svq3_flag) { if (h->unknown_svq3_flag) {
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
...@@ -883,7 +884,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, ...@@ -883,7 +884,7 @@ static int svq3_decode_frame(AVCodecContext *avctx,
if (buf_size == 0) { if (buf_size == 0) {
if (s->next_picture_ptr && !s->low_delay) { if (s->next_picture_ptr && !s->low_delay) {
*(AVFrame *) data = *(AVFrame *) &s->next_picture; *(AVFrame *) data = *(AVFrame *) &s->next_picture;
s->next_picture_ptr= NULL; s->next_picture_ptr = NULL;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
} }
return 0; return 0;
...@@ -893,20 +894,19 @@ static int svq3_decode_frame(AVCodecContext *avctx, ...@@ -893,20 +894,19 @@ static int svq3_decode_frame(AVCodecContext *avctx,
s->mb_x = s->mb_y = h->mb_xy = 0; s->mb_x = s->mb_y = h->mb_xy = 0;
if (svq3_decode_slice_header (h)) if (svq3_decode_slice_header(h))
return -1; return -1;
s->pict_type = h->slice_type; s->pict_type = h->slice_type;
s->picture_number = h->slice_num; s->picture_number = h->slice_num;
if(avctx->debug&FF_DEBUG_PICT_INFO){ if (avctx->debug&FF_DEBUG_PICT_INFO){
av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n", av_log(h->s.avctx, AV_LOG_DEBUG, "%c hpel:%d, tpel:%d aqp:%d qp:%d, slice_num:%02X\n",
av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag, av_get_pict_type_char(s->pict_type), h->halfpel_flag, h->thirdpel_flag,
s->adaptive_quant, s->qscale, h->slice_num s->adaptive_quant, s->qscale, h->slice_num);
);
} }
/* for hurry_up==5 */ /* for hurry_up == 5 */
s->current_picture.pict_type = s->pict_type; s->current_picture.pict_type = s->pict_type;
s->current_picture.key_frame = (s->pict_type == FF_I_TYPE); s->current_picture.key_frame = (s->pict_type == FF_I_TYPE);
...@@ -919,8 +919,8 @@ static int svq3_decode_frame(AVCodecContext *avctx, ...@@ -919,8 +919,8 @@ static int svq3_decode_frame(AVCodecContext *avctx,
/* Skip everything if we are in a hurry >= 5. */ /* Skip everything if we are in a hurry >= 5. */
if (avctx->hurry_up >= 5) if (avctx->hurry_up >= 5)
return 0; return 0;
if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==FF_B_TYPE) 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_NONKEY && s->pict_type != FF_I_TYPE)
|| avctx->skip_frame >= AVDISCARD_ALL) || avctx->skip_frame >= AVDISCARD_ALL)
return 0; return 0;
...@@ -931,7 +931,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, ...@@ -931,7 +931,7 @@ static int svq3_decode_frame(AVCodecContext *avctx,
s->next_p_frame_damaged = 0; s->next_p_frame_damaged = 0;
} }
if (frame_start (h) < 0) if (frame_start(h) < 0)
return -1; return -1;
if (s->pict_type == FF_B_TYPE) { if (s->pict_type == FF_B_TYPE) {
...@@ -954,41 +954,41 @@ static int svq3_decode_frame(AVCodecContext *avctx, ...@@ -954,41 +954,41 @@ static int svq3_decode_frame(AVCodecContext *avctx,
} }
} }
for(m=0; m<2; m++){ for (m = 0; m < 2; m++){
int i; int i;
for(i=0; i<4; i++){ for (i = 0; i < 4; i++){
int j; int j;
for(j=-1; j<4; j++) for (j = -1; j < 4; j++)
h->ref_cache[m][scan8[0] + 8*i + j]= 1; h->ref_cache[m][scan8[0] + 8*i + j]= 1;
if(i<3) if (i < 3)
h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE; h->ref_cache[m][scan8[0] + 8*i + j]= PART_NOT_AVAILABLE;
} }
} }
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++) {
for (s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) { for (s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
h->mb_xy = s->mb_x + s->mb_y*s->mb_stride; h->mb_xy = s->mb_x + s->mb_y*s->mb_stride;
if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits && if ( (get_bits_count(&s->gb) + 7) >= s->gb.size_in_bits &&
((get_bits_count(&s->gb) & 7) == 0 || show_bits (&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) { ((get_bits_count(&s->gb) & 7) == 0 || show_bits(&s->gb, (-get_bits_count(&s->gb) & 7)) == 0)) {
skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb)); skip_bits(&s->gb, h->next_slice_index - get_bits_count(&s->gb));
s->gb.size_in_bits = 8*buf_size; s->gb.size_in_bits = 8*buf_size;
if (svq3_decode_slice_header (h)) if (svq3_decode_slice_header(h))
return -1; return -1;
/* TODO: support s->mb_skip_run */ /* TODO: support s->mb_skip_run */
} }
mb_type = svq3_get_ue_golomb (&s->gb); mb_type = svq3_get_ue_golomb(&s->gb);
if (s->pict_type == FF_I_TYPE) { if (s->pict_type == FF_I_TYPE) {
mb_type += 8; mb_type += 8;
} else if (s->pict_type == FF_B_TYPE && mb_type >= 4) { } else if (s->pict_type == FF_B_TYPE && mb_type >= 4) {
mb_type += 4; mb_type += 4;
} }
if (mb_type > 33 || svq3_decode_mb (h, mb_type)) { if (mb_type > 33 || svq3_decode_mb(h, mb_type)) {
av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y); av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment