From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D38664118C for ; Tue, 15 Feb 2022 08:54:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F88568B25F; Tue, 15 Feb 2022 10:54:55 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 435D568B21E for ; Tue, 15 Feb 2022 10:54:49 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 588F9240179 for ; Tue, 15 Feb 2022 09:54:48 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id LW65Hb5av0lV for ; Tue, 15 Feb 2022 09:54:47 +0100 (CET) Received: from lain.red.khirnov.net (lain.red.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.red.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 945EE240175 for ; Tue, 15 Feb 2022 09:54:47 +0100 (CET) Received: by lain.red.khirnov.net (Postfix, from userid 1000) id D0EB41601AD; Tue, 15 Feb 2022 09:54:47 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: <20210115045832.76405-1-borbarak@fb.com> =?utf-8?q?=3CMN2PR15MB2?= =?utf-8?q?605F2669A411F794B6C2B40B5A70=40MN2PR15MB2605=2Enamprd15=2Eprod=2E?= =?utf-8?q?outlook=2Ecom=3E_=3CMR3WgJJ--3-2=40lynne=2Eee=3E_=3CMN2PR15MB2605?= =?utf-8?q?997AC36969E5639782C4B5A30=40MN2PR15MB2605=2Enamprd15=2Eprod=2Eout?= =?utf-8?q?look=2Ecom=3E?= <3fa8e9b2-6824-eb3a-2390-22fd024efa9f@mail.de> <164363001951.23111.4989616914372511566@lain.red.khirnov.net> Mail-Followup-To: FFmpeg development discussions and patches Date: Tue, 15 Feb 2022 09:54:47 +0100 Message-ID: <164491528780.19727.15494655440668021866@lain.red.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avfilter: Added siti filter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting Thilo Borgmann (2022-02-12 11:55:39) > Am 31.01.22 um 12:55 schrieb James Almer: > +static int config_input(AVFilterLink *inlink) > +{ > + // Video input data avilable > + AVFilterContext *ctx = inlink->dst; > + SiTiContext *s = ctx->priv; > + int max_pixsteps[4]; > + size_t pixel_sz; > + size_t data_sz; > + size_t gradient_sz; > + size_t motion_sz; > + > + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); > + av_image_fill_max_pixsteps(max_pixsteps, NULL, desc); > + > + s->pixel_depth = max_pixsteps[0]; > + s->width = inlink->w; > + s->height = inlink->h; > + pixel_sz = s->pixel_depth == 1 ? sizeof(uint8_t) : sizeof(uint16_t); > + data_sz = s->width * pixel_sz * s->height; > + > + s->prev_frame = av_malloc(data_sz); > + > + gradient_sz = (s->width - 2) * sizeof(double) * (s->height - 2); > + s->gradient_matrix = (double*)av_malloc(gradient_sz); > + > + motion_sz = s->width * sizeof(double) * s->height; > + s->motion_matrix = (double*)av_malloc(motion_sz); useless casts > + > + if (!s->prev_frame || ! s->gradient_matrix || !s->motion_matrix) { > + av_freep(&s->prev_frame); > + av_freep(&s->gradient_matrix); > + av_freep(&s->motion_matrix); You don't need to free them on failure, that will be done in uninit. But you should free them at the beginning of this function, because config_input can be called multiple times. > +// Applies sobel convolution > +static void convolve_sobel(SiTiContext *s, const uint8_t *src, double *dst, int linesize) > +{ > + double x_conv_sum; > + double y_conv_sum; > + double gradient; > + int ki; > + int kj; > + int index; > + uint16_t data; > + int filter_width = 3; > + int filter_size = filter_width * filter_width; > + int stride = linesize / s->pixel_depth; > + > + // Dst matrix is smaller than src since we ignore edges that can't be convolved > + #define CONVOLVE(bps) \ > + { \ > + uint##bps##_t *vsrc = (uint##bps##_t*)src; \ > + for (int j = 1; j < s->height - 1; j++) { \ > + for (int i = 1; i < s->width - 1; i++) { \ > + x_conv_sum = 0.0; \ > + y_conv_sum = 0.0; \ > + for (int k = 0; k < filter_size; k++) { \ > + ki = k % filter_width - 1; \ > + kj = floor(k / filter_width) - 1; \ > + index = (j + kj) * stride + (i + ki); \ > + data = convert_full_range(s, vsrc[index]); \ Pass bps as a parameter to convert_full_range() instead of accessing s->pixel_depth, so the compiler can optimize the branch away. > +// Calculate pixel difference between current and previous frame, and update previous > +static void calculate_motion(SiTiContext *s, const uint8_t *curr, > + double *motion_matrix, int linesize) > +{ > + int stride = linesize / s->pixel_depth; > + double motion; > + int curr_index; > + int prev_index; > + uint16_t curr_data; > + > + // Previous frame is already converted to full range > + #define CALCULATE(bps) \ > + { \ > + uint##bps##_t *vsrc = (uint##bps##_t*)curr; \ > + for (int j = 0; j < s->height; j++) { \ > + for (int i = 0; i < s->width; i++) { \ > + motion = 0; \ > + curr_index = j * stride + i; \ > + prev_index = j * s->width + i; \ > + curr_data = convert_full_range(s, vsrc[curr_index]); \ > + if (s->nb_frames > 1) \ > + motion = curr_data - s->prev_frame[prev_index]; \ > + s->prev_frame[prev_index] = curr_data; \ previous code accessed this as uint8_t or uint16_t based on bps -- Anton Khirnov _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".