Skip to content

F
ffmpeg
Commit 56e4ce0d authored by Anton Khirnov's avatar Anton Khirnov
Browse files
Options

vf_hqdn3d: use the name 's' for the pointer to the private context 

This is shorter and consistent across filters.
parent 7af5ae2d
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 42 deletions
libavfilter/vf_hqdn3d.c
View file @ 56e4ce0d
...@@ -77,7 +77,7 @@ static void denoise_temporal(uint8_t *src, uint8_t *dst, ...@@ -77,7 +77,7 @@ static void denoise_temporal(uint8_t *src, uint8_t *dst,
} }
av_always_inline av_always_inline
static void denoise_spatial(HQDN3DContext *hqdn3d, static void denoise_spatial(HQDN3DContext *s,
uint8_t *src, uint8_t *dst, uint8_t *src, uint8_t *dst,
uint16_t *line_ant, uint16_t *frame_ant, uint16_t *line_ant, uint16_t *frame_ant,
int w, int h, int sstride, int dstride, int w, int h, int sstride, int dstride,
...@@ -103,8 +103,8 @@ static void denoise_spatial(HQDN3DContext *hqdn3d, ...@@ -103,8 +103,8 @@ static void denoise_spatial(HQDN3DContext *hqdn3d,
src += sstride; src += sstride;
dst += dstride; dst += dstride;
frame_ant += w; frame_ant += w;
if (hqdn3d->denoise_row[depth]) { if (s->denoise_row[depth]) {
hqdn3d->denoise_row[depth](src, dst, line_ant, frame_ant, w, spatial, temporal); s->denoise_row[depth](src, dst, line_ant, frame_ant, w, spatial, temporal);
continue; continue;
} }
pixel_ant = LOAD(0); pixel_ant = LOAD(0);
...@@ -121,7 +121,7 @@ static void denoise_spatial(HQDN3DContext *hqdn3d, ...@@ -121,7 +121,7 @@ static void denoise_spatial(HQDN3DContext *hqdn3d,
} }
av_always_inline av_always_inline
static void denoise_depth(HQDN3DContext *hqdn3d, static void denoise_depth(HQDN3DContext *s,
uint8_t *src, uint8_t *dst, uint8_t *src, uint8_t *dst,
uint16_t *line_ant, uint16_t **frame_ant_ptr, uint16_t *line_ant, uint16_t **frame_ant_ptr,
int w, int h, int sstride, int dstride, int w, int h, int sstride, int dstride,
...@@ -142,7 +142,7 @@ static void denoise_depth(HQDN3DContext *hqdn3d, ...@@ -142,7 +142,7 @@ static void denoise_depth(HQDN3DContext *hqdn3d,
} }
if (spatial[0]) if (spatial[0])
denoise_spatial(hqdn3d, src, dst, line_ant, frame_ant, denoise_spatial(s, src, dst, line_ant, frame_ant,
w, h, sstride, dstride, spatial, temporal, depth); w, h, sstride, dstride, spatial, temporal, depth);
else else
denoise_temporal(src, dst, frame_ant, denoise_temporal(src, dst, frame_ant,
...@@ -150,7 +150,7 @@ static void denoise_depth(HQDN3DContext *hqdn3d, ...@@ -150,7 +150,7 @@ static void denoise_depth(HQDN3DContext *hqdn3d,
} }
#define denoise(...) \ #define denoise(...) \
switch (hqdn3d->depth) {\ switch (s->depth) {\
case 8: denoise_depth(__VA_ARGS__, 8); break;\ case 8: denoise_depth(__VA_ARGS__, 8); break;\
case 9: denoise_depth(__VA_ARGS__, 9); break;\ case 9: denoise_depth(__VA_ARGS__, 9); break;\
case 10: denoise_depth(__VA_ARGS__, 10); break;\ case 10: denoise_depth(__VA_ARGS__, 10); break;\
...@@ -184,36 +184,36 @@ static int16_t *precalc_coefs(double dist25, int depth) ...@@ -184,36 +184,36 @@ static int16_t *precalc_coefs(double dist25, int depth)
static av_cold int init(AVFilterContext *ctx) static av_cold int init(AVFilterContext *ctx)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *s = ctx->priv;
if (!hqdn3d->strength[LUMA_SPATIAL]) if (!s->strength[LUMA_SPATIAL])
hqdn3d->strength[LUMA_SPATIAL] = PARAM1_DEFAULT; s->strength[LUMA_SPATIAL] = PARAM1_DEFAULT;
if (!hqdn3d->strength[CHROMA_SPATIAL]) if (!s->strength[CHROMA_SPATIAL])
hqdn3d->strength[CHROMA_SPATIAL] = PARAM2_DEFAULT * hqdn3d->strength[LUMA_SPATIAL] / PARAM1_DEFAULT; s->strength[CHROMA_SPATIAL] = PARAM2_DEFAULT * s->strength[LUMA_SPATIAL] / PARAM1_DEFAULT;
if (!hqdn3d->strength[LUMA_TMP]) if (!s->strength[LUMA_TMP])
hqdn3d->strength[LUMA_TMP] = PARAM3_DEFAULT * hqdn3d->strength[LUMA_SPATIAL] / PARAM1_DEFAULT; s->strength[LUMA_TMP] = PARAM3_DEFAULT * s->strength[LUMA_SPATIAL] / PARAM1_DEFAULT;
if (!hqdn3d->strength[CHROMA_TMP]) if (!s->strength[CHROMA_TMP])
hqdn3d->strength[CHROMA_TMP] = hqdn3d->strength[LUMA_TMP] * hqdn3d->strength[CHROMA_SPATIAL] / hqdn3d->strength[LUMA_SPATIAL]; s->strength[CHROMA_TMP] = s->strength[LUMA_TMP] * s->strength[CHROMA_SPATIAL] / s->strength[LUMA_SPATIAL];
av_log(ctx, AV_LOG_VERBOSE, "ls:%f cs:%f lt:%f ct:%f\n", av_log(ctx, AV_LOG_VERBOSE, "ls:%f cs:%f lt:%f ct:%f\n",
hqdn3d->strength[LUMA_SPATIAL], hqdn3d->strength[CHROMA_SPATIAL], s->strength[LUMA_SPATIAL], s->strength[CHROMA_SPATIAL],
hqdn3d->strength[LUMA_TMP], hqdn3d->strength[CHROMA_TMP]); s->strength[LUMA_TMP], s->strength[CHROMA_TMP]);
return 0; return 0;
} }
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
HQDN3DContext *hqdn3d = ctx->priv; HQDN3DContext *s = ctx->priv;
av_freep(&hqdn3d->coefs[0]); av_freep(&s->coefs[0]);
av_freep(&hqdn3d->coefs[1]); av_freep(&s->coefs[1]);
av_freep(&hqdn3d->coefs[2]); av_freep(&s->coefs[2]);
av_freep(&hqdn3d->coefs[3]); av_freep(&s->coefs[3]);
av_freep(&hqdn3d->line); av_freep(&s->line);
av_freep(&hqdn3d->frame_prev[0]); av_freep(&s->frame_prev[0]);
av_freep(&hqdn3d->frame_prev[1]); av_freep(&s->frame_prev[1]);
av_freep(&hqdn3d->frame_prev[2]); av_freep(&s->frame_prev[2]);
} }
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
...@@ -248,33 +248,33 @@ static int query_formats(AVFilterContext *ctx) ...@@ -248,33 +248,33 @@ static int query_formats(AVFilterContext *ctx)
static int config_input(AVFilterLink *inlink) static int config_input(AVFilterLink *inlink)
{ {
HQDN3DContext *hqdn3d = inlink->dst->priv; HQDN3DContext *s = inlink->dst->priv;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
int i; int i;
hqdn3d->hsub = desc->log2_chroma_w; s->hsub = desc->log2_chroma_w;
hqdn3d->vsub = desc->log2_chroma_h; s->vsub = desc->log2_chroma_h;
hqdn3d->depth = desc->comp[0].depth_minus1+1; s->depth = desc->comp[0].depth_minus1+1;
hqdn3d->line = av_malloc(inlink->w * sizeof(*hqdn3d->line)); s->line = av_malloc(inlink->w * sizeof(*s->line));
if (!hqdn3d->line) if (!s->line)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
hqdn3d->coefs[i] = precalc_coefs(hqdn3d->strength[i], hqdn3d->depth); s->coefs[i] = precalc_coefs(s->strength[i], s->depth);
if (!hqdn3d->coefs[i]) if (!s->coefs[i])
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (ARCH_X86) if (ARCH_X86)
ff_hqdn3d_init_x86(hqdn3d); ff_hqdn3d_init_x86(s);
return 0; return 0;
} }
static int filter_frame(AVFilterLink *inlink, AVFrame *in) static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{ {
HQDN3DContext *hqdn3d = inlink->dst->priv; HQDN3DContext *s = inlink->dst->priv;
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
AVFrame *out; AVFrame *out;
int direct, c; int direct, c;
...@@ -296,12 +296,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -296,12 +296,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
} }
for (c = 0; c < 3; c++) { for (c = 0; c < 3; c++) {
denoise(hqdn3d, in->data[c], out->data[c], denoise(s, in->data[c], out->data[c],
hqdn3d->line, &hqdn3d->frame_prev[c], s->line, &s->frame_prev[c],
in->width >> (!!c * hqdn3d->hsub), in->width >> (!!c * s->hsub),
in->height >> (!!c * hqdn3d->vsub), in->height >> (!!c * s->vsub),
in->linesize[c], out->linesize[c], in->linesize[c], out->linesize[c],
hqdn3d->coefs[c?2:0], hqdn3d->coefs[c?3:1]); s->coefs[c?2:0], s->coefs[c?3:1]);
} }
if (!direct) if (!direct)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment