comparison svq1.c @ 2010:ad1a92c2db48 libavcodec

width height %64 != 0 fix print average RD score at the end precalculated codebook vector mean tables

2009:b13a25ac9f0c

    int c_block_width;
    int c_block_height;

    unsigned char *c_plane;

} SVQ1Context;

/* motion vector (prediction) */
typedef struct svq1_pmv_s {
  int		 x;

            int best_vector_sum=-99, best_vector_mean=-99;
            const int stage= count-1;
            int8_t *vector;
    
            for(i=0; i<16; i++){
                int sum=0;
                int sqr=0;
                int diff, mean, score;
    
                vector = svq1_intra_codebooks[level] + stage*size*16 + i*size;
    
                for(j=0; j<size; j++){
                    int v= vector[j];
                    sum += v;
                    sqr += (v - block[stage][j])*(v - block[stage][j]);
                }
                diff= block_sum[stage] - sum;
                mean= (diff + (size>>1)) >> (level+3);
                assert(mean >-50 && mean<300);

    for (y = 0; y < block_height; y++) {

        for (x = 0; x < block_width; x++) {
            uint8_t reorder_buffer[6][7*32];

#ifdef DEBUG_SVQ1
av_log(s->avctx, AV_LOG_INFO, "* level 5 vector @ %d, %d:\n", x * 16, y * 16);
#endif

            left_edge = (y * 16 * stride) + (x * 16);
            
            for(i=0; i<6; i++){
                init_put_bits(&s->reorder_pb[i], reorder_buffer[i], 7*32);
            }
            encode_block(s, &plane[left_edge], stride, 5, 256, (s->picture.quality*s->picture.quality) >> (2*FF_LAMBDA_SHIFT));
            for(i=5; i>=0; i--){
                int count= put_bits_count(&s->reorder_pb[i]);
                
                flush_put_bits(&s->reorder_pb[i]);
                ff_copy_bits(&s->pb, s->reorder_pb[i].buf, count);

static int svq1_encode_end(AVCodecContext *avctx)
{
    SVQ1Context * const s = avctx->priv_data;

    av_free(s->c_plane);

    return 0;
}

2010:ad1a92c2db48

    int c_block_width;
    int c_block_height;

    unsigned char *c_plane;

    int64_t rd_total;
} SVQ1Context;

/* motion vector (prediction) */
typedef struct svq1_pmv_s {
  int		 x;

            int best_vector_sum=-99, best_vector_mean=-99;
            const int stage= count-1;
            int8_t *vector;
    
            for(i=0; i<16; i++){
                int sum= svq1_intra_codebook_sum[level][stage*16 + i];
                int sqr=0;
                int diff, mean, score;
    
                vector = svq1_intra_codebooks[level] + stage*size*16 + i*size;
    
                for(j=0; j<size; j++){
                    int v= vector[j];
                    sqr += (v - block[stage][j])*(v - block[stage][j]);
                }
                diff= block_sum[stage] - sum;
                mean= (diff + (size>>1)) >> (level+3);
                assert(mean >-50 && mean<300);

    for (y = 0; y < block_height; y++) {

        for (x = 0; x < block_width; x++) {
            uint8_t reorder_buffer[6][7*32];
            uint8_t *src= plane + y * 16 * stride + x * 16;
            uint8_t buf[stride*16];

#ifdef DEBUG_SVQ1
av_log(s->avctx, AV_LOG_INFO, "* level 5 vector @ %d, %d:\n", x * 16, y * 16);
#endif

            left_edge = (y * 16 * stride) + (x * 16);
            
            for(i=0; i<6; i++){
                init_put_bits(&s->reorder_pb[i], reorder_buffer[i], 7*32);
            }
            if(x*16 + 16 > width || y*16 + 16 > height){
                ff_emulated_edge_mc(buf, src, stride, 16, 16, 16*x, 16*y, width, height);
                src= buf;
            }
            s->rd_total += encode_block(s, src, stride, 5, 256, (s->picture.quality*s->picture.quality) >> (2*FF_LAMBDA_SHIFT));
            for(i=5; i>=0; i--){
                int count= put_bits_count(&s->reorder_pb[i]);
                
                flush_put_bits(&s->reorder_pb[i]);
                ff_copy_bits(&s->pb, s->reorder_pb[i].buf, count);

static int svq1_encode_end(AVCodecContext *avctx)
{
    SVQ1Context * const s = avctx->priv_data;

    av_log(avctx, AV_LOG_DEBUG, "RD: %f\n", s->rd_total/(double)(avctx->width*avctx->height*avctx->frame_number));
    
    av_free(s->c_plane);

    return 0;
}