xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-29 06:20:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snowenc: remove disabled QUANTIZE2 code

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-29 16:59:26 +02:00
parent f896f92337
commit f07b569939
1 changed files with 2 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
libavcodec/snowenc.c
View File

@ -37,123 +37,6 @@
#undef NDEBUG #undef NDEBUG
#include <assert.h> #include <assert.h>
#define QUANTIZE2 0
#if QUANTIZE2==1
#define Q2_STEP 8
static void find_sse(SnowContext *s, Plane *p, int *score, int score_stride, IDWTELEM *r0, IDWTELEM *r1, int level, int orientation){
SubBand *b= &p->band[level][orientation];
int x, y;
int xo=0;
int yo=0;
int step= 1 << (s->spatial_decomposition_count - level);
if(orientation&1)
xo= step>>1;
if(orientation&2)
yo= step>>1;
//FIXME bias for nonzero ?
//FIXME optimize
memset(score, 0, sizeof(*score)*score_stride*((p->height + Q2_STEP-1)/Q2_STEP));
for(y=0; y<p->height; y++){
for(x=0; x<p->width; x++){
int sx= (x-xo + step/2) / step / Q2_STEP;
int sy= (y-yo + step/2) / step / Q2_STEP;
int v= r0[x + y*p->width] - r1[x + y*p->width];
av_assert2(sx>=0 && sy>=0 && sx < score_stride);
v= ((v+8)>>4)<<4;
score[sx + sy*score_stride] += v*v;
av_assert2(score[sx + sy*score_stride] >= 0);
}
}
}
static void dequantize_all(SnowContext *s, Plane *p, IDWTELEM *buffer, int width, int height){
int level, orientation;
for(level=0; level<s->spatial_decomposition_count; level++){
for(orientation=level ? 1 : 0; orientation<4; orientation++){
SubBand *b= &p->band[level][orientation];
IDWTELEM *dst= buffer + (b->ibuf - s->spatial_idwt_buffer);
dequantize(s, b, dst, b->stride);
}
}
}
static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, int height, int stride, int type){
int level, orientation, ys, xs, x, y, pass;
IDWTELEM best_dequant[height * stride];
IDWTELEM idwt2_buffer[height * stride];
const int score_stride= (width + 10)/Q2_STEP;
int best_score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
int score[(width + 10)/Q2_STEP * (height + 10)/Q2_STEP]; //FIXME size
int threshold= (s->m.lambda * s->m.lambda) >> 6;
//FIXME pass the copy cleanly ?
// memcpy(dwt_buffer, buffer, height * stride * sizeof(DWTELEM));
ff_spatial_dwt(buffer, s->temp_dwt_buffer, width, height, stride, type, s->spatial_decomposition_count);
for(level=0; level<s->spatial_decomposition_count; level++){
for(orientation=level ? 1 : 0; orientation<4; orientation++){
SubBand *b= &p->band[level][orientation];
IDWTELEM *dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
DWTELEM *src= buffer + (b-> buf - s->spatial_dwt_buffer);
assert(src == b->buf); // code does not depend on this but it is true currently
quantize(s, b, dst, src, b->stride, s->qbias);
}
}
for(pass=0; pass<1; pass++){
if(s->qbias == 0) //keyframe
continue;
for(level=0; level<s->spatial_decomposition_count; level++){
for(orientation=level ? 1 : 0; orientation<4; orientation++){
SubBand *b= &p->band[level][orientation];
IDWTELEM *dst= idwt2_buffer + (b->ibuf - s->spatial_idwt_buffer);
IDWTELEM *best_dst= best_dequant + (b->ibuf - s->spatial_idwt_buffer);
for(ys= 0; ys<Q2_STEP; ys++){
for(xs= 0; xs<Q2_STEP; xs++){
memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
dequantize_all(s, p, idwt2_buffer, width, height);
ff_spatial_idwt(idwt2_buffer, s->temp_idwt_buffer, width, height, stride, type, s->spatial_decomposition_count);
find_sse(s, p, best_score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
memcpy(idwt2_buffer, best_dequant, height * stride * sizeof(IDWTELEM));
for(y=ys; y<b->height; y+= Q2_STEP){
for(x=xs; x<b->width; x+= Q2_STEP){
if(dst[x + y*b->stride]<0) dst[x + y*b->stride]++;
if(dst[x + y*b->stride]>0) dst[x + y*b->stride]--;
//FIXME try more than just --
}
}
dequantize_all(s, p, idwt2_buffer, width, height);
ff_spatial_idwt(idwt2_buffer, s->temp_idwt_buffer, width, height, stride, type, s->spatial_decomposition_count);
find_sse(s, p, score, score_stride, idwt2_buffer, s->spatial_idwt_buffer, level, orientation);
for(y=ys; y<b->height; y+= Q2_STEP){
for(x=xs; x<b->width; x+= Q2_STEP){
int score_idx= x/Q2_STEP + (y/Q2_STEP)*score_stride;
if(score[score_idx] <= best_score[score_idx] + threshold){
best_score[score_idx]= score[score_idx];
if(best_dst[x + y*b->stride]<0) best_dst[x + y*b->stride]++;
if(best_dst[x + y*b->stride]>0) best_dst[x + y*b->stride]--;
//FIXME copy instead
}
}
}
}
}
}
}
}
memcpy(s->spatial_idwt_buffer, best_dequant, height * stride * sizeof(IDWTELEM)); //FIXME work with that directly instead of copy at the end
}
#endif /* QUANTIZE2==1 */
static av_cold int encode_init(AVCodecContext *avctx) static av_cold int encode_init(AVCodecContext *avctx)
{ {
SnowContext *s = avctx->priv_data; SnowContext *s = avctx->priv_data;
@ -1842,10 +1725,7 @@ redo_frame:
} }
} }
/* if(QUANTIZE2) ff_spatial_dwt(s->spatial_dwt_buffer, s->temp_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
dwt_quantize(s, p, s->spatial_dwt_buffer, w, h, w, s->spatial_decomposition_type);
else*/
ff_spatial_dwt(s->spatial_dwt_buffer, s->temp_dwt_buffer, w, h, w, s->spatial_decomposition_type, s->spatial_decomposition_count);
if(s->pass1_rc && plane_index==0){ if(s->pass1_rc && plane_index==0){
int delta_qlog = ratecontrol_1pass(s, pic); int delta_qlog = ratecontrol_1pass(s, pic);
@ -1865,8 +1745,7 @@ redo_frame:
for(orientation=level ? 1 : 0; orientation<4; orientation++){ for(orientation=level ? 1 : 0; orientation<4; orientation++){
SubBand *b= &p->band[level][orientation]; SubBand *b= &p->band[level][orientation];
if(!QUANTIZE2) quantize(s, b, b->ibuf, b->buf, b->stride, s->qbias);
quantize(s, b, b->ibuf, b->buf, b->stride, s->qbias);
if(orientation==0) if(orientation==0)
decorrelate(s, b, b->ibuf, b->stride, pic->pict_type == AV_PICTURE_TYPE_P, 0); decorrelate(s, b, b->ibuf, b->stride, pic->pict_type == AV_PICTURE_TYPE_P, 0);
if (!s->no_bitstream) if (!s->no_bitstream)