libavcodec.hg: vp3.c comparison

comparison vp3.c @ 2979:bfabfdf9ce55 libavcodec

COSMETICS: tabs --> spaces, some prettyprinting

author	diego
date	Thu, 22 Dec 2005 01:10:11 +0000
parents	ef2149182f1c
children	0b546eab515d

comparison

equal deleted inserted replaced

-:403183bbb505
+:bfabfdf9ce55
 int c_height;
 int y_superblock_count;
 int c_superblock_count;
 if (avctx->codec_tag == MKTAG('V','P','3','0'))
-	s->version = 0;
+s->version = 0;
 else
-	s->version = 1;
+s->version = 1;
 s->avctx = avctx;
 s->width = (avctx->width + 15) & 0xFFFFFFF0;
 s->height = (avctx->height + 15) & 0xFFFFFFF0;
 avctx->pix_fmt = PIX_FMT_YUV420P;
 s->coded_fragment_list = av_malloc(s->fragment_count * sizeof(int));
 s->pixel_addresses_inited = 0;
 if (!s->theora_tables)
 {
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
+s->coded_dc_scale_factor[i] = vp31_dc_scale_factor[i];
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
+s->coded_ac_scale_factor[i] = vp31_ac_scale_factor[i];
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    s->coded_intra_y_dequant[i] = vp31_intra_y_dequant[i];
+s->coded_intra_y_dequant[i] = vp31_intra_y_dequant[i];
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    s->coded_intra_c_dequant[i] = vp31_intra_c_dequant[i];
+s->coded_intra_c_dequant[i] = vp31_intra_c_dequant[i];
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    s->coded_inter_dequant[i] = vp31_inter_dequant[i];
+s->coded_inter_dequant[i] = vp31_inter_dequant[i];
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    s->filter_limit_values[i] = vp31_filter_limit_values[i];
+s->filter_limit_values[i] = vp31_filter_limit_values[i];
 /* init VLC tables */
 for (i = 0; i < 16; i++) {
 /* DC histograms */
 init_get_bits(&gb, buf, buf_size * 8);
 if (s->theora && get_bits1(&gb))
 {
 #if 1
-	av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
+av_log(avctx, AV_LOG_ERROR, "Header packet passed to frame decoder, skipping\n");
-	return -1;
+return -1;
 #else
-	int ptype = get_bits(&gb, 7);
+int ptype = get_bits(&gb, 7);
-	skip_bits(&gb, 6*8); /* "theora" */
+skip_bits(&gb, 6*8); /* "theora" */
-	switch(ptype)
+switch(ptype)
-	{
+{
-	    case 1:
+case 1:
-		theora_decode_comments(avctx, gb);
+theora_decode_comments(avctx, gb);
-		break;
+break;
-	    case 2:
+case 2:
-		theora_decode_tables(avctx, gb);
+theora_decode_tables(avctx, gb);
-		init_dequantizer(s);
+init_dequantizer(s);
-		break;
+break;
-	    default:
+default:
-		av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype);
+av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype);
-	}
+}
-	return buf_size;
+return buf_size;
 #endif
 }
 s->keyframe = !get_bits1(&gb);
 if (!s->theora)
-	skip_bits(&gb, 1);
+skip_bits(&gb, 1);
 s->last_quality_index = s->quality_index;
 s->quality_index = get_bits(&gb, 6);
 if (s->theora >= 0x030200)
 skip_bits1(&gb);
 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
