--- decoder.c 2002/06/28 15:14:40 1.22 +++ decoder.c 2002/07/09 01:09:33 1.25 @@ -32,7 +32,6 @@ * * History: * - * 28.06.2002 added basic resync support to iframe/pframe_decode() * 22.06.2002 added primative N_VOP support * #define BFRAMES_DEC now enables Minchenm's bframe decoder * 08.05.2002 add low_delay support for B_VOP decode @@ -50,7 +49,7 @@ * 22.12.2001 lock based interpolation * 01.12.2001 inital version; (c)2001 peter ross * - * $Id: decoder.c,v 1.22 2002/06/28 15:14:40 suxen_drol Exp $ + * $Id: decoder.c,v 1.25 2002/07/09 01:09:33 chenm001 Exp $ * *************************************************************************/ @@ -169,6 +168,122 @@ } + +/* **************************************************************** +NIC 28.06.2002 + riscritta la 'decoder_create' per cambiarne l'interfaccia e poterla + usare nella dll caricata dall'IM1 player + IM1_decoder_create(XVID_DEC_PARAM * param,XVID_DEC_FRAME * frame) +**************************************************************** */ +//XVID_DEC_FRAME * frame + +int +IM1_decoder_create(XVID_DEC_PARAM * param,XVID_DEC_FRAME * frame) +{ + DECODER *dec; + Bitstream bs; + uint32_t rounding; + uint32_t quant; + uint32_t fcode_forward; + uint32_t fcode_backward; + uint32_t intra_dc_threshold; + + dec = xvid_malloc(sizeof(DECODER), CACHE_LINE); + if (dec == NULL) { + return XVID_ERR_MEMORY; + } + param->handle = dec; + + + BitstreamInit(&bs, frame->bitstream, frame->length);//NIC + + //NIC + BitstreamReadHeaders(&bs, dec, &rounding, &quant, &fcode_forward, + &fcode_backward, &intra_dc_threshold); + + + param->width = dec->width; //NIC added + param->height = dec->height; //NIC added + //dec->width = param->width; //NIC commentate + //dec->height = param->height; //NIC commentate + + dec->mb_width = (dec->width + 15) / 16; + dec->mb_height = (dec->height + 15) / 16; + + dec->edged_width = 16 * dec->mb_width + 2 * EDGE_SIZE; + dec->edged_height = 16 * dec->mb_height + 2 * EDGE_SIZE; + dec->low_delay = 0; + + if (image_create(&dec->cur, dec->edged_width, dec->edged_height)) { + xvid_free(dec); + return XVID_ERR_MEMORY; + } + + if (image_create(&dec->refn[0], dec->edged_width, dec->edged_height)) { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + // add by chenm001 + // for support B-frame to reference last 2 frame + if (image_create(&dec->refn[1], dec->edged_width, dec->edged_height)) { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + if (image_create(&dec->refn[2], dec->edged_width, dec->edged_height)) { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + + dec->mbs = + xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, + CACHE_LINE); + if (dec->mbs == NULL) { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + + memset(dec->mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); + + // add by chenm001 + // for skip MB flag + dec->last_mbs = + xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, + CACHE_LINE); + if (dec->last_mbs == NULL) { + xvid_free(dec->mbs); + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + + memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); + + init_timer(); + + // add by chenm001 + // for support B-frame to save reference frame's time + dec->frames = -1; + dec->time = dec->time_base = dec->last_time_base = 0; + + return XVID_ERR_OK; +} +/* **************************************************************** + END NIC +**************************************************************** */ + int decoder_destroy(DECODER * dec) { @@ -204,9 +319,7 @@ const uint32_t cbp, Bitstream * bs, const uint32_t quant, - const uint32_t intra_dc_threshold, - const unsigned int bound_x, - const unsigned int bound_y) + const uint32_t intra_dc_threshold) { DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE); @@ -232,7 +345,7 @@ start_timer(); predict_acdc(dec->mbs, x_pos, y_pos, dec->mb_width, i, &block[i * 64], - iQuant, iDcScaler, predictors, bound_x, bound_y); + iQuant, iDcScaler, predictors); if (!acpred_flag) { pMB->acpred_directions[i] = 0; } @@ -425,14 +538,12 @@ int quant, int intra_dc_threshold) { - uint32_t bound_x, bound_y; - uint32_t x, y; - bound_x = bound_y = 0; + uint32_t x, y; for (y = 0; y < dec->mb_height; y++) { for (x = 0; x < dec->mb_width; x++) { - MACROBLOCK *mb; + MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x]; uint32_t mcbpc; uint32_t cbpc; @@ -440,22 +551,17 @@ uint32_t cbpy; uint32_t cbp; - skip_stuffing(bs); - if (check_resync_marker(bs, 0)) - { - int mbnum = read_video_packet_header(bs, 0); - x = bound_x = mbnum % dec->mb_width; - y = bound_y = mbnum / dec->mb_width; - } - - mb = &dec->mbs[y * dec->mb_width + x]; - mcbpc = get_mcbpc_intra(bs); mb->mode = mcbpc & 7; cbpc = (mcbpc >> 4); acpred_flag = BitstreamGetBit(bs); + if (mb->mode == MODE_STUFFING) { + DEBUG("-- STUFFING ?"); + continue; + } + cbpy = get_cbpy(bs, 1); cbp = (cbpy << 2) | cbpc; @@ -475,7 +581,7 @@ } decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold, bound_x, bound_y); + intra_dc_threshold); } } @@ -489,9 +595,7 @@ int y, int k, VECTOR * mv, - int fcode, - const int bound_x, - const int bound_y) + int fcode) { int scale_fac = 1 << (fcode - 1); @@ -506,7 +610,7 @@ int pmv_x, pmv_y; - get_pmvdata(dec->mbs, x, y, dec->mb_width, k, pmv, psad, bound_x, bound_y); + get_pmvdata(dec->mbs, x, y, dec->mb_width, k, pmv, psad); pmv_x = pmv[0].x; pmv_y = pmv[0].y; @@ -545,27 +649,15 @@ { uint32_t x, y; - uint32_t bound_x, bound_y; start_timer(); image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); stop_edges_timer(); - bound_x = bound_y = 0; - for (y = 0; y < dec->mb_height; y++) { for (x = 0; x < dec->mb_width; x++) { - MACROBLOCK *mb; - - skip_stuffing(bs); - if (check_resync_marker(bs, 0)) - { - int mbnum = read_video_packet_header(bs, 0); - x = bound_x = mbnum % dec->mb_width; - y = bound_y = mbnum / dec->mb_width; - } - mb = &dec->mbs[y * dec->mb_width + x]; + MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x]; //if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs))) // not_coded if (!(BitstreamGetBit(bs))) // not_coded @@ -588,6 +680,11 @@ acpred_flag = BitstreamGetBit(bs); } + if (mb->mode == MODE_STUFFING) { + DEBUG("-- STUFFING ?"); + continue; + } + cbpy = get_cbpy(bs, intra); cbp = (cbpy << 2) | cbpc; @@ -621,12 +718,12 @@ if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { if (dec->interlacing && mb->field_pred) { get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], - fcode, bound_x, bound_y); + fcode); get_motion_vector(dec, bs, x, y, 0, &mb->mvs[1], - fcode, bound_x, bound_y); + fcode); } else { get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], - fcode, bound_x, bound_y); + fcode); mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = @@ -634,10 +731,10 @@ } } else if (mb->mode == MODE_INTER4V /* || mb->mode == MODE_INTER4V_Q */ ) { - get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode, bound_x, bound_y); - get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode, bound_x, bound_y); - get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode, bound_x, bound_y); - get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode, bound_x, bound_y); + get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode); + get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode); + get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode); + get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode); } else // MODE_INTRA, MODE_INTRA_Q { mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = @@ -645,7 +742,7 @@ mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0; decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold, bound_x, bound_y); + intra_dc_threshold); continue; } @@ -1262,23 +1359,27 @@ case P_VOP: decoder_pframe(dec, &bs, rounding, quant, fcode_forward, intra_dc_threshold); + printf("P_VOP Time=%ld\n",dec->time); DEBUG1("P_VOP Time=", dec->time); break; case I_VOP: decoder_iframe(dec, &bs, quant, intra_dc_threshold); + printf("I_VOP Time=%ld\n",dec->time); DEBUG1("I_VOP Time=", dec->time); break; case B_VOP: #ifdef BFRAMES_DEC if (dec->time_pp > dec->time_bp) { + printf("I_VOP Time=%ld\n",dec->time); DEBUG1("B_VOP Time=", dec->time); decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); } else { DEBUG("broken B-frame!"); } #else + printf("Che minchia ne so\n"); image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); #endif break; @@ -1286,6 +1387,7 @@ case N_VOP: // vop not coded // when low_delay==0, N_VOP's should interpolate between the past and future frames image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); + printf("N_VOP vop not coded\n"); break; default: