mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
vc1: K&R reformatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
parent
8f8f5ae991
commit
109d8aa1e6
403
libavcodec/vc1.c
403
libavcodec/vc1.c
@ -26,6 +26,7 @@
|
||||
* VC-1 and WMV3 decoder common code
|
||||
*
|
||||
*/
|
||||
|
||||
#include "internal.h"
|
||||
#include "dsputil.h"
|
||||
#include "avcodec.h"
|
||||
@ -67,14 +68,16 @@ enum Imode {
|
||||
* @param[in] height Height of this buffer
|
||||
* @param[in] stride of this buffer
|
||||
*/
|
||||
static void decode_rowskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){
|
||||
static void decode_rowskip(uint8_t* plane, int width, int height, int stride,
|
||||
GetBitContext *gb)
|
||||
{
|
||||
int x, y;
|
||||
|
||||
for (y=0; y<height; y++){
|
||||
for (y = 0; y < height; y++) {
|
||||
if (!get_bits1(gb)) //rowskip
|
||||
memset(plane, 0, width);
|
||||
else
|
||||
for (x=0; x<width; x++)
|
||||
for (x = 0; x < width; x++)
|
||||
plane[x] = get_bits1(gb);
|
||||
plane += stride;
|
||||
}
|
||||
@ -87,15 +90,17 @@ static void decode_rowskip(uint8_t* plane, int width, int height, int stride, Ge
|
||||
* @param[in] stride of this buffer
|
||||
* @todo FIXME: Optimize
|
||||
*/
|
||||
static void decode_colskip(uint8_t* plane, int width, int height, int stride, GetBitContext *gb){
|
||||
static void decode_colskip(uint8_t* plane, int width, int height, int stride,
|
||||
GetBitContext *gb)
|
||||
{
|
||||
int x, y;
|
||||
|
||||
for (x=0; x<width; x++){
|
||||
for (x = 0; x < width; x++) {
|
||||
if (!get_bits1(gb)) //colskip
|
||||
for (y=0; y<height; y++)
|
||||
for (y = 0; y < height; y++)
|
||||
plane[y*stride] = 0;
|
||||
else
|
||||
for (y=0; y<height; y++)
|
||||
for (y = 0; y < height; y++)
|
||||
plane[y*stride] = get_bits1(gb);
|
||||
plane ++;
|
||||
}
|
||||
@ -123,32 +128,31 @@ static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
|
||||
imode = get_vlc2(gb, ff_vc1_imode_vlc.table, VC1_IMODE_VLC_BITS, 1);
|
||||
|
||||
*raw_flag = 0;
|
||||
switch (imode)
|
||||
{
|
||||
switch (imode) {
|
||||
case IMODE_RAW:
|
||||
//Data is actually read in the MB layer (same for all tests == "raw")
|
||||
*raw_flag = 1; //invert ignored
|
||||
return invert;
|
||||
case IMODE_DIFF2:
|
||||
case IMODE_NORM2:
|
||||
if ((height * width) & 1)
|
||||
{
|
||||
if ((height * width) & 1) {
|
||||
*planep++ = get_bits1(gb);
|
||||
offset = 1;
|
||||
}
|
||||
else offset = 0;
|
||||
else
|
||||
offset = 0;
|
||||
// decode bitplane as one long line
|
||||
for (y = offset; y < height * width; y += 2) {
|
||||
code = get_vlc2(gb, ff_vc1_norm2_vlc.table, VC1_NORM2_VLC_BITS, 1);
|
||||
*planep++ = code & 1;
|
||||
offset++;
|
||||
if(offset == width) {
|
||||
if (offset == width) {
|
||||
offset = 0;
|
||||
planep += stride - width;
|
||||
}
|
||||
*planep++ = code >> 1;
|
||||
offset++;
|
||||
if(offset == width) {
|
||||
if (offset == width) {
|
||||
offset = 0;
|
||||
planep += stride - width;
|
||||
}
|
||||
@ -156,11 +160,11 @@ static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
|
||||
break;
|
||||
case IMODE_DIFF6:
|
||||
case IMODE_NORM6:
|
||||
if(!(height % 3) && (width % 3)) { // use 2x3 decoding
|
||||
for(y = 0; y < height; y+= 3) {
|
||||
for(x = width & 1; x < width; x += 2) {
|
||||
if (!(height % 3) && (width % 3)) { // use 2x3 decoding
|
||||
for (y = 0; y < height; y += 3) {
|
||||
for (x = width & 1; x < width; x += 2) {
|
||||
code = get_vlc2(gb, ff_vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2);
|
||||
if(code < 0){
|
||||
if (code < 0) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "invalid NORM-6 VLC\n");
|
||||
return -1;
|
||||
}
|
||||
@ -173,13 +177,14 @@ static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
|
||||
}
|
||||
planep += stride * 3;
|
||||
}
|
||||
if(width & 1) decode_colskip(data, 1, height, stride, &v->s.gb);
|
||||
if (width & 1)
|
||||
decode_colskip(data, 1, height, stride, &v->s.gb);
|
||||
} else { // 3x2
|
||||
planep += (height & 1) * stride;
|
||||
for(y = height & 1; y < height; y += 2) {
|
||||
for(x = width % 3; x < width; x += 3) {
|
||||
for (y = height & 1; y < height; y += 2) {
|
||||
for (x = width % 3; x < width; x += 3) {
|
||||
code = get_vlc2(gb, ff_vc1_norm6_vlc.table, VC1_NORM6_VLC_BITS, 2);
|
||||
if(code < 0){
|
||||
if (code < 0) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "invalid NORM-6 VLC\n");
|
||||
return -1;
|
||||
}
|
||||
@ -193,8 +198,10 @@ static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
|
||||
planep += stride * 2;
|
||||
}
|
||||
x = width % 3;
|
||||
if(x) decode_colskip(data , x, height , stride, &v->s.gb);
|
||||
if(height & 1) decode_rowskip(data+x, width - x, 1, stride, &v->s.gb);
|
||||
if (x)
|
||||
decode_colskip(data, x, height, stride, &v->s.gb);
|
||||
if (height & 1)
|
||||
decode_rowskip(data + x, width - x, 1, stride, &v->s.gb);
|
||||
}
|
||||
break;
|
||||
case IMODE_ROWSKIP:
|
||||
@ -203,33 +210,30 @@ static int bitplane_decoding(uint8_t* data, int *raw_flag, VC1Context *v)
|
||||
case IMODE_COLSKIP:
|
||||
decode_colskip(data, width, height, stride, &v->s.gb);
|
||||
break;
|
||||
default: break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* Applying diff operator */
|
||||
if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6)
|
||||
{
|
||||
if (imode == IMODE_DIFF2 || imode == IMODE_DIFF6) {
|
||||
planep = data;
|
||||
planep[0] ^= invert;
|
||||
for (x=1; x<width; x++)
|
||||
for (x = 1; x < width; x++)
|
||||
planep[x] ^= planep[x-1];
|
||||
for (y=1; y<height; y++)
|
||||
{
|
||||
for (y = 1; y < height; y++) {
|
||||
planep += stride;
|
||||
planep[0] ^= planep[-stride];
|
||||
for (x=1; x<width; x++)
|
||||
{
|
||||
for (x = 1; x < width; x++) {
|
||||
if (planep[x-1] != planep[x-stride]) planep[x] ^= invert;
|
||||
else planep[x] ^= planep[x-1];
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (invert)
|
||||
{
|
||||
} else if (invert) {
|
||||
planep = data;
|
||||
for (x=0; x<stride*height; x++) planep[x] = !planep[x]; //FIXME stride
|
||||
for (x = 0; x < stride * height; x++)
|
||||
planep[x] = !planep[x]; //FIXME stride
|
||||
}
|
||||
return (imode<<1) + invert;
|
||||
return (imode << 1) + invert;
|
||||
}
|
||||
|
||||
/** @} */ //Bitplane group
|
||||
@ -244,35 +248,34 @@ static int vop_dquant_decoding(VC1Context *v)
|
||||
int pqdiff;
|
||||
|
||||
//variable size
|
||||
if (v->dquant == 2)
|
||||
{
|
||||
if (v->dquant == 2) {
|
||||
pqdiff = get_bits(gb, 3);
|
||||
if (pqdiff == 7) v->altpq = get_bits(gb, 5);
|
||||
else v->altpq = v->pq + pqdiff + 1;
|
||||
}
|
||||
if (pqdiff == 7)
|
||||
v->altpq = get_bits(gb, 5);
|
||||
else
|
||||
{
|
||||
v->altpq = v->pq + pqdiff + 1;
|
||||
} else {
|
||||
v->dquantfrm = get_bits1(gb);
|
||||
if ( v->dquantfrm )
|
||||
{
|
||||
if (v->dquantfrm) {
|
||||
v->dqprofile = get_bits(gb, 2);
|
||||
switch (v->dqprofile)
|
||||
{
|
||||
switch (v->dqprofile) {
|
||||
case DQPROFILE_SINGLE_EDGE:
|
||||
case DQPROFILE_DOUBLE_EDGES:
|
||||
v->dqsbedge = get_bits(gb, 2);
|
||||
break;
|
||||
case DQPROFILE_ALL_MBS:
|
||||
v->dqbilevel = get_bits1(gb);
|
||||
if(!v->dqbilevel)
|
||||
if (!v->dqbilevel)
|
||||
v->halfpq = 0;
|
||||
default: break; //Forbidden ?
|
||||
default:
|
||||
break; //Forbidden ?
|
||||
}
|
||||
if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS)
|
||||
{
|
||||
if (v->dqbilevel || v->dqprofile != DQPROFILE_ALL_MBS) {
|
||||
pqdiff = get_bits(gb, 3);
|
||||
if (pqdiff == 7) v->altpq = get_bits(gb, 5);
|
||||
else v->altpq = v->pq + pqdiff + 1;
|
||||
if (pqdiff == 7)
|
||||
v->altpq = get_bits(gb, 5);
|
||||
else
|
||||
v->altpq = v->pq + pqdiff + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -292,25 +295,20 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
{
|
||||
av_log(avctx, AV_LOG_DEBUG, "Header: %0X\n", show_bits(gb, 32));
|
||||
v->profile = get_bits(gb, 2);
|
||||
if (v->profile == PROFILE_COMPLEX)
|
||||
{
|
||||
if (v->profile == PROFILE_COMPLEX) {
|
||||
av_log(avctx, AV_LOG_WARNING, "WMV3 Complex Profile is not fully supported\n");
|
||||
}
|
||||
|
||||
if (v->profile == PROFILE_ADVANCED)
|
||||
{
|
||||
if (v->profile == PROFILE_ADVANCED) {
|
||||
v->zz_8x4 = ff_vc1_adv_progressive_8x4_zz;
|
||||
v->zz_4x8 = ff_vc1_adv_progressive_4x8_zz;
|
||||
return decode_sequence_header_adv(v, gb);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
v->zz_8x4 = wmv2_scantableA;
|
||||
v->zz_4x8 = wmv2_scantableB;
|
||||
v->res_y411 = get_bits1(gb);
|
||||
v->res_sprite = get_bits1(gb);
|
||||
if (v->res_y411)
|
||||
{
|
||||
if (v->res_y411) {
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"Old interlaced mode is not supported\n");
|
||||
return -1;
|
||||
@ -322,19 +320,17 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
// (bitrate-32kbps)/64kbps
|
||||
v->bitrtq_postproc = get_bits(gb, 5); //common
|
||||
v->s.loop_filter = get_bits1(gb); //common
|
||||
if(v->s.loop_filter == 1 && v->profile == PROFILE_SIMPLE)
|
||||
{
|
||||
if (v->s.loop_filter == 1 && v->profile == PROFILE_SIMPLE) {
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"LOOPFILTER shall not be enabled in Simple Profile\n");
|
||||
}
|
||||
if(v->s.avctx->skip_loop_filter >= AVDISCARD_ALL)
|
||||
if (v->s.avctx->skip_loop_filter >= AVDISCARD_ALL)
|
||||
v->s.loop_filter = 0;
|
||||
|
||||
v->res_x8 = get_bits1(gb); //reserved
|
||||
v->multires = get_bits1(gb);
|
||||
v->res_fasttx = get_bits1(gb);
|
||||
if (!v->res_fasttx)
|
||||
{
|
||||
if (!v->res_fasttx) {
|
||||
v->vc1dsp.vc1_inv_trans_8x8 = ff_simple_idct_8;
|
||||
v->vc1dsp.vc1_inv_trans_8x4 = ff_simple_idct84_add;
|
||||
v->vc1dsp.vc1_inv_trans_4x8 = ff_simple_idct48_add;
|
||||
@ -346,8 +342,7 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
}
|
||||
|
||||
v->fastuvmc = get_bits1(gb); //common
|
||||
if (!v->profile && !v->fastuvmc)
|
||||
{
|
||||
if (!v->profile && !v->fastuvmc) {
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"FASTUVMC unavailable in Simple Profile\n");
|
||||
return -1;
|
||||
@ -374,8 +369,7 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
|
||||
v->s.resync_marker = get_bits1(gb);
|
||||
v->rangered = get_bits1(gb);
|
||||
if (v->rangered && v->profile == PROFILE_SIMPLE)
|
||||
{
|
||||
if (v->rangered && v->profile == PROFILE_SIMPLE) {
|
||||
av_log(avctx, AV_LOG_INFO,
|
||||
"RANGERED should be set to 0 in Simple Profile\n");
|
||||
}
|
||||
@ -399,8 +393,7 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
} else {
|
||||
v->res_rtm_flag = get_bits1(gb); //reserved
|
||||
}
|
||||
if (!v->res_rtm_flag)
|
||||
{
|
||||
if (!v->res_rtm_flag) {
|
||||
// av_log(avctx, AV_LOG_ERROR,
|
||||
// "0 for reserved RES_RTM_FLAG is forbidden\n");
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
@ -408,7 +401,8 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
//return -1;
|
||||
}
|
||||
//TODO: figure out what they mean (always 0x402F)
|
||||
if(!v->res_fasttx) skip_bits(gb, 16);
|
||||
if (!v->res_fasttx)
|
||||
skip_bits(gb, 16);
|
||||
av_log(avctx, AV_LOG_DEBUG,
|
||||
"Profile %i:\nfrmrtq_postproc=%i, bitrtq_postproc=%i\n"
|
||||
"LoopFilter=%i, MultiRes=%i, FastUVMC=%i, Extended MV=%i\n"
|
||||
@ -417,8 +411,7 @@ int vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitConte
|
||||
v->profile, v->frmrtq_postproc, v->bitrtq_postproc,
|
||||
v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv,
|
||||
v->rangered, v->vstransform, v->overlap, v->s.resync_marker,
|
||||
v->dquant, v->quantizer_mode, avctx->max_b_frames
|
||||
);
|
||||
v->dquant, v->quantizer_mode, avctx->max_b_frames);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -426,13 +419,11 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
|
||||
{
|
||||
v->res_rtm_flag = 1;
|
||||
v->level = get_bits(gb, 3);
|
||||
if(v->level >= 5)
|
||||
{
|
||||
if (v->level >= 5) {
|
||||
av_log(v->s.avctx, AV_LOG_ERROR, "Reserved LEVEL %i\n",v->level);
|
||||
}
|
||||
v->chromaformat = get_bits(gb, 2);
|
||||
if (v->chromaformat != 1)
|
||||
{
|
||||
if (v->chromaformat != 1) {
|
||||
av_log(v->s.avctx, AV_LOG_ERROR,
|
||||
"Only 4:2:0 chroma format supported\n");
|
||||
return -1;
|
||||
@ -460,26 +451,25 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
|
||||
"TFCTRflag=%i, FINTERPflag=%i\n",
|
||||
v->level, v->frmrtq_postproc, v->bitrtq_postproc,
|
||||
v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace,
|
||||
v->tfcntrflag, v->finterpflag
|
||||
);
|
||||
v->tfcntrflag, v->finterpflag);
|
||||
|
||||
v->psf = get_bits1(gb);
|
||||
if(v->psf) { //PsF, 6.1.13
|
||||
if (v->psf) { //PsF, 6.1.13
|
||||
av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n");
|
||||
return -1;
|
||||
}
|
||||
v->s.max_b_frames = v->s.avctx->max_b_frames = 7;
|
||||
if(get_bits1(gb)) { //Display Info - decoding is not affected by it
|
||||
if (get_bits1(gb)) { //Display Info - decoding is not affected by it
|
||||
int w, h, ar = 0;
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "Display extended info:\n");
|
||||
w = get_bits(gb, 14) + 1;
|
||||
h = get_bits(gb, 14) + 1;
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "Display dimensions: %ix%i\n", w, h);
|
||||
if(get_bits1(gb))
|
||||
if (get_bits1(gb))
|
||||
ar = get_bits(gb, 4);
|
||||
if(ar && ar < 14){
|
||||
if (ar && ar < 14) {
|
||||
v->s.avctx->sample_aspect_ratio = ff_vc1_pixel_aspect[ar];
|
||||
}else if(ar == 15){
|
||||
} else if (ar == 15) {
|
||||
w = get_bits(gb, 8) + 1;
|
||||
h = get_bits(gb, 8) + 1;
|
||||
v->s.avctx->sample_aspect_ratio = (AVRational){w, h};
|
||||
@ -488,30 +478,32 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
|
||||
&v->s.avctx->sample_aspect_ratio.den,
|
||||
v->s.avctx->height * w,
|
||||
v->s.avctx->width * h,
|
||||
1<<30);
|
||||
1 << 30);
|
||||
}
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "Aspect: %i:%i\n", v->s.avctx->sample_aspect_ratio.num, v->s.avctx->sample_aspect_ratio.den);
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "Aspect: %i:%i\n",
|
||||
v->s.avctx->sample_aspect_ratio.num,
|
||||
v->s.avctx->sample_aspect_ratio.den);
|
||||
|
||||
if(get_bits1(gb)){ //framerate stuff
|
||||
if(get_bits1(gb)) {
|
||||
if (get_bits1(gb)) { //framerate stuff
|
||||
if (get_bits1(gb)) {
|
||||
v->s.avctx->time_base.num = 32;
|
||||
v->s.avctx->time_base.den = get_bits(gb, 16) + 1;
|
||||
} else {
|
||||
int nr, dr;
|
||||
nr = get_bits(gb, 8);
|
||||
dr = get_bits(gb, 4);
|
||||
if(nr && nr < 8 && dr && dr < 3){
|
||||
if (nr && nr < 8 && dr && dr < 3) {
|
||||
v->s.avctx->time_base.num = ff_vc1_fps_dr[dr - 1];
|
||||
v->s.avctx->time_base.den = ff_vc1_fps_nr[nr - 1] * 1000;
|
||||
}
|
||||
}
|
||||
if(v->broadcast) { // Pulldown may be present
|
||||
if (v->broadcast) { // Pulldown may be present
|
||||
v->s.avctx->time_base.den *= 2;
|
||||
v->s.avctx->ticks_per_frame = 2;
|
||||
}
|
||||
}
|
||||
|
||||
if(get_bits1(gb)){
|
||||
if (get_bits1(gb)) {
|
||||
v->color_prim = get_bits(gb, 8);
|
||||
v->transfer_char = get_bits(gb, 8);
|
||||
v->matrix_coef = get_bits(gb, 8);
|
||||
@ -519,12 +511,12 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb)
|
||||
}
|
||||
|
||||
v->hrd_param_flag = get_bits1(gb);
|
||||
if(v->hrd_param_flag) {
|
||||
if (v->hrd_param_flag) {
|
||||
int i;
|
||||
v->hrd_num_leaky_buckets = get_bits(gb, 5);
|
||||
skip_bits(gb, 4); //bitrate exponent
|
||||
skip_bits(gb, 4); //buffer size exponent
|
||||
for(i = 0; i < v->hrd_num_leaky_buckets; i++) {
|
||||
for (i = 0; i < v->hrd_num_leaky_buckets; i++) {
|
||||
skip_bits(gb, 16); //hrd_rate[n]
|
||||
skip_bits(gb, 16); //hrd_buffer[n]
|
||||
}
|
||||
@ -549,23 +541,23 @@ int vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContext *
|
||||
v->overlap = get_bits1(gb);
|
||||
v->quantizer_mode = get_bits(gb, 2);
|
||||
|
||||
if(v->hrd_param_flag){
|
||||
for(i = 0; i < v->hrd_num_leaky_buckets; i++) {
|
||||
if (v->hrd_param_flag) {
|
||||
for (i = 0; i < v->hrd_num_leaky_buckets; i++) {
|
||||
skip_bits(gb, 8); //hrd_full[n]
|
||||
}
|
||||
}
|
||||
|
||||
if(get_bits1(gb)){
|
||||
avctx->width = avctx->coded_width = (get_bits(gb, 12)+1)<<1;
|
||||
avctx->height = avctx->coded_height = (get_bits(gb, 12)+1)<<1;
|
||||
if (get_bits1(gb)) {
|
||||
avctx->width = avctx->coded_width = (get_bits(gb, 12) + 1) << 1;
|
||||
avctx->height = avctx->coded_height = (get_bits(gb, 12) + 1) << 1;
|
||||
}
|
||||
if(v->extended_mv)
|
||||
if (v->extended_mv)
|
||||
v->extended_dmv = get_bits1(gb);
|
||||
if((v->range_mapy_flag = get_bits1(gb))) {
|
||||
if ((v->range_mapy_flag = get_bits1(gb))) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Luma scaling is not supported, expect wrong picture\n");
|
||||
v->range_mapy = get_bits(gb, 3);
|
||||
}
|
||||
if((v->range_mapuv_flag = get_bits1(gb))) {
|
||||
if ((v->range_mapuv_flag = get_bits1(gb))) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Chroma scaling is not supported, expect wrong picture\n");
|
||||
v->range_mapuv = get_bits(gb, 3);
|
||||
}
|
||||
@ -584,41 +576,48 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
{
|
||||
int pqindex, lowquant, status;
|
||||
|
||||
if(v->finterpflag) v->interpfrm = get_bits1(gb);
|
||||
if (v->finterpflag)
|
||||
v->interpfrm = get_bits1(gb);
|
||||
skip_bits(gb, 2); //framecnt unused
|
||||
v->rangeredfrm = 0;
|
||||
if (v->rangered) v->rangeredfrm = get_bits1(gb);
|
||||
if (v->rangered)
|
||||
v->rangeredfrm = get_bits1(gb);
|
||||
v->s.pict_type = get_bits1(gb);
|
||||
if (v->s.avctx->max_b_frames) {
|
||||
if (!v->s.pict_type) {
|
||||
if (get_bits1(gb)) v->s.pict_type = AV_PICTURE_TYPE_I;
|
||||
else v->s.pict_type = AV_PICTURE_TYPE_B;
|
||||
} else v->s.pict_type = AV_PICTURE_TYPE_P;
|
||||
} else v->s.pict_type = v->s.pict_type ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
|
||||
if (get_bits1(gb))
|
||||
v->s.pict_type = AV_PICTURE_TYPE_I;
|
||||
else
|
||||
v->s.pict_type = AV_PICTURE_TYPE_B;
|
||||
} else
|
||||
v->s.pict_type = AV_PICTURE_TYPE_P;
|
||||
} else
|
||||
v->s.pict_type = v->s.pict_type ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
|
||||
|
||||
v->bi_type = 0;
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_B) {
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_B) {
|
||||
v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
|
||||
v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index];
|
||||
if(v->bfraction == 0) {
|
||||
if (v->bfraction == 0) {
|
||||
v->s.pict_type = AV_PICTURE_TYPE_BI;
|
||||
}
|
||||
}
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
skip_bits(gb, 7); // skip buffer fullness
|
||||
|
||||
if(v->parse_only)
|
||||
if (v->parse_only)
|
||||
return 0;
|
||||
|
||||
/* calculate RND */
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
v->rnd = 1;
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_P)
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_P)
|
||||
v->rnd ^= 1;
|
||||
|
||||
/* Quantizer stuff */
|
||||
pqindex = get_bits(gb, 5);
|
||||
if(!pqindex) return -1;
|
||||
if (!pqindex)
|
||||
return -1;
|
||||
if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
|
||||
v->pq = ff_vc1_pquant_table[0][pqindex];
|
||||
else
|
||||
@ -630,64 +629,69 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
if (v->quantizer_mode == QUANT_NON_UNIFORM)
|
||||
v->pquantizer = 0;
|
||||
v->pqindex = pqindex;
|
||||
if (pqindex < 9) v->halfpq = get_bits1(gb);
|
||||
else v->halfpq = 0;
|
||||
if (pqindex < 9)
|
||||
v->halfpq = get_bits1(gb);
|
||||
else
|
||||
v->halfpq = 0;
|
||||
if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
|
||||
v->pquantizer = get_bits1(gb);
|
||||
v->dquantfrm = 0;
|
||||
if (v->extended_mv == 1) v->mvrange = get_unary(gb, 0, 3);
|
||||
if (v->extended_mv == 1)
|
||||
v->mvrange = get_unary(gb, 0, 3);
|
||||
v->k_x = v->mvrange + 9 + (v->mvrange >> 1); //k_x can be 9 10 12 13
|
||||
v->k_y = v->mvrange + 8; //k_y can be 8 9 10 11
|
||||
v->range_x = 1 << (v->k_x - 1);
|
||||
v->range_y = 1 << (v->k_y - 1);
|
||||
if (v->multires && v->s.pict_type != AV_PICTURE_TYPE_B) v->respic = get_bits(gb, 2);
|
||||
if (v->multires && v->s.pict_type != AV_PICTURE_TYPE_B)
|
||||
v->respic = get_bits(gb, 2);
|
||||
|
||||
if(v->res_x8 && (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)){
|
||||
if (v->res_x8 && (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)) {
|
||||
v->x8_type = get_bits1(gb);
|
||||
}else v->x8_type = 0;
|
||||
} else
|
||||
v->x8_type = 0;
|
||||
//av_log(v->s.avctx, AV_LOG_INFO, "%c Frame: QP=[%i]%i (+%i/2) %i\n",
|
||||
// (v->s.pict_type == AV_PICTURE_TYPE_P) ? 'P' : ((v->s.pict_type == AV_PICTURE_TYPE_I) ? 'I' : 'B'), pqindex, v->pq, v->halfpq, v->rangeredfrm);
|
||||
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P) v->use_ic = 0;
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P)
|
||||
v->use_ic = 0;
|
||||
|
||||
switch(v->s.pict_type) {
|
||||
switch (v->s.pict_type) {
|
||||
case AV_PICTURE_TYPE_P:
|
||||
if (v->pq < 5) v->tt_index = 0;
|
||||
else if(v->pq < 13) v->tt_index = 1;
|
||||
else if (v->pq < 13) v->tt_index = 1;
|
||||
else v->tt_index = 2;
|
||||
|
||||
lowquant = (v->pq > 12) ? 0 : 1;
|
||||
v->mv_mode = ff_vc1_mv_pmode_table[lowquant][get_unary(gb, 1, 4)];
|
||||
if (v->mv_mode == MV_PMODE_INTENSITY_COMP)
|
||||
{
|
||||
if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
|
||||
int scale, shift, i;
|
||||
v->mv_mode2 = ff_vc1_mv_pmode_table2[lowquant][get_unary(gb, 1, 3)];
|
||||
v->lumscale = get_bits(gb, 6);
|
||||
v->lumshift = get_bits(gb, 6);
|
||||
v->use_ic = 1;
|
||||
/* fill lookup tables for intensity compensation */
|
||||
if(!v->lumscale) {
|
||||
if (!v->lumscale) {
|
||||
scale = -64;
|
||||
shift = (255 - v->lumshift * 2) << 6;
|
||||
if(v->lumshift > 31)
|
||||
if (v->lumshift > 31)
|
||||
shift += 128 << 6;
|
||||
} else {
|
||||
scale = v->lumscale + 32;
|
||||
if(v->lumshift > 31)
|
||||
if (v->lumshift > 31)
|
||||
shift = (v->lumshift - 64) << 6;
|
||||
else
|
||||
shift = v->lumshift << 6;
|
||||
}
|
||||
for(i = 0; i < 256; i++) {
|
||||
for (i = 0; i < 256; i++) {
|
||||
v->luty[i] = av_clip_uint8((scale * i + shift + 32) >> 6);
|
||||
v->lutuv[i] = av_clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6);
|
||||
}
|
||||
}
|
||||
v->qs_last = v->s.quarter_sample;
|
||||
if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
|
||||
if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
|
||||
v->s.quarter_sample = 0;
|
||||
else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
|
||||
if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
|
||||
else if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
|
||||
if (v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
|
||||
v->s.quarter_sample = 0;
|
||||
else
|
||||
v->s.quarter_sample = 1;
|
||||
@ -696,11 +700,11 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
|
||||
|
||||
if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&
|
||||
v->mv_mode2 == MV_PMODE_MIXED_MV)
|
||||
|| v->mv_mode == MV_PMODE_MIXED_MV)
|
||||
{
|
||||
v->mv_mode2 == MV_PMODE_MIXED_MV) ||
|
||||
v->mv_mode == MV_PMODE_MIXED_MV) {
|
||||
status = bitplane_decoding(v->mv_type_mb_plane, &v->mv_type_is_raw, v);
|
||||
if (status < 0) return -1;
|
||||
if (status < 0)
|
||||
return -1;
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "MB MV Type plane encoding: "
|
||||
"Imode: %i, Invert: %i\n", status>>1, status&1);
|
||||
} else {
|
||||
@ -708,7 +712,8 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
memset(v->mv_type_mb_plane, 0, v->s.mb_stride * v->s.mb_height);
|
||||
}
|
||||
status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
|
||||
if (status < 0) return -1;
|
||||
if (status < 0)
|
||||
return -1;
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
|
||||
"Imode: %i, Invert: %i\n", status>>1, status&1);
|
||||
|
||||
@ -716,18 +721,15 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
v->s.mv_table_index = get_bits(gb, 2); //but using ff_vc1_ tables
|
||||
v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
|
||||
|
||||
if (v->dquant)
|
||||
{
|
||||
if (v->dquant) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
|
||||
vop_dquant_decoding(v);
|
||||
}
|
||||
|
||||
v->ttfrm = 0; //FIXME Is that so ?
|
||||
if (v->vstransform)
|
||||
{
|
||||
if (v->vstransform) {
|
||||
v->ttmbf = get_bits1(gb);
|
||||
if (v->ttmbf)
|
||||
{
|
||||
if (v->ttmbf) {
|
||||
v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
|
||||
}
|
||||
} else {
|
||||
@ -737,7 +739,7 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
break;
|
||||
case AV_PICTURE_TYPE_B:
|
||||
if (v->pq < 5) v->tt_index = 0;
|
||||
else if(v->pq < 13) v->tt_index = 1;
|
||||
else if (v->pq < 13) v->tt_index = 1;
|
||||
else v->tt_index = 2;
|
||||
|
||||
v->mv_mode = get_bits1(gb) ? MV_PMODE_1MV : MV_PMODE_1MV_HPEL_BILIN;
|
||||
@ -746,29 +748,28 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
v->s.mspel = v->s.quarter_sample;
|
||||
|
||||
status = bitplane_decoding(v->direct_mb_plane, &v->dmb_is_raw, v);
|
||||
if (status < 0) return -1;
|
||||
if (status < 0)
|
||||
return -1;
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "MB Direct Type plane encoding: "
|
||||
"Imode: %i, Invert: %i\n", status>>1, status&1);
|
||||
status = bitplane_decoding(v->s.mbskip_table, &v->skip_is_raw, v);
|
||||
if (status < 0) return -1;
|
||||
if (status < 0)
|
||||
return -1;
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "MB Skip plane encoding: "
|
||||
"Imode: %i, Invert: %i\n", status>>1, status&1);
|
||||
|
||||
v->s.mv_table_index = get_bits(gb, 2);
|
||||
v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
|
||||
|
||||
if (v->dquant)
|
||||
{
|
||||
if (v->dquant) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
|
||||
vop_dquant_decoding(v);
|
||||
}
|
||||
|
||||
v->ttfrm = 0;
|
||||
if (v->vstransform)
|
||||
{
|
||||
if (v->vstransform) {
|
||||
v->ttmbf = get_bits1(gb);
|
||||
if (v->ttmbf)
|
||||
{
|
||||
if (v->ttmbf) {
|
||||
v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
|
||||
}
|
||||
} else {
|
||||
@ -778,19 +779,17 @@ int vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
|
||||
break;
|
||||
}
|
||||
|
||||
if(!v->x8_type)
|
||||
{
|
||||
if (!v->x8_type) {
|
||||
/* AC Syntax */
|
||||
v->c_ac_table_index = decode012(gb);
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
{
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI) {
|
||||
v->y_ac_table_index = decode012(gb);
|
||||
}
|
||||
/* DC Syntax */
|
||||
v->s.dc_table_index = get_bits1(gb);
|
||||
}
|
||||
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_BI) {
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_BI) {
|
||||
v->s.pict_type = AV_PICTURE_TYPE_B;
|
||||
v->bi_type = 1;
|
||||
}
|
||||
@ -833,15 +832,16 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
goto parse_common_info;
|
||||
}
|
||||
|
||||
if(v->interlace){
|
||||
if (v->interlace) {
|
||||
v->fcm = decode012(gb);
|
||||
if(v->fcm){
|
||||
if (v->fcm) {
|
||||
if (v->fcm == 2)
|
||||
v->field_mode = 1;
|
||||
else
|
||||
v->field_mode = 0;
|
||||
if (!v->warn_interlaced++)
|
||||
av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced frames/fields support is incomplete\n");
|
||||
av_log(v->s.avctx, AV_LOG_ERROR,
|
||||
"Interlaced frames/fields support is incomplete\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -851,7 +851,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
if (v->fptype & 4) // B-picture
|
||||
v->s.pict_type = (v->fptype & 2) ? AV_PICTURE_TYPE_BI : AV_PICTURE_TYPE_B;
|
||||
} else {
|
||||
switch(get_unary(gb, 0, 4)) {
|
||||
switch (get_unary(gb, 0, 4)) {
|
||||
case 0:
|
||||
v->s.pict_type = AV_PICTURE_TYPE_P;
|
||||
break;
|
||||
@ -870,25 +870,25 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(v->tfcntrflag)
|
||||
if (v->tfcntrflag)
|
||||
skip_bits(gb, 8);
|
||||
if(v->broadcast) {
|
||||
if(!v->interlace || v->psf) {
|
||||
if (v->broadcast) {
|
||||
if (!v->interlace || v->psf) {
|
||||
v->rptfrm = get_bits(gb, 2);
|
||||
} else {
|
||||
v->tff = get_bits1(gb);
|
||||
v->rff = get_bits1(gb);
|
||||
}
|
||||
}
|
||||
if(v->panscanflag) {
|
||||
if (v->panscanflag) {
|
||||
av_log_missing_feature(v->s.avctx, "Pan-scan", 0);
|
||||
//...
|
||||
}
|
||||
if(v->p_frame_skipped) {
|
||||
if (v->p_frame_skipped) {
|
||||
return 0;
|
||||
}
|
||||
v->rnd = get_bits1(gb);
|
||||
if(v->interlace)
|
||||
if (v->interlace)
|
||||
v->uvsamp = get_bits1(gb);
|
||||
if (v->field_mode) {
|
||||
if (!v->refdist_flag)
|
||||
@ -910,11 +910,12 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
}
|
||||
goto parse_common_info;
|
||||
}
|
||||
if(v->finterpflag) v->interpfrm = get_bits1(gb);
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_B) {
|
||||
if (v->finterpflag)
|
||||
v->interpfrm = get_bits1(gb);
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_B) {
|
||||
v->bfraction_lut_index = get_vlc2(gb, ff_vc1_bfraction_vlc.table, VC1_BFRACTION_VLC_BITS, 1);
|
||||
v->bfraction = ff_vc1_bfraction_lut[v->bfraction_lut_index];
|
||||
if(v->bfraction == 0) {
|
||||
if (v->bfraction == 0) {
|
||||
v->s.pict_type = AV_PICTURE_TYPE_BI; /* XXX: should not happen here */
|
||||
}
|
||||
}
|
||||
@ -923,7 +924,8 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
if (v->field_mode)
|
||||
v->cur_field_type = !(v->tff ^ v->second_field);
|
||||
pqindex = get_bits(gb, 5);
|
||||
if(!pqindex) return -1;
|
||||
if (!pqindex)
|
||||
return -1;
|
||||
v->pqindex = pqindex;
|
||||
if (v->quantizer_mode == QUANT_FRAME_IMPLICIT)
|
||||
v->pq = ff_vc1_pquant_table[0][pqindex];
|
||||
@ -942,16 +944,16 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
v->halfpq = 0;
|
||||
if (v->quantizer_mode == QUANT_FRAME_EXPLICIT)
|
||||
v->pquantizer = get_bits1(gb);
|
||||
if(v->postprocflag)
|
||||
if (v->postprocflag)
|
||||
v->postproc = get_bits(gb, 2);
|
||||
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P)
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_P)
|
||||
v->use_ic = 0;
|
||||
|
||||
if (v->parse_only)
|
||||
return 0;
|
||||
|
||||
switch(v->s.pict_type) {
|
||||
switch (v->s.pict_type) {
|
||||
case AV_PICTURE_TYPE_I:
|
||||
case AV_PICTURE_TYPE_BI:
|
||||
if (v->fcm == 1) { //interlace frame picture
|
||||
@ -967,9 +969,9 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "ACPRED plane encoding: "
|
||||
"Imode: %i, Invert: %i\n", status>>1, status&1);
|
||||
v->condover = CONDOVER_NONE;
|
||||
if(v->overlap && v->pq <= 8) {
|
||||
if (v->overlap && v->pq <= 8) {
|
||||
v->condover = decode012(gb);
|
||||
if(v->condover == CONDOVER_SELECT) {
|
||||
if (v->condover == CONDOVER_SELECT) {
|
||||
status = bitplane_decoding(v->over_flags_plane, &v->overflg_is_raw, v);
|
||||
if (status < 0)
|
||||
return -1;
|
||||
@ -1031,7 +1033,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
|
||||
if (v->pq < 5)
|
||||
v->tt_index = 0;
|
||||
else if(v->pq < 13)
|
||||
else if (v->pq < 13)
|
||||
v->tt_index = 1;
|
||||
else
|
||||
v->tt_index = 2;
|
||||
@ -1057,22 +1059,23 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
v->use_ic = 1;
|
||||
}
|
||||
v->qs_last = v->s.quarter_sample;
|
||||
if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
|
||||
if (v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN)
|
||||
v->s.quarter_sample = 0;
|
||||
else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) {
|
||||
if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
|
||||
else if (v->mv_mode == MV_PMODE_INTENSITY_COMP) {
|
||||
if (v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN)
|
||||
v->s.quarter_sample = 0;
|
||||
else
|
||||
v->s.quarter_sample = 1;
|
||||
} else
|
||||
v->s.quarter_sample = 1;
|
||||
v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN || (v->mv_mode == MV_PMODE_INTENSITY_COMP && v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
|
||||
v->s.mspel = !(v->mv_mode == MV_PMODE_1MV_HPEL_BILIN
|
||||
|| (v->mv_mode == MV_PMODE_INTENSITY_COMP
|
||||
&& v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN));
|
||||
}
|
||||
if (v->fcm == 0) { // progressive
|
||||
if ((v->mv_mode == MV_PMODE_INTENSITY_COMP &&
|
||||
v->mv_mode2 == MV_PMODE_MIXED_MV)
|
||||
|| v->mv_mode == MV_PMODE_MIXED_MV)
|
||||
{
|
||||
|| v->mv_mode == MV_PMODE_MIXED_MV) {
|
||||
status = bitplane_decoding(v->mv_type_mb_plane, &v->mv_type_is_raw, v);
|
||||
if (status < 0)
|
||||
return -1;
|
||||
@ -1113,18 +1116,15 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
v->mbmode_vlc = &ff_vc1_if_1mv_mbmode_vlc[mbmodetab];
|
||||
}
|
||||
}
|
||||
if (v->dquant)
|
||||
{
|
||||
if (v->dquant) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
|
||||
vop_dquant_decoding(v);
|
||||
}
|
||||
|
||||
v->ttfrm = 0; //FIXME Is that so ?
|
||||
if (v->vstransform)
|
||||
{
|
||||
if (v->vstransform) {
|
||||
v->ttmbf = get_bits1(gb);
|
||||
if (v->ttmbf)
|
||||
{
|
||||
if (v->ttmbf) {
|
||||
v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
|
||||
}
|
||||
} else {
|
||||
@ -1147,7 +1147,7 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
|
||||
if (v->pq < 5)
|
||||
v->tt_index = 0;
|
||||
else if(v->pq < 13)
|
||||
else if (v->pq < 13)
|
||||
v->tt_index = 1;
|
||||
else
|
||||
v->tt_index = 2;
|
||||
@ -1200,18 +1200,15 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
v->cbpcy_vlc = &ff_vc1_cbpcy_p_vlc[get_bits(gb, 2)];
|
||||
}
|
||||
|
||||
if (v->dquant)
|
||||
{
|
||||
if (v->dquant) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
|
||||
vop_dquant_decoding(v);
|
||||
}
|
||||
|
||||
v->ttfrm = 0;
|
||||
if (v->vstransform)
|
||||
{
|
||||
if (v->vstransform) {
|
||||
v->ttmbf = get_bits1(gb);
|
||||
if (v->ttmbf)
|
||||
{
|
||||
if (v->ttmbf) {
|
||||
v->ttfrm = ff_vc1_ttfrm_to_tt[get_bits(gb, 2)];
|
||||
}
|
||||
} else {
|
||||
@ -1223,19 +1220,19 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
|
||||
|
||||
/* AC Syntax */
|
||||
v->c_ac_table_index = decode012(gb);
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
{
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI) {
|
||||
v->y_ac_table_index = decode012(gb);
|
||||
}
|
||||
/* DC Syntax */
|
||||
v->s.dc_table_index = get_bits1(gb);
|
||||
if ((v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI) && v->dquant) {
|
||||
if ((v->s.pict_type == AV_PICTURE_TYPE_I || v->s.pict_type == AV_PICTURE_TYPE_BI)
|
||||
&& v->dquant) {
|
||||
av_log(v->s.avctx, AV_LOG_DEBUG, "VOP DQuant info\n");
|
||||
vop_dquant_decoding(v);
|
||||
}
|
||||
|
||||
v->bi_type = 0;
|
||||
if(v->s.pict_type == AV_PICTURE_TYPE_BI) {
|
||||
if (v->s.pict_type == AV_PICTURE_TYPE_BI) {
|
||||
v->s.pict_type = AV_PICTURE_TYPE_B;
|
||||
v->bi_type = 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user