Skip to content

F
ffmpeg
Commit 374c17c8 authored by Ben Jackson's avatar Ben Jackson Committed by Michael Niedermayer
Browse files
Options

lavc/vp56: Re-indent functions affected by threading refactor 

All whitespace plus a curly brace.
Signed-off-by: 's avatarBen Jackson <ben@ben.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 39a3894a
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 88 deletions
libavcodec/vp56.c
View file @ 374c17c8
...@@ -522,28 +522,29 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -522,28 +522,29 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
return -1; return -1;
} }
res = s->parse_header(s, buf, remaining_buf_size); res = s->parse_header(s, buf, remaining_buf_size);
if (!res) if (!res)
return -1; return -1;
if (res == 2) { if (res == 2) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (s->frames[i].data[0]) if (s->frames[i].data[0])
avctx->release_buffer(avctx, &s->frames[i]); avctx->release_buffer(avctx, &s->frames[i]);
}
} }
}
p->reference = 3; p->reference = 3;
if (avctx->get_buffer(avctx, p) < 0) { if (avctx->get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }
if (res == 2) if (res == 2) {
if (vp56_size_changed(s)) { if (vp56_size_changed(s)) {
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
return -1; return -1;
} }
}
if (s->has_alpha) { if (s->has_alpha) {
buf += alpha_offset; buf += alpha_offset;
...@@ -588,87 +589,87 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data, ...@@ -588,87 +589,87 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data,
int mb_row, mb_col, mb_row_flip, mb_offset = 0; int mb_row, mb_col, mb_row_flip, mb_offset = 0;
int block, y, uv, stride_y, stride_uv; int block, y, uv, stride_y, stride_uv;
if (p->key_frame) { if (p->key_frame) {
p->pict_type = AV_PICTURE_TYPE_I; p->pict_type = AV_PICTURE_TYPE_I;
s->default_models_init(s); s->default_models_init(s);
for (block=0; block<s->mb_height*s->mb_width; block++) for (block=0; block<s->mb_height*s->mb_width; block++)
s->macroblocks[block].type = VP56_MB_INTRA; s->macroblocks[block].type = VP56_MB_INTRA;
} else { } else {
p->pict_type = AV_PICTURE_TYPE_P; p->pict_type = AV_PICTURE_TYPE_P;
vp56_parse_mb_type_models(s); vp56_parse_mb_type_models(s);
s->parse_vector_models(s); s->parse_vector_models(s);
s->mb_type = VP56_MB_INTER_NOVEC_PF; s->mb_type = VP56_MB_INTER_NOVEC_PF;
} }
if (s->parse_coeff_models(s)) if (s->parse_coeff_models(s))
goto next; goto next;
memset(s->prev_dc, 0, sizeof(s->prev_dc)); memset(s->prev_dc, 0, sizeof(s->prev_dc));
s->prev_dc[1][VP56_FRAME_CURRENT] = 128; s->prev_dc[1][VP56_FRAME_CURRENT] = 128;
s->prev_dc[2][VP56_FRAME_CURRENT] = 128; s->prev_dc[2][VP56_FRAME_CURRENT] = 128;
for (block=0; block < 4*s->mb_width+6; block++) { for (block=0; block < 4*s->mb_width+6; block++) {
s->above_blocks[block].ref_frame = VP56_FRAME_NONE; s->above_blocks[block].ref_frame = VP56_FRAME_NONE;
s->above_blocks[block].dc_coeff = 0; s->above_blocks[block].dc_coeff = 0;
s->above_blocks[block].not_null_dc = 0; s->above_blocks[block].not_null_dc = 0;
} }
s->above_blocks[2*s->mb_width + 2].ref_frame = VP56_FRAME_CURRENT; s->above_blocks[2*s->mb_width + 2].ref_frame = VP56_FRAME_CURRENT;
s->above_blocks[3*s->mb_width + 4].ref_frame = VP56_FRAME_CURRENT; s->above_blocks[3*s->mb_width + 4].ref_frame = VP56_FRAME_CURRENT;
stride_y = p->linesize[0]; stride_y = p->linesize[0];
stride_uv = p->linesize[1]; stride_uv = p->linesize[1];
if (s->flip < 0)
mb_offset = 7;
/* main macroblocks loop */
for (mb_row=0; mb_row<s->mb_height; mb_row++) {
if (s->flip < 0) if (s->flip < 0)
mb_offset = 7; mb_row_flip = s->mb_height - mb_row - 1;
else
/* main macroblocks loop */ mb_row_flip = mb_row;
for (mb_row=0; mb_row<s->mb_height; mb_row++) {
if (s->flip < 0) for (block=0; block<4; block++) {
mb_row_flip = s->mb_height - mb_row - 1; s->left_block[block].ref_frame = VP56_FRAME_NONE;
else s->left_block[block].dc_coeff = 0;
mb_row_flip = mb_row; s->left_block[block].not_null_dc = 0;
}
for (block=0; block<4; block++) { memset(s->coeff_ctx, 0, sizeof(s->coeff_ctx));
s->left_block[block].ref_frame = VP56_FRAME_NONE; memset(s->coeff_ctx_last, 24, sizeof(s->coeff_ctx_last));
s->left_block[block].dc_coeff = 0;
s->left_block[block].not_null_dc = 0; s->above_block_idx[0] = 1;
s->above_block_idx[1] = 2;
s->above_block_idx[2] = 1;
s->above_block_idx[3] = 2;
s->above_block_idx[4] = 2*s->mb_width + 2 + 1;
s->above_block_idx[5] = 3*s->mb_width + 4 + 1;
s->block_offset[s->frbi] = (mb_row_flip*16 + mb_offset) * stride_y;
s->block_offset[s->srbi] = s->block_offset[s->frbi] + 8*stride_y;
s->block_offset[1] = s->block_offset[0] + 8;
s->block_offset[3] = s->block_offset[2] + 8;
s->block_offset[4] = (mb_row_flip*8 + mb_offset) * stride_uv;
s->block_offset[5] = s->block_offset[4];
for (mb_col=0; mb_col<s->mb_width; mb_col++) {
vp56_decode_mb(s, mb_row, mb_col, is_alpha);
for (y=0; y<4; y++) {
s->above_block_idx[y] += 2;
s->block_offset[y] += 16;
} }
memset(s->coeff_ctx, 0, sizeof(s->coeff_ctx));
memset(s->coeff_ctx_last, 24, sizeof(s->coeff_ctx_last));
s->above_block_idx[0] = 1;
s->above_block_idx[1] = 2;
s->above_block_idx[2] = 1;
s->above_block_idx[3] = 2;
s->above_block_idx[4] = 2*s->mb_width + 2 + 1;
s->above_block_idx[5] = 3*s->mb_width + 4 + 1;
s->block_offset[s->frbi] = (mb_row_flip*16 + mb_offset) * stride_y;
s->block_offset[s->srbi] = s->block_offset[s->frbi] + 8*stride_y;
s->block_offset[1] = s->block_offset[0] + 8;
s->block_offset[3] = s->block_offset[2] + 8;
s->block_offset[4] = (mb_row_flip*8 + mb_offset) * stride_uv;
s->block_offset[5] = s->block_offset[4];
for (mb_col=0; mb_col<s->mb_width; mb_col++) {
vp56_decode_mb(s, mb_row, mb_col, is_alpha);
for (y=0; y<4; y++) {
s->above_block_idx[y] += 2;
s->block_offset[y] += 16;
}
for (uv=4; uv<6; uv++) { for (uv=4; uv<6; uv++) {
s->above_block_idx[uv] += 1; s->above_block_idx[uv] += 1;
s->block_offset[uv] += 8; s->block_offset[uv] += 8;
}
} }
} }
}
next: next:
if (p->key_frame || s->golden_frame) { if (p->key_frame || s->golden_frame) {
s->framep[VP56_FRAME_GOLDEN] = p; s->framep[VP56_FRAME_GOLDEN] = p;
} }
FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT], FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT],
s->framep[VP56_FRAME_PREVIOUS]); s->framep[VP56_FRAME_PREVIOUS]);
......
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