RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

flv: K&R formatting cosmetics

This commit is contained in:
Luca Barbato 2014-04-26 14:09:55 +02:00
parent ba71c74017
commit c6b42e8549
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libavcodec/flvdec.c
View File

@ -22,11 +22,12 @@
#include "flv.h" #include "flv.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last){ void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last)
{
int is11 = get_bits1(gb); int is11 = get_bits1(gb);
*last = get_bits1(gb); *last = get_bits1(gb);
*run = get_bits(gb, 6); *run = get_bits(gb, 6);
if(is11){ if (is11) {
*level = get_sbits(gb, 11); *level = get_sbits(gb, 11);
} else { } else {
*level = get_sbits(gb, 7); *level = get_sbits(gb, 7);
@ -47,45 +48,45 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n"); av_log(s->avctx, AV_LOG_ERROR, "Bad picture format\n");
return -1; return -1;
} }
s->h263_flv = format+1; s->h263_flv = format + 1;
s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */ s->picture_number = get_bits(&s->gb, 8); /* picture timestamp */
format = get_bits(&s->gb, 3); format = get_bits(&s->gb, 3);
switch (format) { switch (format) {
case 0: case 0:
width = get_bits(&s->gb, 8); width = get_bits(&s->gb, 8);
height = get_bits(&s->gb, 8); height = get_bits(&s->gb, 8);
break; break;
case 1: case 1:
width = get_bits(&s->gb, 16); width = get_bits(&s->gb, 16);
height = get_bits(&s->gb, 16); height = get_bits(&s->gb, 16);
break; break;
case 2: case 2:
width = 352; width = 352;
height = 288; height = 288;
break; break;
case 3: case 3:
width = 176; width = 176;
height = 144; height = 144;
break; break;
case 4: case 4:
width = 128; width = 128;
height = 96; height = 96;
break; break;
case 5: case 5:
width = 320; width = 320;
height = 240; height = 240;
break; break;
case 6: case 6:
width = 160; width = 160;
height = 120; height = 120;
break; break;
default: default:
width = height = 0; width = height = 0;
break; break;
} }
if(av_image_check_size(width, height, 0, s->avctx)) if (av_image_check_size(width, height, 0, s->avctx))
return -1; return -1;
s->width = width; s->width = width;
s->height = height; s->height = height;
s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2); s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2);
@ -94,27 +95,25 @@ int ff_flv_decode_picture_header(MpegEncContext *s)
s->pict_type = AV_PICTURE_TYPE_P; s->pict_type = AV_PICTURE_TYPE_P;
skip_bits1(&s->gb); /* deblocking flag */ skip_bits1(&s->gb); /* deblocking flag */
s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); s->chroma_qscale = s->qscale = get_bits(&s->gb, 5);
s->h263_plus = 0; s->h263_plus = 0;
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
s->h263_long_vectors = 0; s->h263_long_vectors = 0;
/* PEI */ /* PEI */
while (get_bits1(&s->gb) != 0) { while (get_bits1(&s->gb) != 0)
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
}
s->f_code = 1; s->f_code = 1;
if(s->avctx->debug & FF_DEBUG_PICT_INFO){ if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n",
s->droppable ? 'D' : av_get_picture_type_char(s->pict_type), s->droppable ? 'D' : av_get_picture_type_char(s->pict_type),
s->h263_flv - 1, s->qscale, s->picture_number); s->h263_flv - 1, s->qscale, s->picture_number);
} }
s->y_dc_scale_table= s->y_dc_scale_table = s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
return 0; return 0;
} }