On Sat, Oct 25, 2014 at 10:14 PM, arwa arif <arwaarif1...@gmail.com> wrote:
> Please ignore the previous mail. I attached the wrong patch. New patch is > attached with this mail. > > On Sat, Oct 25, 2014 at 10:06 PM, arwa arif <arwaarif1...@gmail.com> > wrote: > >> >> >> On Sat, Oct 25, 2014 at 1:01 AM, Michael Niedermayer <michae...@gmx.at> >> wrote: >> >>> On Fri, Oct 24, 2014 at 10:34:32PM +0530, arwa arif wrote: >>> > I have taken care of aal the things mentioned except the floating >>> point. I >>> > will update the floating point part till tomorrow. For now, I have >>> attached >>> > the patch updated till now. >>> [...] >>> >>> > vf_xbr.c | 418 >>> +++++++++++++++++++++++++++------------------------------------ >>> > 1 file changed, 181 insertions(+), 237 deletions(-) >>> > 6b1a6fc1ae74e0881cf0f9d1fb8831bd6aa77fa8 0001-xBR-filter.patch >>> > From 941bef1dcebbcfca5e6a665bfb744ee89599cc0e Mon Sep 17 00:00:00 2001 >>> > From: Arwa Arif <arwaarif1...@gmail.com> >>> > Date: Fri, 24 Oct 2014 22:31:34 +0530 >>> > Subject: [PATCH] xBR-filter >>> >>> please post a new patch instead of a patch on top of a previous >>> patch >>> >>> [...] >>> >>> -- >>> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB >>> >>> Awnsering whenever a program halts or runs forever is >>> On a turing machine, in general impossible (turings halting problem). >>> On any real computer, always possible as a real computer has a finite >>> number >>> of states N, and will either halt in less than N cycles or never halt. >>> >>> _______________________________________________ >>> ffmpeg-devel mailing list >>> ffmpeg-devel@ffmpeg.org >>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>> >>> >> >
From 739717795dded26f6f3fd44de81a2eee2bd9c838 Mon Sep 17 00:00:00 2001 From: Arwa Arif <arwaarif1...@gmail.com> Date: Sat, 25 Oct 2014 22:04:51 +0530 Subject: [PATCH] xBR-filter --- libavfilter/vf_xbr.c | 303 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 303 insertions(+) create mode 100644 libavfilter/vf_xbr.c diff --git a/libavfilter/vf_xbr.c b/libavfilter/vf_xbr.c new file mode 100644 index 0000000..6ebeff4 --- /dev/null +++ b/libavfilter/vf_xbr.c @@ -0,0 +1,303 @@ +/* + * This file is part of FFmpeg. + * + * Copyright (c) 2014 Arwa Arif <arwaarif1...@gmail.com> + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * XBR Filter is used for depixelization of image. + * This is based on Hyllian's 2xBR shader. + * 2xBR Filter v0.2.5 + * Reference : http://board.byuu.org/viewtopic.php?f=10&t=2248 + */ + +#include "libavutil/opt.h" +#include "libavutil/avassert.h" +#include "libavutil/pixdesc.h" +#include "internal.h" + +const int THRESHHOLD_Y = 48; +const int THRESHHOLD_U = 7; +const int THRESHHOLD_V = 6; + +/** +* Calculates the weight of difference of the pixels, by transforming these +* pixels into their Y'UV parts. It then uses the threshold used by HQx filters: +* 48*Y + 7*U + 6*V, to give it those smooth looking edges. +**/ +static int d(AVFrame *in,int x1,int y1,int x2,int y2){ + + int r1 = *(in->data[0] + y1 * in->linesize[0] + x1*3); + int g1 = *(in->data[0] + y1 * in->linesize[0] + x1*3 + 1); + int b1 = *(in->data[0] + y1 * in->linesize[0] + x1*3 + 2); + + int r2 = *(in->data[0] + y2 * in->linesize[0] + x2*3); + int g2 = *(in->data[0] + y2 * in->linesize[0] + x2*3 + 1); + int b2 = *(in->data[0] + y2 * in->linesize[0] + x2*3 + 2); + + int r = abs(r1 - r2); + int g = abs(g1 - g2); + int b = abs(b1 - b2); + + /*Convert RGB to Y'UV*/ + int y = ( ( 66 * r + 129 * g + 25 * b + 128) >> 8) + 16; + int u = ( ( -38 * r - 74 * g + 112 * b + 128) >> 8) + 128; + int v = ( ( 112 * r - 94 * g - 18 * b + 128) >> 8) + 128; + + /*Add HQx filters threshold & return*/ + return (y * THRESHHOLD_Y) + (u* THRESHHOLD_U) + (v* THRESHHOLD_V); +} + +/** +* Mixes a pixel A, with pixel B, with B's transperancy set to 'a' +* In other words, A is a solid color (bottom) and B is a transparent color (top) +**/ +static int mix(AVFrame *in,int x1,int y1,int x2,int y2,int a,int mode){ + /*If red color*/ + int col1,col2; + if(mode==0){ + col1 = *(in->data[0] + y1 * in->linesize[0] + x1*3); + col2 = *(in->data[0] + y2 * in->linesize[0] + x2*3); + } + + /*If green color*/ + else if(mode==1){ + col1 = *(in->data[0] + y1 * in->linesize[0] + x1*3 + 1); + col2 = *(in->data[0] + y2 * in->linesize[0] + x2*3 + 1); + } + + /*If blue color*/ + else{ + col1 = *(in->data[0] + y1 * in->linesize[0] + x1*3 + 2); + col2 = *(in->data[0] + y2 * in->linesize[0] + x2*3 + 2); + } + + return (a*col2 + (2-a)*col1)/2; +}; + +/** +* Fills the output matrix +**/ +static void fill(AVFrame *in,AVFrame *out,int u,int v,int x,int y,int mode,int new_x,int new_y){ + + int r,g,b; + /*mix colors*/ + if(mode==0){ + + r = *(in->data[0] + y*in->linesize[0] + x*3); + g = *(in->data[0] + y*in->linesize[0] + x*3 + 1); + b = *(in->data[0] + y*in->linesize[0] + x*3 + 2); + + } else{ + + r = mix(in,u,v,x,y,1,0); + g = mix(in,u,v,x,y,1,1); + b = mix(in,u,v,x,y,1,2); + } + + /*Insert blended color into scaledImageData*/ + *(out->data[0] + (new_y)*out->linesize[0] + (new_x)*3) = r; + *(out->data[0] + (new_y)*out->linesize[0] + (new_x)*3 + 1) = g; + *(out->data[0] + (new_y)*out->linesize[0] + (new_x)*3 + 2) = b; + + return; +} + +/** +* Applies the xBR filter rules. +**/ +static void apply_edge_detection_rules(AVFrame *in,AVFrame *out,int x,int y){ + + /* Matrix: (10 is 0,0 i.e: current pixel) + -2 | -1| 0| +1| +2 (x) + ______________________________ + -2 | [ 0][ 1][ 2] + -1 | [ 3][ 4][ 5][ 6][ 7] + 0 | [ 8][ 9][10][11][12] + +1 | [13][14][15][16][17] + +2 | [18][19][20] + |(y)| + */ + + /*Cached Pixel Weight Difference*/ + int d_10_9 = d(in, x, y, x-1, y); + int d_10_5 = d(in, x, y, x, y-1); + int d_10_11 = d(in, x, y, x+1, y); + int d_10_15 = d(in, x, y, x, y+1); + int d_10_14 = d(in, x, y, x-1, y+1); + int d_10_6 = d(in, x, y, x+1, y-1); + int d_4_8 = d(in, x-1, y-1, x-2, y); + int d_4_1 = d(in, x-1, y-1, x, y-2); + int d_9_5 = d(in, x-1, y, x, y-1); + int d_9_15 = d(in, x-1, y, x, y+1); + int d_9_3 = d(in, x-1, y, x-2, y-1); + int d_5_11 = d(in, x, y-1, x+1, y); + int d_5_0 = d(in, x, y-1, x-1, y-2); + int d_10_4 = d(in, x, y, x-1, y-1); + int d_10_16 = d(in, x, y, x+1, y+1); + int d_6_12 = d(in, x+1, y-1, x+2, y); + int d_6_1 = d(in, x+1, y-1, x, y-2); + int d_11_15 = d(in, x+1, y, x, y+1); + int d_11_7 = d(in, x+1, y, x+2, y-1); + int d_5_2 = d(in, x, y-1, x+1, y-2); + int d_14_8 = d(in, x-1, y+1, x-2, y); + int d_14_19 = d(in, x-1, y+1, x, y+2); + int d_15_18 = d(in, x, y+1, x-1, y+2); + int d_9_13 = d(in, x-1, y, x-2, y+1); + int d_16_12 = d(in, x+1, y+1, x+2, y); + int d_16_19 = d(in, x+1, y+1, x, y+2); + int d_15_20 = d(in, x, y+1, x+1, y+2); + int d_15_17 = d(in, x, y+1, x+2, y+1); + + /** + * Note: On reading edge detection rules + * + * Each edge rule is an if..else statement, everytime on else, the + * current pixel color pointed to by matrix[0] is used to color it's edge. + * + * Each if statement checks wether the sum of weight difference on the left is + * lesser than that of the right weight differece. + */ + + /** + * Top Left Edge Detection Rule + **/ + if ((d_10_14+d_10_6+d_4_8+d_4_1+(4*d_9_5)) < (d_9_15+d_9_3+d_5_11+d_5_0+(4*d_10_4))){ + // Figure what color to blend with current pixel -->10 + if(d_10_9 <= d_10_5) + fill(in,out,x-1,y,x,y,1,x*2,y*2); + else + fill(in,out,x,y-1,x,y,1,x*2,y*2); + } else{ + /*Insert current pixel color into scaledImageData*/ + fill(in,out,x,y,x,y,0,x*2,y*2); + } + /** + * Top Right Edge Detection Rule + **/ + if ((d_10_16+d_10_4+d_6_12+d_6_1+(4*d_5_11)) < (d_11_15+d_11_7+d_9_5+d_5_2+(4*d_10_6))){ + // Figure what color to blend with current pixel --> 10 + if(d_10_5 <= d_10_11) + fill(in,out,x,y-1,x,y,1,(x*2)+1,y*2); + else + fill(in,out,x+1,y,x,y,1,(x*2)+1,y*2); + } else{ + /*Insert current pixel color into scaledImageData*/ + fill(in,out,x,y,x,y,0,(x*2)+1,y*2); + } + + /** + * Bottom Left Edge Detection Rule + **/ + if ((d_10_4+d_10_16+d_14_8+d_14_19+(4*d_9_15)) < (d_9_5+d_9_13+d_11_15+d_15_18+(4*d_10_14))){ + // Figure what color to blend with current pixel --> 10 + if(d_10_9 <= d_10_15) + fill(in,out,x-1,y,x,y,1,x*2,(y*2)+1); + else + fill(in,out,x,y+1,x,y,1,x*2,(y*2)+1); + + } else{ + /*Insert current pixel color into scaledImageData*/ + fill(in,out,x,y,x,y,0,x*2,(y*2)+1); + } + + /** + * Bottom Right Edge Detection Rule + **/ + if ((d_10_6+d_10_14+d_16_12+d_16_19+(4*d_11_15)) < (d_9_15+d_15_20+d_15_17+d_5_11+(4*d_10_16))){ + // Figure what color to blend with current pixel --> 10 + if(d_10_11 <= d_10_15) + fill(in,out,x+1,y,x,y,1,(x*2)+1,(y*2)+1); + else + fill(in,out,x,y+1,x,y,1,(x*2)+1,(y*2)+1); + + } else{ + /*Insert current pixel color into scaledImageData*/ + fill(in,out,x,y,x,y,0,(x*2)+1,(y*2)+1); + } +} + +static int config_output(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + AVFilterLink *inlink = ctx->inputs[0]; + + outlink->w = inlink->w * 2 ; + outlink->h = inlink->h * 2 ; + return 0; +} + +static int query_formats(AVFilterContext *ctx) +{ + static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24,AV_PIX_FMT_NONE, + }; + + ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + int i,j; + + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + + av_frame_copy_props(out, in); + for(i=0;i<inlink->w;i++) + for(j=0;j<inlink->h;j++) + apply_edge_detection_rules(in,out,i,j); + + out->width = outlink->w; + out->height = outlink->h; + + av_frame_free(&in); + return ff_filter_frame(outlink, out); +} + +static const AVFilterPad xbr_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + }, + { NULL } +}; + +static const AVFilterPad xbr_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_output, + }, + { NULL } +}; + +AVFilter ff_vf_xbr = { + .name = "xbr", + .description = NULL_IF_CONFIG_SMALL("Scale the input by 2 using xbr algorithm."), + .inputs = xbr_inputs, + .outputs = xbr_outputs, + .query_formats = query_formats, +}; -- 1.7.9.5
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
