comparison h264.c @ 7393:309c59802769 libavcodec

Merge oddly duplicated remove_long/remove_long_at_index() function.

7392:95787edebd24

static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
static void remove_long_at_index(H264Context *h, int i);

static av_always_inline uint32_t pack16to32(int a, int b){
#ifdef WORDS_BIGENDIAN
   return (b&0xFFFF) + (a<<16);
#else

    int i;

    for(i=0; i<16; i++){
        if (h->long_ref[i] != NULL) {
            unreference_pic(h, h->long_ref[i], 0);
            remove_long_at_index(h, i);
        }
    }
    assert(h->long_ref_count==0);

    for(i=0; i<h->short_ref_count; i++){

    return pic;
}

/**
 * Remove a picture from the long term reference list by its index in
 * that list.  This does no checking on the provided index; it is assumed
 * to be valid. The removed entry is set to NULL. Other entries are unaffected.
 * @param i index into h->long_ref of picture to remove.
 */
static void remove_long_at_index(H264Context *h, int i){
    assert(h->long_ref[i]->long_ref == 1);
    h->long_ref[i]->long_ref= 0;
    h->long_ref[i]= NULL;
    h->long_ref_count--;
}

/**
 *
 * @return the removed picture or NULL if an error occurs
 */
static Picture * remove_long(H264Context *h, int i){
    Picture *pic;

    pic= h->long_ref[i];
    if (pic)
        remove_long_at_index(h, i);

    return pic;
}

/**

        case MMCO_LONG2UNUSED:
            j = pic_num_extract(h, mmco[i].long_arg, &structure);
            pic = h->long_ref[j];
            if (pic) {
                if (unreference_pic(h, pic, structure ^ PICT_FRAME))
                    remove_long_at_index(h, j);
            } else if(s->avctx->debug&FF_DEBUG_MMCO)
                av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
            break;
        case MMCO_LONG:
                    // Comment below left from previous code as it is an interresting note.

                if (h->long_ref[i])
                    break;

            assert(i < 16);
            pic = h->long_ref[i];
            remove_long_at_index(h, i);
        } else {
            pic = h->short_ref[h->short_ref_count - 1];
            remove_short_at_index(h, h->short_ref_count - 1);
        }
        unreference_pic(h, pic, 0);

7393:309c59802769

static void svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);
static void svq3_add_idct_c(uint8_t *dst, DCTELEM *block, int stride, int qp, int dc);
static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8_t *img_cb, uint8_t *img_cr, unsigned int linesize, unsigned int uvlinesize);
static Picture * remove_long(H264Context *h, int i);

static av_always_inline uint32_t pack16to32(int a, int b){
#ifdef WORDS_BIGENDIAN
   return (b&0xFFFF) + (a<<16);
#else

    int i;

    for(i=0; i<16; i++){
        if (h->long_ref[i] != NULL) {
            unreference_pic(h, h->long_ref[i], 0);
            remove_long(h, i);
        }
    }
    assert(h->long_ref_count==0);

    for(i=0; i<h->short_ref_count; i++){

    return pic;
}

/**
 * Remove a picture from the long term reference list by its index in
 * that list.
 * @return the removed picture or NULL if an error occurs
 */
static Picture * remove_long(H264Context *h, int i){
    Picture *pic;

    pic= h->long_ref[i];
    if (pic){
        assert(h->long_ref[i]->long_ref == 1);
        h->long_ref[i]->long_ref= 0;
        h->long_ref[i]= NULL;
        h->long_ref_count--;
    }

    return pic;
}

/**

        case MMCO_LONG2UNUSED:
            j = pic_num_extract(h, mmco[i].long_arg, &structure);
            pic = h->long_ref[j];
            if (pic) {
                if (unreference_pic(h, pic, structure ^ PICT_FRAME))
                    remove_long(h, j);
            } else if(s->avctx->debug&FF_DEBUG_MMCO)
                av_log(h->s.avctx, AV_LOG_DEBUG, "mmco: unref long failure\n");
            break;
        case MMCO_LONG:
                    // Comment below left from previous code as it is an interresting note.

                if (h->long_ref[i])
                    break;

            assert(i < 16);
            pic = h->long_ref[i];
            remove_long(h, i);
        } else {
            pic = h->short_ref[h->short_ref_count - 1];
            remove_short_at_index(h, h->short_ref_count - 1);
        }
        unreference_pic(h, pic, 0);