-	av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
+av_log(s->avctx, AV_LOG_INFO, " VP3 %sframe #%d: Q index = %d\n",
-	    s->keyframe?"key":"", counter, s->quality_index);
+s->keyframe?"key":"", counter, s->quality_index);
 counter++;
 if (s->quality_index != s->last_quality_index) {
 init_dequantizer(s);
 init_loop_filter(s);
 }
 if (s->keyframe) {
-	if (!s->theora)
+if (!s->theora)
-	{
+{
-	    skip_bits(&gb, 4); /* width code */
+skip_bits(&gb, 4); /* width code */
-	    skip_bits(&gb, 4); /* height code */
+skip_bits(&gb, 4); /* height code */
-	    if (s->version)
+if (s->version)
-	    {
+{
-		s->version = get_bits(&gb, 5);
+s->version = get_bits(&gb, 5);
-		if (counter == 1)
+if (counter == 1)
-		    av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
+av_log(s->avctx, AV_LOG_DEBUG, "VP version: %d\n", s->version);
-	    }
+}
-	}
+}
-	if (s->version || s->theora)
+if (s->version || s->theora)
-	{
+{
-	    if (get_bits1(&gb))
+if (get_bits1(&gb))
-	        av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
+av_log(s->avctx, AV_LOG_ERROR, "Warning, unsupported keyframe coding type?!\n");
-	    skip_bits(&gb, 2); /* reserved? */
+skip_bits(&gb, 2); /* reserved? */
-	}
+}
 if (s->last_frame.data[0] == s->golden_frame.data[0]) {
 if (s->golden_frame.data[0])
 avctx->release_buffer(avctx, &s->golden_frame);
 s->last_frame= s->golden_frame; /* ensure that we catch any access to this released frame */
 /* golden frame is also the current frame */
 memcpy(&s->current_frame, &s->golden_frame, sizeof(AVFrame));
 /* time to figure out pixel addresses? */
 if (!s->pixel_addresses_inited)
-	{
+{
-	    if (!s->flipped_image)
+if (!s->flipped_image)
-	vp3_calculate_pixel_addresses(s);
+vp3_calculate_pixel_addresses(s);
-	    else
+else
-		theora_calculate_pixel_addresses(s);
+theora_calculate_pixel_addresses(s);
-	}
+}
 } else {
 /* allocate a new current frame */
 s->current_frame.reference = 3;
 if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
 major = get_bits(&gb, 8); /* version major */
 minor = get_bits(&gb, 8); /* version minor */
 micro = get_bits(&gb, 8); /* version micro */
 av_log(avctx, AV_LOG_INFO, "Theora bitstream version %d.%d.%d\n",
-	major, minor, micro);
+major, minor, micro);
 /* FIXME: endianess? */
 s->theora = (major << 16) | (minor << 8) | micro;
 /* 3.2.0 aka alpha3 has the same frame orientation as original vp3 */
 /* but previous versions have the image flipped relative to vp3 */
 if (s->theora < 0x030200)
 {
-	s->flipped_image = 1;
+s->flipped_image = 1;
 av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
 }
 s->width = get_bits(&gb, 16) << 4;
 s->height = get_bits(&gb, 16) << 4;
 return -1;
 }
 if (s->theora >= 0x030400)
 {
-	skip_bits(&gb, 32); /* total number of superblocks in a frame */
+skip_bits(&gb, 32); /* total number of superblocks in a frame */
-	// fixme, the next field is 36bits long
+// fixme, the next field is 36bits long
-	skip_bits(&gb, 32); /* total number of blocks in a frame */
+skip_bits(&gb, 32); /* total number of blocks in a frame */
-	skip_bits(&gb, 4); /* total number of blocks in a frame */
+skip_bits(&gb, 4); /* total number of blocks in a frame */
-	skip_bits(&gb, 32); /* total number of macroblocks in a frame */
+skip_bits(&gb, 32); /* total number of macroblocks in a frame */
-	skip_bits(&gb, 24); /* frame width */
+skip_bits(&gb, 24); /* frame width */
-	skip_bits(&gb, 24); /* frame height */
+skip_bits(&gb, 24); /* frame height */
 }
 else
 {
-	skip_bits(&gb, 24); /* frame width */
+skip_bits(&gb, 24); /* frame width */
-	skip_bits(&gb, 24); /* frame height */
+skip_bits(&gb, 24); /* frame height */
 }
 skip_bits(&gb, 8); /* offset x */
 skip_bits(&gb, 8); /* offset y */
 skip_bits(&gb, 32); /* fps denumerator */
 skip_bits(&gb, 24); /* aspect numerator */
 skip_bits(&gb, 24); /* aspect denumerator */
 if (s->theora < 0x030200)
-	skip_bits(&gb, 5); /* keyframe frequency force */
+skip_bits(&gb, 5); /* keyframe frequency force */
 skip_bits(&gb, 8); /* colorspace */
 if (s->theora >= 0x030400)
-	skip_bits(&gb, 2); /* pixel format: 420,res,422,444 */
+skip_bits(&gb, 2); /* pixel format: 420,res,422,444 */
 skip_bits(&gb, 24); /* bitrate */
 skip_bits(&gb, 6); /* quality hint */
 if (s->theora >= 0x030200)
 {
-	skip_bits(&gb, 5); /* keyframe frequency force */
+skip_bits(&gb, 5); /* keyframe frequency force */
-	if (s->theora < 0x030400)
+if (s->theora < 0x030400)
-	    skip_bits(&gb, 5); /* spare bits */
+skip_bits(&gb, 5); /* spare bits */
 }
 //    align_get_bits(&gb);
 avctx->width = s->width;
 Vp3DecodeContext *s = avctx->priv_data;
 int len;
 if (s->theora <= 0x030200)
 {
-	int i, comments;
+int i, comments;
-	// vendor string
+// vendor string
-	len = get_bits_long(&gb, 32);
+len = get_bits_long(&gb, 32);
-	len = le2me_32(len);
+len = le2me_32(len);
-	while(len--)
+while(len--)
-	    skip_bits(&gb, 8);
+skip_bits(&gb, 8);
-	// user comments
+// user comments
-	comments = get_bits_long(&gb, 32);
+comments = get_bits_long(&gb, 32);
-	comments = le2me_32(comments);
+comments = le2me_32(comments);
-	for (i = 0; i < comments; i++)
+for (i = 0; i < comments; i++)
-	{
+{
-	    len = get_bits_long(&gb, 32);
+len = get_bits_long(&gb, 32);
-	    len = be2me_32(len);
+len = be2me_32(len);
-	    while(len--)
+while(len--)
-		skip_bits(&gb, 8);
+skip_bits(&gb, 8);
-	}
+}
 }
 else
 {
-	do {
+do {
-	    len = get_bits_long(&gb, 32);
+len = get_bits_long(&gb, 32);
-	    len = le2me_32(len);
+len = le2me_32(len);
-	    if (len <= 0)
+if (len <= 0)
-		break;
+break;
-	    while (len--)
+while (len--)
-		skip_bits(&gb, 8);
+skip_bits(&gb, 8);
-	} while (1);
+} while (1);
 }
 return 0;
 }
 static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb)
 n = get_bits(&gb, 4) + 1;
 else
 n = 16;
 /* quality threshold table */
 for (i = 0; i < 64; i++)
-	s->coded_ac_scale_factor[i] = get_bits(&gb, n);
+s->coded_ac_scale_factor[i] = get_bits(&gb, n);
 if (s->theora >= 0x030200)
 n = get_bits(&gb, 4) + 1;
 else
 n = 16;
 /* dc scale factor table */
 for (i = 0; i < 64; i++)
-	s->coded_dc_scale_factor[i] = get_bits(&gb, n);
+s->coded_dc_scale_factor[i] = get_bits(&gb, n);
 if (s->theora >= 0x030200)
 matrices = get_bits(&gb, 9) + 1;
 else
 matrices = 3;
 av_log(avctx,AV_LOG_ERROR, "unsupported matrices: %d\n", matrices);
 //        return -1;
 }
 /* y coeffs */
 for (i = 0; i < 64; i++)
-	s->coded_intra_y_dequant[i] = get_bits(&gb, 8);
+s->coded_intra_y_dequant[i] = get_bits(&gb, 8);
 /* uv coeffs */
 for (i = 0; i < 64; i++)
-	s->coded_intra_c_dequant[i] = get_bits(&gb, 8);
+s->coded_intra_c_dequant[i] = get_bits(&gb, 8);
 /* inter coeffs */
 for (i = 0; i < 64; i++)
-	s->coded_inter_dequant[i] = get_bits(&gb, 8);
+s->coded_inter_dequant[i] = get_bits(&gb, 8);
 /* skip unknown matrices */
 n = matrices - 3;
 while(n--)
-	for (i = 0; i < 64; i++)
+for (i = 0; i < 64; i++)
-	    skip_bits(&gb, 8);
+skip_bits(&gb, 8);
 for (i = 0; i <= 1; i++) {
 for (n = 0; n <= 2; n++) {
 int newqr;
 if (i > 0 || n > 0)
 qi += get_bits(&gb, av_log2(63-qi)+1) + 1;
 skip_bits(&gb, av_log2(matrices-1)+1);
 }
 if (qi > 63) {
 av_log(avctx, AV_LOG_ERROR, "invalid qi %d > 63\n", qi);
-		    return -1;
+return -1;
-		}
+}
 }
 }
 }
 /* Huffman tables */
 s->theora = 1;
 if (!avctx->extradata_size)
 {
 av_log(avctx, AV_LOG_ERROR, "Missing extradata!\n");
-	return -1;
+return -1;
 }
 for(i=0;i<3;i++) {
 op_bytes = *(p++)<<8;
 op_bytes += *(p++);
 debug_vp3("Theora headerpacket type: %x\n", ptype);
 if (!(ptype & 0x80))
 {
 av_log(avctx, AV_LOG_ERROR, "Invalid extradata!\n");
-	return -1;
+return -1;
 }
 // FIXME: check for this aswell
 skip_bits(&gb, 6*8); /* "theora" */
 switch(ptype)
 {
 case 0x80:
 theora_decode_header(avctx, gb);
-	    break;
+break;
-	case 0x81:
+case 0x81:
 // FIXME: is this needed? it breaks sometimes
-//	    theora_decode_comments(avctx, gb);
+//            theora_decode_comments(avctx, gb);
-	    break;
+break;
-	case 0x82:
+case 0x82:
-	    theora_decode_tables(avctx, gb);
+theora_decode_tables(avctx, gb);
-	    break;
+break;
-	default:
+default:
-	    av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
+av_log(avctx, AV_LOG_ERROR, "Unknown Theora config packet: %d\n", ptype&~0x80);
-	    break;
+break;
 }
 }
 vp3_decode_init(avctx);
 return 0;

Mercurial > libavcodec.hg

comparison vp3.c @ 2979:bfabfdf9ce55 libavcodec