--- postprocessing.c 2004/03/22 22:36:23 1.2 +++ postprocessing.c 2011/04/07 19:07:36 1.6.2.1 @@ -3,7 +3,8 @@ * XVID MPEG-4 VIDEO CODEC * - Postprocessing functions - * - * Copyright(C) 2003 Michael Militzer + * Copyright(C) 2003-2010 Michael Militzer + * 2004 Marc Fauconneau * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +20,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: postprocessing.c,v 1.2 2004/03/22 22:36:23 edgomez Exp $ + * $Id: postprocessing.c,v 1.6.2.1 2011/04/07 19:07:36 Isibaar Exp $ * ****************************************************************************/ @@ -33,6 +34,10 @@ #include "../utils/emms.h" #include "postprocessing.h" +/* function pointers */ +IMAGEBRIGHTNESS_PTR image_brightness; + + /* Some useful (and fast) macros Note that the MIN/MAX macros assume signed shift - if your compiler doesn't do signed shifts, use the default MIN/MAX macros from global.h */ @@ -48,53 +53,146 @@ init_noise(tbls); } -void -image_postproc(XVID_POSTPROC *tbls, IMAGE * img, int edged_width, - const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride, - int flags, int frame_num, int bvop) +void +stripe_deblock_h(SMPDeblock *h) { - const int edged_width2 = edged_width /2; + const int stride = h->stride; + const int stride2 = stride /2; + int i,j; int quant; /* luma: j,i in block units */ - if ((flags & XVID_DEBLOCKY)) + if ((h->flags & XVID_DEBLOCKY)) { - for (j = 1; j < mb_height*2; j++) /* horizontal deblocking */ - for (i = 0; i < mb_width*2; i++) + int dering = h->flags & XVID_DERINGY; + + for (j = 1; j < h->stop_y; j++) /* horizontal luma deblocking */ + for (i = h->start_x; i < h->stop_x; i++) { - quant = mbs[(j+0)/2*mb_stride + (i/2)].quant; - deblock8x8_h(tbls, img->y + j*8*edged_width + i*8, edged_width, quant); + quant = h->mbs[(j+0)/2*h->mb_stride + (i/2)].quant; + deblock8x8_h(h->tbls, h->img->y + j*8*stride + i*8, stride, quant, dering); } + } - for (j = 0; j < mb_height*2; j++) /* vertical deblocking */ - for (i = 1; i < mb_width*2; i++) + /* chroma */ + if ((h->flags & XVID_DEBLOCKUV)) + { + int dering = h->flags & XVID_DERINGUV; + + for (j = 1; j < h->stop_y/2; j++) /* horizontal deblocking */ + for (i = h->start_x/2; i < h->stop_x/2; i++) { - quant = mbs[(j+0)/2*mb_stride + (i/2)].quant; - deblock8x8_v(tbls, img->y + j*8*edged_width + i*8, edged_width, quant); + quant = h->mbs[(j+0)*h->mb_stride + i].quant; + deblock8x8_h(h->tbls, h->img->u + j*8*stride2 + i*8, stride2, quant, dering); + deblock8x8_h(h->tbls, h->img->v + j*8*stride2 + i*8, stride2, quant, dering); } } +} +void +stripe_deblock_v(SMPDeblock *h) +{ + const int stride = h->stride; + const int stride2 = stride /2; - /* chroma */ - if ((flags & XVID_DEBLOCKUV)) + int i,j; + int quant; + + /* luma: j,i in block units */ + if ((h->flags & XVID_DEBLOCKY)) { - for (j = 1; j < mb_height; j++) /* horizontal deblocking */ - for (i = 0; i < mb_width; i++) + int dering = h->flags & XVID_DERINGY; + + for (j = h->start_y; j < h->stop_y; j++) /* vertical deblocking */ + for (i = 1; i < h->stop_x; i++) { - quant = mbs[(j+0)*mb_stride + i].quant; - deblock8x8_h(tbls, img->u + j*8*edged_width2 + i*8, edged_width2, quant); - deblock8x8_h(tbls, img->v + j*8*edged_width2 + i*8, edged_width2, quant); + quant = h->mbs[(j+0)/2*h->mb_stride + (i/2)].quant; + deblock8x8_v(h->tbls, h->img->y + j*8*stride + i*8, stride, quant, dering); } + } + + /* chroma */ + if ((h->flags & XVID_DEBLOCKUV)) + { + int dering = h->flags & XVID_DERINGUV; - for (j = 0; j < mb_height; j++) /* vertical deblocking */ - for (i = 1; i < mb_width; i++) + for (j = h->start_y/2; j < h->stop_y/2; j++) /* vertical deblocking */ + for (i = 1; i < h->stop_x/2; i++) { - quant = mbs[(j+0)*mb_stride + i].quant; - deblock8x8_v(tbls, img->u + j*8*edged_width2 + i*8, edged_width2, quant); - deblock8x8_v(tbls, img->v + j*8*edged_width2 + i*8, edged_width2, quant); + quant = h->mbs[(j+0)*h->mb_stride + i].quant; + deblock8x8_v(h->tbls, h->img->u + j*8*stride2 + i*8, stride2, quant, dering); + deblock8x8_v(h->tbls, h->img->v + j*8*stride2 + i*8, stride2, quant, dering); } } +} + +void +image_postproc(XVID_POSTPROC *tbls, IMAGE * img, int edged_width, + const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride, + int flags, int brightness, int frame_num, int bvop, int threads) +{ + int k; +#ifndef HAVE_PTHREAD + int num_threads = 1; +#else + int num_threads = MAX(1, MIN(threads, 4)); + void *status = NULL; +#endif + SMPDeblock data[4]; + + /* horizontal deblocking, dispatch threads */ + for (k = 0; k < num_threads; k++) { + data[k].flags = flags; + data[k].img = img; + data[k].mb_stride = mb_stride; + data[k].mbs = mbs; + data[k].stride = edged_width; + data[k].tbls = tbls; + + data[k].start_x = (k*mb_width / num_threads)*2; + data[k].stop_x = ((k+1)*mb_width / num_threads)*2; + + data[k].stop_y = mb_height*2; + } +#ifdef HAVE_PTHREAD + /* create threads */ + for (k = 1; k < num_threads; k++) { + pthread_create(&data[k].handle, NULL, + (void*)stripe_deblock_h, (void*)&data[k]); + } +#endif + stripe_deblock_h(&data[0]); + +#ifdef HAVE_PTHREAD + /* wait until all threads are finished */ + for (k = 1; k < num_threads; k++) { + pthread_join(data[k].handle, &status); + } +#endif + + /* vertical deblocking, dispatch threads */ + for (k = 0; k < num_threads; k++) { + data[k].start_y = (k*mb_height / num_threads)*2; + data[k].stop_y = ((k+1)*mb_height / num_threads)*2; + data[k].stop_x = mb_width*2; + } + +#ifdef HAVE_PTHREAD + /* create threads */ + for (k = 1; k < num_threads; k++) { + pthread_create(&data[k].handle, NULL, + (void*)stripe_deblock_v, (void*)&data[k]); + } +#endif + stripe_deblock_v(&data[0]); + +#ifdef HAVE_PTHREAD + /* wait until all threads are finished */ + for (k = 1; k < num_threads; k++) { + pthread_join(data[k].handle, &status); + } +#endif if (!bvop) tbls->prev_quant = mbs->quant; @@ -104,6 +202,10 @@ add_noise(tbls, img->y, img->y, edged_width, mb_width*16, mb_height*16, frame_num % 3, tbls->prev_quant); } + + if (brightness != 0) { + image_brightness(img->y, edged_width, mb_width*16, mb_height*16, brightness); + } } /******************************************************************************/ @@ -146,6 +248,15 @@ s[8] = *(v[8] = img + x*stride + 3); \ s[9] = *(v[9] = img + x*stride + 4); +#define APPLY_DERING(x) \ + *v[x] = (e[x] == 0) ? ( \ + (e[x-1] == 0) ? ( \ + (e[x+1] == 0) ? \ + ((s[x-1]+s[x]*2+s[x+1])>>2) \ + : ((s[x-1]+s[x])>>1) ) \ + : ((s[x]+s[x+1])>>1) ) \ + : s[x]; + #define APPLY_FILTER_CORE \ /* First, decide whether to use default or DC-offset mode */ \ \ @@ -180,6 +291,36 @@ *v[4] -= diff; \ *v[5] += diff; \ } \ + if (dering) { \ + e[0] = (tbls->xvid_abs_tbl[(s[0] - s[1]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[1] = (tbls->xvid_abs_tbl[(s[1] - s[2]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[2] = (tbls->xvid_abs_tbl[(s[2] - s[3]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[3] = (tbls->xvid_abs_tbl[(s[3] - s[4]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[4] = (tbls->xvid_abs_tbl[(s[4] - s[5]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[5] = (tbls->xvid_abs_tbl[(s[5] - s[6]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[6] = (tbls->xvid_abs_tbl[(s[6] - s[7]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[7] = (tbls->xvid_abs_tbl[(s[7] - s[8]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + e[8] = (tbls->xvid_abs_tbl[(s[8] - s[9]) + 255] > quant + DERING_STRENGTH) ? 1 : 0; \ + \ + e[1] |= e[0]; \ + e[2] |= e[1]; \ + e[3] |= e[2]; \ + e[4] |= e[3]; \ + e[5] |= e[4]; \ + e[6] |= e[5]; \ + e[7] |= e[6]; \ + e[8] |= e[7]; \ + e[9] = e[8]; \ + \ + APPLY_DERING(1) \ + APPLY_DERING(2) \ + APPLY_DERING(3) \ + APPLY_DERING(4) \ + APPLY_DERING(5) \ + APPLY_DERING(6) \ + APPLY_DERING(7) \ + APPLY_DERING(8) \ + } \ } \ else { /* DC-offset mode */ \ uint8_t p0, p9; \ @@ -206,11 +347,12 @@ } \ } -void deblock8x8_h(XVID_POSTPROC *tbls, uint8_t *img, int stride, int quant) +void deblock8x8_h(XVID_POSTPROC *tbls, uint8_t *img, int stride, int quant, int dering) { int eq_cnt; uint8_t *v[10]; - int32_t s[10]; + int s[10]; + int e[10]; LOAD_DATA_HOR(0) APPLY_FILTER_CORE @@ -238,11 +380,12 @@ } -void deblock8x8_v(XVID_POSTPROC *tbls, uint8_t *img, int stride, int quant) +void deblock8x8_v(XVID_POSTPROC *tbls, uint8_t *img, int stride, int quant, int dering) { int eq_cnt; uint8_t *v[10]; int s[10]; + int e[10]; LOAD_DATA_VER(0) APPLY_FILTER_CORE @@ -370,3 +513,18 @@ src += stride; } } + + +void image_brightness_c(uint8_t *dst, int stride, int width, int height, int offset) +{ + int x,y; + + for(y = 0; y < height; y++) + { + for(x = 0; x < width; x++) + { + int p = dst[y*stride + x]; + dst[y*stride + x] = CLIP( p + offset, 0, 255); + } + } +}