History

avfilter/vf_vif: add support for more formats

Paul B Mahol committed 5 years ago

Commit 95af3b61 parent 550b7a91 file · +16 −8Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/vf_vif.c+16−8
@@ -45,6 +45,7 @@ typedef struct VIFContext { · 44 unmodified lines
4545 int width;
4646 int height;
4747 int nb_threads;
48+ float factor;
4849 float *data_buf[13];
4950 float **temp;
5051 float *ref_data;
@@ -113,8 +114,6 @@ static void vif_statistic(const float *mu1_sq, const float *mu2_sq, · 62 unmodified lines
113114 float *num, float *den, int w, int h)
114115 {
115116 static const float sigma_nsq = 2;
116− static const float sigma_max_inv = 4.0/(255.0*255.0);
117−
118117 float mu1_sq_val, mu2_sq_val, mu1_mu2_val, xx_filt_val, yy_filt_val, xy_filt_val;
119118 float sigma1_sq, sigma2_sq, sigma12, g, sv_sq, eps = 1.0e-10f;
120119 float gain_limit = 100.f;
@@ -409,13 +408,15 @@ static void offset_##bits##bit(VIFContext *s, \ · 288 unmodified lines
409408 const type *ref_ptr = (const type *) ref->data[0]; \
410409 const type *main_ptr = (const type *) main->data[0]; \
411410 \
411+ const float factor = s->factor; \
412+ \
412413 float *ref_ptr_data = s->ref_data; \
413414 float *main_ptr_data = s->main_data; \
414415 \
415416 for (int i = 0; i < h; i++) { \
416417 for (int j = 0; j < w; j++) { \
417− ref_ptr_data[j] = ref_ptr[j] - 128.f; \
418− main_ptr_data[j] = main_ptr[j] - 128.f; \
418+ ref_ptr_data[j] = ref_ptr[j] * factor - 128.f; \
419+ main_ptr_data[j] = main_ptr[j] * factor - 128.f; \
419420 } \
420421 ref_ptr += ref_stride / sizeof(type); \
421422 ref_ptr_data += w; \
@@ -425,7 +426,7 @@ static void offset_##bits##bit(VIFContext *s, \ · 3 unmodified lines
425426 }
426427
427428 offset_fn(uint8_t, 8)
428−offset_fn(uint16_t, 10)
429+offset_fn(uint16_t, 16)
429430
430431 static void set_meta(AVDictionary **metadata, const char *key, float d)
431432 {
@@ -440,10 +441,11 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) · 8 unmodified lines
440441 AVDictionary **metadata = &main->metadata;
441442 float score[4];
442443
444+ s->factor = 1.f / (1 << (s->desc->comp[0].depth - 8));
443445 if (s->desc->comp[0].depth <= 8) {
444446 offset_8bit(s, ref, main, s->width);
445447 } else {
446− offset_10bit(s, ref, main, s->width);
448+ offset_16bit(s, ref, main, s->width);
447449 }
448450
449451 ff_compute_vif2(ctx,
@@ -471,8 +473,14 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) · 21 unmodified lines
471473 static int query_formats(AVFilterContext *ctx)
472474 {
473475 static const enum AVPixelFormat pix_fmts[] = {
474− AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
475− AV_PIX_FMT_YUV444P10LE, AV_PIX_FMT_YUV422P10LE, AV_PIX_FMT_YUV420P10LE,
476+ AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10,
477+ AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16,
478+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P,
479+ AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
480+ AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P,
481+ AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ444P,
482+#define PF(suf) AV_PIX_FMT_YUV420##suf, AV_PIX_FMT_YUV422##suf, AV_PIX_FMT_YUV444##suf
483+ PF(P9), PF(P10), PF(P12), PF(P14), PF(P16),
476484 AV_PIX_FMT_NONE
477485 };
478486

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t