Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

vf_hqdn3d: cosmetics

Browse Source 
Change code style to match the rest of libav.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
pull/28/head
Loren Merritt 13 years ago committed by Ronald S. Bultje
parent dcb7ef5483
commit 60b9785530
1 changed files with 152 additions and 156 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 308
      libavfilter/vf_hqdn3d.c

308
libavfilter/vf_hqdn3d.c
Unescape View File

@ -32,165 +32,161 @@
#include "video.h" #include "video.h"
typedef struct { typedef struct {
int Coefs[4][512*16]; int coefs[4][512*16];
unsigned int *Line; uint32_t *line;
unsigned short *Frame[3]; uint16_t *frame_prev[3];
int hsub, vsub; int hsub, vsub;
} HQDN3DContext; } HQDN3DContext;
static inline unsigned int LowPassMul(unsigned int PrevMul, unsigned int CurrMul, int *Coef) static inline uint32_t lowpass(unsigned int prev, unsigned int cur, int *coef)
{ {
// int dMul= (PrevMul&0xFFFFFF)-(CurrMul&0xFFFFFF); int dmul = prev-cur;
int dMul= PrevMul-CurrMul; unsigned int d = (dmul+0x10007FF)>>12; // 0x1000 to convert to unsigned, 7FF for rounding
unsigned int d=((dMul+0x10007FF)>>12); return cur + coef[d];
return CurrMul + Coef[d];
} }
static void deNoiseTemporal(unsigned char *FrameSrc, static void denoise_temporal(uint8_t *src, uint8_t *dst,
unsigned char *FrameDest, uint16_t *frame_ant,
unsigned short *FrameAnt, int w, int h, int sstride, int dstride,
int W, int H, int sStride, int dStride, int *temporal)
int *Temporal)
{ {
long X, Y; long x, y;
unsigned int PixelDst; uint32_t pixel;
for (Y = 0; Y < H; Y++) { for (y = 0; y < h; y++) {
for (X = 0; X < W; X++) { for (x = 0; x < w; x++) {
PixelDst = LowPassMul(FrameAnt[X]<<8, FrameSrc[X]<<16, Temporal); pixel = lowpass(frame_ant[x]<<8, src[x]<<16, temporal);
FrameAnt[X] = ((PixelDst+0x1000007F)>>8); frame_ant[x] = ((pixel+0x1000007F)>>8);
FrameDest[X]= ((PixelDst+0x10007FFF)>>16); dst[x]= ((pixel+0x10007FFF)>>16);
} }
FrameSrc += sStride; src += sstride;
FrameDest += dStride; dst += dstride;
FrameAnt += W; frame_ant += w;
} }
} }
static void deNoiseSpacial(unsigned char *Frame, static void denoise_spatial(uint8_t *src, uint8_t *dst,
unsigned char *FrameDest, uint32_t *line_ant,
unsigned int *LineAnt, int w, int h, int sstride, int dstride,
int W, int H, int sStride, int dStride, int *horizontal, int *vertical)
int *Horizontal, int *Vertical)
{ {
long X, Y; long x, y;
long sLineOffs = 0, dLineOffs = 0; long sline_offs = 0, dline_offs = 0;
unsigned int PixelAnt; uint32_t pixel_ant;
unsigned int PixelDst; uint32_t pixel;
/* First pixel has no left nor top neighbor. */ /* First pixel has no left nor top neighbor. */
PixelDst = LineAnt[0] = PixelAnt = Frame[0]<<16; pixel = line_ant[0] = pixel_ant = src[0]<<16;
FrameDest[0]= ((PixelDst+0x10007FFF)>>16); dst[0]= ((pixel+0x10007FFF)>>16);
/* First line has no top neighbor, only left. */ /* First line has no top neighbor, only left. */
for (X = 1; X < W; X++) { for (x = 1; x < w; x++) {
PixelDst = LineAnt[X] = LowPassMul(PixelAnt, Frame[X]<<16, Horizontal); pixel = line_ant[x] = lowpass(pixel_ant, src[x]<<16, horizontal);
FrameDest[X]= ((PixelDst+0x10007FFF)>>16); dst[x]= ((pixel+0x10007FFF)>>16);
} }
for (Y = 1; Y < H; Y++) { for (y = 1; y < h; y++) {
unsigned int PixelAnt; uint32_t pixel_ant;
sLineOffs += sStride, dLineOffs += dStride; sline_offs += sstride, dline_offs += dstride;
/* First pixel on each line doesn't have previous pixel */ /* First pixel on each line doesn't have previous pixel */
PixelAnt = Frame[sLineOffs]<<16; pixel_ant = src[sline_offs]<<16;
PixelDst = LineAnt[0] = LowPassMul(LineAnt[0], PixelAnt, Vertical); pixel = line_ant[0] = lowpass(line_ant[0], pixel_ant, vertical);
FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16); dst[dline_offs]= ((pixel+0x10007FFF)>>16);
for (X = 1; X < W; X++) { for (x = 1; x < w; x++) {
unsigned int PixelDst; uint32_t pixel;
/* The rest are normal */ /* The rest are normal */
PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal); pixel_ant = lowpass(pixel_ant, src[sline_offs+x]<<16, horizontal);
PixelDst = LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical); pixel = line_ant[x] = lowpass(line_ant[x], pixel_ant, vertical);
FrameDest[dLineOffs+X]= ((PixelDst+0x10007FFF)>>16); dst[dline_offs+x]= ((pixel+0x10007FFF)>>16);
} }
} }
} }
static void deNoise(unsigned char *Frame, static void denoise(uint8_t *src, uint8_t *dst,
unsigned char *FrameDest, uint32_t *line_ant, uint16_t **frame_ant_ptr,
unsigned int *LineAnt, int w, int h, int sstride, int dstride,
unsigned short **FrameAntPtr, int *horizontal, int *vertical, int *temporal)
int W, int H, int sStride, int dStride,
int *Horizontal, int *Vertical, int *Temporal)
{ {
long X, Y; long x, y;
long sLineOffs = 0, dLineOffs = 0; long sline_offs = 0, dline_offs = 0;
unsigned int PixelAnt; uint32_t pixel_ant;
unsigned int PixelDst; uint32_t pixel;
unsigned short* FrameAnt=(*FrameAntPtr); uint16_t *frame_ant = *frame_ant_ptr;
if (!FrameAnt) { if (!frame_ant) {
(*FrameAntPtr) = FrameAnt = av_malloc(W*H*sizeof(unsigned short)); *frame_ant_ptr = frame_ant = av_malloc(w*h*sizeof(uint16_t));
for (Y = 0; Y < H; Y++) { for (y = 0; y < h; y++) {
unsigned short* dst=&FrameAnt[Y*W]; uint16_t *frame_dst = frame_ant+y*w;
unsigned char* src=Frame+Y*sStride; uint8_t *frame_src = src+y*sstride;
for (X = 0; X < W; X++) dst[X]=src[X]<<8; for (x = 0; x < w; x++)
frame_dst[x] = frame_src[x]<<8;
} }
} }
if (!Horizontal[0] && !Vertical[0]) { if (!horizontal[0] && !vertical[0]) {
deNoiseTemporal(Frame, FrameDest, FrameAnt, denoise_temporal(src, dst, frame_ant,
W, H, sStride, dStride, Temporal); w, h, sstride, dstride, temporal);
return; return;
} }
if (!Temporal[0]) { if (!temporal[0]) {
deNoiseSpacial(Frame, FrameDest, LineAnt, denoise_spatial(src, dst, line_ant,
W, H, sStride, dStride, Horizontal, Vertical); w, h, sstride, dstride, horizontal, vertical);
return; return;
} }
/* First pixel has no left nor top neighbor. Only previous frame */ /* First pixel has no left nor top neighbor. Only previous frame */
LineAnt[0] = PixelAnt = Frame[0]<<16; line_ant[0] = pixel_ant = src[0]<<16;
PixelDst = LowPassMul(FrameAnt[0]<<8, PixelAnt, Temporal); pixel = lowpass(frame_ant[0]<<8, pixel_ant, temporal);
FrameAnt[0] = ((PixelDst+0x1000007F)>>8); frame_ant[0] = ((pixel+0x1000007F)>>8);
FrameDest[0]= ((PixelDst+0x10007FFF)>>16); dst[0]= ((pixel+0x10007FFF)>>16);
/* First line has no top neighbor. Only left one for each pixel and /* First line has no top neighbor. Only left one for each pixel and
* last frame */ * last frame */
for (X = 1; X < W; X++) { for (x = 1; x < w; x++) {
LineAnt[X] = PixelAnt = LowPassMul(PixelAnt, Frame[X]<<16, Horizontal); line_ant[x] = pixel_ant = lowpass(pixel_ant, src[x]<<16, horizontal);
PixelDst = LowPassMul(FrameAnt[X]<<8, PixelAnt, Temporal); pixel = lowpass(frame_ant[x]<<8, pixel_ant, temporal);
FrameAnt[X] = ((PixelDst+0x1000007F)>>8); frame_ant[x] = ((pixel+0x1000007F)>>8);
FrameDest[X]= ((PixelDst+0x10007FFF)>>16); dst[x]= ((pixel+0x10007FFF)>>16);
} }
for (Y = 1; Y < H; Y++) { for (y = 1; y < h; y++) {
unsigned int PixelAnt; uint32_t pixel_ant;
unsigned short* LinePrev=&FrameAnt[Y*W]; uint16_t *line_prev = frame_ant+y*w;
sLineOffs += sStride, dLineOffs += dStride; sline_offs += sstride, dline_offs += dstride;
/* First pixel on each line doesn't have previous pixel */ /* First pixel on each line doesn't have previous pixel */
PixelAnt = Frame[sLineOffs]<<16; pixel_ant = src[sline_offs]<<16;
LineAnt[0] = LowPassMul(LineAnt[0], PixelAnt, Vertical); line_ant[0] = lowpass(line_ant[0], pixel_ant, vertical);
PixelDst = LowPassMul(LinePrev[0]<<8, LineAnt[0], Temporal); pixel = lowpass(line_prev[0]<<8, line_ant[0], temporal);
LinePrev[0] = ((PixelDst+0x1000007F)>>8); line_prev[0] = ((pixel+0x1000007F)>>8);
FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16); dst[dline_offs]= ((pixel+0x10007FFF)>>16);
for (X = 1; X < W; X++) { for (x = 1; x < w; x++) {
unsigned int PixelDst; uint32_t pixel;
/* The rest are normal */ /* The rest are normal */
PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal); pixel_ant = lowpass(pixel_ant, src[sline_offs+x]<<16, horizontal);
LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical); line_ant[x] = lowpass(line_ant[x], pixel_ant, vertical);
PixelDst = LowPassMul(LinePrev[X]<<8, LineAnt[X], Temporal); pixel = lowpass(line_prev[x]<<8, line_ant[x], temporal);
LinePrev[X] = ((PixelDst+0x1000007F)>>8); line_prev[x] = ((pixel+0x1000007F)>>8);
FrameDest[dLineOffs+X]= ((PixelDst+0x10007FFF)>>16); dst[dline_offs+x]= ((pixel+0x10007FFF)>>16);
} }
} }
} }
static void PrecalcCoefs(int *Ct, double Dist25) static void precalc_coefs(int *ct, double dist25)
{ {
int i; int i;
double Gamma, Simil, C; double gamma, simil, C;
Gamma = log(0.25) / log(1.0 - Dist25/255.0 - 0.00001); gamma = log(0.25) / log(1.0 - dist25/255.0 - 0.00001);
for (i = -255*16; i <= 255*16; i++) { for (i = -255*16; i <= 255*16; i++) {
Simil = 1.0 - FFABS(i) / (16*255.0); simil = 1.0 - FFABS(i) / (16*255.0);
C = pow(Simil, Gamma) * 65536.0 * i / 16.0; C = pow(simil, gamma) * 65536.0 * i / 16.0;
Ct[16*256+i] = lrint(C); ct[16*256+i] = lrint(C);
} }
Ct[0] = !!Dist25; ct[0] = !!dist25;
} }
#define PARAM1_DEFAULT 4.0 #define PARAM1_DEFAULT 4.0
@ -200,57 +196,57 @@ static void PrecalcCoefs(int *Ct, double Dist25)
static int init(AVFilterContext *ctx, const char *args) static int init(AVFilterContext *ctx, const char *args)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *hqdn3d = ctx->priv;
double LumSpac, LumTmp, ChromSpac, ChromTmp; double lum_spac, lum_tmp, chrom_spac, chrom_tmp;
double Param1, Param2, Param3, Param4; double param1, param2, param3, param4;
LumSpac = PARAM1_DEFAULT; lum_spac = PARAM1_DEFAULT;
ChromSpac = PARAM2_DEFAULT; chrom_spac = PARAM2_DEFAULT;
LumTmp = PARAM3_DEFAULT; lum_tmp = PARAM3_DEFAULT;
ChromTmp = LumTmp * ChromSpac / LumSpac; chrom_tmp = lum_tmp * chrom_spac / lum_spac;
if (args) { if (args) {
switch (sscanf(args, "%lf:%lf:%lf:%lf", switch (sscanf(args, "%lf:%lf:%lf:%lf",
&Param1, &Param2, &Param3, &Param4)) { &param1, &param2, &param3, &param4)) {
case 1: case 1:
LumSpac = Param1; lum_spac = param1;
ChromSpac = PARAM2_DEFAULT * Param1 / PARAM1_DEFAULT; chrom_spac = PARAM2_DEFAULT * param1 / PARAM1_DEFAULT;
LumTmp = PARAM3_DEFAULT * Param1 / PARAM1_DEFAULT; lum_tmp = PARAM3_DEFAULT * param1 / PARAM1_DEFAULT;
ChromTmp = LumTmp * ChromSpac / LumSpac; chrom_tmp = lum_tmp * chrom_spac / lum_spac;
break; break;
case 2: case 2:
LumSpac = Param1; lum_spac = param1;
ChromSpac = Param2; chrom_spac = param2;
LumTmp = PARAM3_DEFAULT * Param1 / PARAM1_DEFAULT; lum_tmp = PARAM3_DEFAULT * param1 / PARAM1_DEFAULT;
ChromTmp = LumTmp * ChromSpac / LumSpac; chrom_tmp = lum_tmp * chrom_spac / lum_spac;
break; break;
case 3: case 3:
LumSpac = Param1; lum_spac = param1;
ChromSpac = Param2; chrom_spac = param2;
LumTmp = Param3; lum_tmp = param3;
ChromTmp = LumTmp * ChromSpac / LumSpac; chrom_tmp = lum_tmp * chrom_spac / lum_spac;
break; break;
case 4: case 4:
LumSpac = Param1; lum_spac = param1;
ChromSpac = Param2; chrom_spac = param2;
LumTmp = Param3; lum_tmp = param3;
ChromTmp = Param4; chrom_tmp = param4;
break; break;
} }
} }
av_log(ctx, AV_LOG_VERBOSE, "ls:%lf cs:%lf lt:%lf ct:%lf\n", av_log(ctx, AV_LOG_VERBOSE, "ls:%lf cs:%lf lt:%lf ct:%lf\n",
LumSpac, ChromSpac, LumTmp, ChromTmp); lum_spac, chrom_spac, lum_tmp, chrom_tmp);
if (LumSpac < 0 || ChromSpac < 0 || isnan(ChromTmp)) { if (lum_spac < 0 || chrom_spac < 0 || isnan(chrom_tmp)) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Invalid negative value for luma or chroma spatial strength, " "Invalid negative value for luma or chroma spatial strength, "
"or resulting value for chroma temporal strength is nan.\n"); "or resulting value for chroma temporal strength is nan.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
PrecalcCoefs(hqdn3d->Coefs[0], LumSpac); precalc_coefs(hqdn3d->coefs[0], lum_spac);
PrecalcCoefs(hqdn3d->Coefs[1], LumTmp); precalc_coefs(hqdn3d->coefs[1], lum_tmp);
PrecalcCoefs(hqdn3d->Coefs[2], ChromSpac); precalc_coefs(hqdn3d->coefs[2], chrom_spac);
PrecalcCoefs(hqdn3d->Coefs[3], ChromTmp); precalc_coefs(hqdn3d->coefs[3], chrom_tmp);
return 0; return 0;
} }
@ -259,10 +255,10 @@ static void uninit(AVFilterContext *ctx)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *hqdn3d = ctx->priv;
av_freep(&hqdn3d->Line); av_freep(&hqdn3d->line);
av_freep(&hqdn3d->Frame[0]); av_freep(&hqdn3d->frame_prev[0]);
av_freep(&hqdn3d->Frame[1]); av_freep(&hqdn3d->frame_prev[1]);
av_freep(&hqdn3d->Frame[2]); av_freep(&hqdn3d->frame_prev[2]);
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
@ -283,8 +279,8 @@ static int config_input(AVFilterLink *inlink)
hqdn3d->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w; hqdn3d->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w;
hqdn3d->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h; hqdn3d->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h;
hqdn3d->Line = av_malloc(inlink->w * sizeof(*hqdn3d->Line)); hqdn3d->line = av_malloc(inlink->w * sizeof(*hqdn3d->line));
if (!hqdn3d->Line) if (!hqdn3d->line)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return 0; return 0;
@ -305,24 +301,24 @@ static int end_frame(AVFilterLink *inlink)
int ch = inpic->video->h >> hqdn3d->vsub; int ch = inpic->video->h >> hqdn3d->vsub;
int ret; int ret;
deNoise(inpic->data[0], outpic->data[0], denoise(inpic->data[0], outpic->data[0],
hqdn3d->Line, &hqdn3d->Frame[0], inpic->video->w, inpic->video->h, hqdn3d->line, &hqdn3d->frame_prev[0], inpic->video->w, inpic->video->h,
inpic->linesize[0], outpic->linesize[0], inpic->linesize[0], outpic->linesize[0],
hqdn3d->Coefs[0], hqdn3d->coefs[0],
hqdn3d->Coefs[0], hqdn3d->coefs[0],
hqdn3d->Coefs[1]); hqdn3d->coefs[1]);
deNoise(inpic->data[1], outpic->data[1], denoise(inpic->data[1], outpic->data[1],
hqdn3d->Line, &hqdn3d->Frame[1], cw, ch, hqdn3d->line, &hqdn3d->frame_prev[1], cw, ch,
inpic->linesize[1], outpic->linesize[1], inpic->linesize[1], outpic->linesize[1],
hqdn3d->Coefs[2], hqdn3d->coefs[2],
hqdn3d->Coefs[2], hqdn3d->coefs[2],
hqdn3d->Coefs[3]); hqdn3d->coefs[3]);
deNoise(inpic->data[2], outpic->data[2], denoise(inpic->data[2], outpic->data[2],
hqdn3d->Line, &hqdn3d->Frame[2], cw, ch, hqdn3d->line, &hqdn3d->frame_prev[2], cw, ch,
inpic->linesize[2], outpic->linesize[2], inpic->linesize[2], outpic->linesize[2],
hqdn3d->Coefs[2], hqdn3d->coefs[2],
hqdn3d->Coefs[2], hqdn3d->coefs[2],
hqdn3d->Coefs[3]); hqdn3d->coefs[3]);
if ((ret = ff_draw_slice(outlink, 0, inpic->video->h, 1)) < 0 || if ((ret = ff_draw_slice(outlink, 0, inpic->video->h, 1)) < 0 ||
(ret = ff_end_frame(outlink)) < 0) (ret = ff_end_frame(outlink)) < 0)

Write Preview
Loading…
Cancel
Save