Mercurial > libavcodec.hg
comparison h263.c @ 4652:6679d37a3338 libavcodec
Give context to dprintf
author | mbardiaux |
---|---|
date | Mon, 12 Mar 2007 12:36:41 +0000 |
parents | a96d905dcbaa |
children | f0ce30e115ac |
comparison
equal
deleted
inserted
replaced
4651:ff9749708137 | 4652:6679d37a3338 |
---|---|
5139 | 5139 |
5140 /* ufep other than 0 and 1 are reserved */ | 5140 /* ufep other than 0 and 1 are reserved */ |
5141 if (ufep == 1) { | 5141 if (ufep == 1) { |
5142 /* OPPTYPE */ | 5142 /* OPPTYPE */ |
5143 format = get_bits(&s->gb, 3); | 5143 format = get_bits(&s->gb, 3); |
5144 dprintf("ufep=1, format: %d\n", format); | 5144 dprintf(s->avctx, "ufep=1, format: %d\n", format); |
5145 s->custom_pcf= get_bits1(&s->gb); | 5145 s->custom_pcf= get_bits1(&s->gb); |
5146 s->umvplus = get_bits(&s->gb, 1); /* Unrestricted Motion Vector */ | 5146 s->umvplus = get_bits(&s->gb, 1); /* Unrestricted Motion Vector */ |
5147 if (get_bits1(&s->gb) != 0) { | 5147 if (get_bits1(&s->gb) != 0) { |
5148 av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n"); | 5148 av_log(s->avctx, AV_LOG_ERROR, "Syntax-based Arithmetic Coding (SAC) not supported\n"); |
5149 } | 5149 } |
5189 /* Get the picture dimensions */ | 5189 /* Get the picture dimensions */ |
5190 if (ufep) { | 5190 if (ufep) { |
5191 if (format == 6) { | 5191 if (format == 6) { |
5192 /* Custom Picture Format (CPFMT) */ | 5192 /* Custom Picture Format (CPFMT) */ |
5193 s->aspect_ratio_info = get_bits(&s->gb, 4); | 5193 s->aspect_ratio_info = get_bits(&s->gb, 4); |
5194 dprintf("aspect: %d\n", s->aspect_ratio_info); | 5194 dprintf(s->avctx, "aspect: %d\n", s->aspect_ratio_info); |
5195 /* aspect ratios: | 5195 /* aspect ratios: |
5196 0 - forbidden | 5196 0 - forbidden |
5197 1 - 1:1 | 5197 1 - 1:1 |
5198 2 - 12:11 (CIF 4:3) | 5198 2 - 12:11 (CIF 4:3) |
5199 3 - 10:11 (525-type 4:3) | 5199 3 - 10:11 (525-type 4:3) |
5202 6-14 - reserved | 5202 6-14 - reserved |
5203 */ | 5203 */ |
5204 width = (get_bits(&s->gb, 9) + 1) * 4; | 5204 width = (get_bits(&s->gb, 9) + 1) * 4; |
5205 skip_bits1(&s->gb); | 5205 skip_bits1(&s->gb); |
5206 height = get_bits(&s->gb, 9) * 4; | 5206 height = get_bits(&s->gb, 9) * 4; |
5207 dprintf("\nH.263+ Custom picture: %dx%d\n",width,height); | 5207 dprintf(s->avctx, "\nH.263+ Custom picture: %dx%d\n",width,height); |
5208 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { | 5208 if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { |
5209 /* aspected dimensions */ | 5209 /* aspected dimensions */ |
5210 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); | 5210 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); |
5211 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); | 5211 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); |
5212 }else{ | 5212 }else{ |