Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -45,6 +45,7 @@ typedef struct VIFContext { · 44 unmodified lines | ||
| 45 | 45 | int width; |
| 46 | 46 | int height; |
| 47 | 47 | int nb_threads; |
| 48 | + float factor; | |
| 48 | 49 | float *data_buf[13]; |
| 49 | 50 | float **temp; |
| 50 | 51 | float *ref_data; |
| @@ -113,8 +114,6 @@ static void vif_statistic(const float *mu1_sq, const float *mu2_sq, · 62 unmodified lines | ||
| 113 | 114 | float *num, float *den, int w, int h) |
| 114 | 115 | { |
| 115 | 116 | static const float sigma_nsq = 2; |
| 116 | − static const float sigma_max_inv = 4.0/(255.0*255.0); | |
| 117 | − | |
| 118 | 117 | float mu1_sq_val, mu2_sq_val, mu1_mu2_val, xx_filt_val, yy_filt_val, xy_filt_val; |
| 119 | 118 | float sigma1_sq, sigma2_sq, sigma12, g, sv_sq, eps = 1.0e-10f; |
| 120 | 119 | float gain_limit = 100.f; |
| @@ -409,13 +408,15 @@ static void offset_##bits##bit(VIFContext *s, \ · 288 unmodified lines | ||
| 409 | 408 | const type *ref_ptr = (const type *) ref->data[0]; \ |
| 410 | 409 | const type *main_ptr = (const type *) main->data[0]; \ |
| 411 | 410 | \ |
| 411 | + const float factor = s->factor; \ | |
| 412 | + \ | |
| 412 | 413 | float *ref_ptr_data = s->ref_data; \ |
| 413 | 414 | float *main_ptr_data = s->main_data; \ |
| 414 | 415 | \ |
| 415 | 416 | for (int i = 0; i < h; i++) { \ |
| 416 | 417 | 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; \ | |
| 419 | 420 | } \ |
| 420 | 421 | ref_ptr += ref_stride / sizeof(type); \ |
| 421 | 422 | ref_ptr_data += w; \ |
| @@ -425,7 +426,7 @@ static void offset_##bits##bit(VIFContext *s, \ · 3 unmodified lines | ||
| 425 | 426 | } |
| 426 | 427 | |
| 427 | 428 | offset_fn(uint8_t, 8) |
| 428 | −offset_fn(uint16_t, 10) | |
| 429 | +offset_fn(uint16_t, 16) | |
| 429 | 430 | |
| 430 | 431 | static void set_meta(AVDictionary **metadata, const char *key, float d) |
| 431 | 432 | { |
| @@ -440,10 +441,11 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) · 8 unmodified lines | ||
| 440 | 441 | AVDictionary **metadata = &main->metadata; |
| 441 | 442 | float score[4]; |
| 442 | 443 | |
| 444 | + s->factor = 1.f / (1 << (s->desc->comp[0].depth - 8)); | |
| 443 | 445 | if (s->desc->comp[0].depth <= 8) { |
| 444 | 446 | offset_8bit(s, ref, main, s->width); |
| 445 | 447 | } else { |
| 446 | − offset_10bit(s, ref, main, s->width); | |
| 448 | + offset_16bit(s, ref, main, s->width); | |
| 447 | 449 | } |
| 448 | 450 | |
| 449 | 451 | ff_compute_vif2(ctx, |
| @@ -471,8 +473,14 @@ static AVFrame *do_vif(AVFilterContext *ctx, AVFrame *main, const AVFrame *ref) · 21 unmodified lines | ||
| 471 | 473 | static int query_formats(AVFilterContext *ctx) |
| 472 | 474 | { |
| 473 | 475 | 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), | |
| 476 | 484 | AV_PIX_FMT_NONE |
| 477 | 485 | }; |
| 478 | 486 | |