mirror of
https://github.com/mpv-player/mpv
synced 2025-02-07 15:41:55 +00:00
simple alternative postprocessing filter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11278 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael
parent
bcfd543090
commit
89b9c0976e
@ -14,7 +14,7 @@ VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_hmblck.c vd_msvidc
|
||||
VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c vd_theora.c
|
||||
VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
|
||||
|
||||
VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c
|
||||
VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c vf_ivtc.c vf_ilpack.c vf_dsize.c vf_decimate.c vf_softpulldown.c vf_tinterlace.c vf_pullup.c pullup.c vf_framestep.c vf_tile.c vf_delogo.c vf_fil.c vf_hue.c vf_spp.c
|
||||
ifeq ($(HAVE_FFPOSTPROCESS),yes)
|
||||
VFILTER_SRCS += vf_pp.c
|
||||
endif
|
||||
|
||||
@ -79,6 +79,7 @@ extern vf_info_t vf_info_framestep;
|
||||
extern vf_info_t vf_info_tile;
|
||||
extern vf_info_t vf_info_delogo;
|
||||
extern vf_info_t vf_info_hue;
|
||||
extern vf_info_t vf_info_spp;
|
||||
|
||||
// list of available filters:
|
||||
static vf_info_t* filter_list[]={
|
||||
@ -145,6 +146,9 @@ static vf_info_t* filter_list[]={
|
||||
&vf_info_tile,
|
||||
&vf_info_delogo,
|
||||
&vf_info_hue,
|
||||
#ifdef USE_LIBAVCODEC
|
||||
&vf_info_spp,
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
320
libmpcodecs/vf_spp.c
Normal file
320
libmpcodecs/vf_spp.c
Normal file
@ -0,0 +1,320 @@
|
||||
/*
|
||||
Copyright (C) 2003 Michael Niedermayer <michaelni@gmx.at>
|
||||
|
||||
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
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/*
|
||||
* This implementation is based on an algorithm described in
|
||||
* "Aria Nosratinia Embedded Post-Processing for
|
||||
* Enhancement of Compressed Images (1999)"
|
||||
* (http://citeseer.nj.nec.com/nosratinia99embedded.html)
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <inttypes.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "../config.h"
|
||||
#include "../mp_msg.h"
|
||||
#include "../cpudetect.h"
|
||||
#include "../libavcodec/avcodec.h"
|
||||
#include "../libavcodec/dsputil.h"
|
||||
|
||||
#ifdef HAVE_MALLOC_H
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
|
||||
#include "img_format.h"
|
||||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
#include "../libvo/fastmemcpy.h"
|
||||
|
||||
#define XMIN(a,b) ((a) < (b) ? (a) : (b))
|
||||
|
||||
//===========================================================================//
|
||||
const uint8_t __attribute__((aligned(8))) dither[8][8]={
|
||||
{ 0, 48, 12, 60, 3, 51, 15, 63, },
|
||||
{ 32, 16, 44, 28, 35, 19, 47, 31, },
|
||||
{ 8, 56, 4, 52, 11, 59, 7, 55, },
|
||||
{ 40, 24, 36, 20, 43, 27, 39, 23, },
|
||||
{ 2, 50, 14, 62, 1, 49, 13, 61, },
|
||||
{ 34, 18, 46, 30, 33, 17, 45, 29, },
|
||||
{ 10, 58, 6, 54, 9, 57, 5, 53, },
|
||||
{ 42, 26, 38, 22, 41, 25, 37, 21, },
|
||||
};
|
||||
|
||||
const uint8_t offset[64][2]= {
|
||||
{0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2},
|
||||
{0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0},
|
||||
{1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3},
|
||||
{1,3}, {5,7}, {1,7}, {5,3}, {3,1}, {7,5}, {3,5}, {7,1},
|
||||
{0,1}, {4,5}, {0,5}, {4,1}, {2,3}, {6,7}, {2,7}, {6,3},
|
||||
{0,3}, {4,7}, {0,7}, {4,3}, {2,1}, {6,5}, {2,5}, {6,1},
|
||||
{1,0}, {5,4}, {1,4}, {5,0}, {3,2}, {7,6}, {3,6}, {7,2},
|
||||
{1,2}, {5,6}, {1,6}, {5,2}, {3,0}, {7,4}, {3,4}, {7,0},
|
||||
};
|
||||
|
||||
struct vf_priv_s {
|
||||
int log2_count;
|
||||
int qp;
|
||||
int mpeg2;
|
||||
unsigned int outfmt;
|
||||
int temp_stride;
|
||||
uint8_t *src;
|
||||
int16_t *temp;
|
||||
AVCodecContext *avctx;
|
||||
DSPContext dsp;
|
||||
};
|
||||
|
||||
#define SHIFT 22
|
||||
|
||||
static inline void requantize(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
|
||||
int i;
|
||||
const int qmul= qp<<1;
|
||||
const int qadd= (qp-1)|1;
|
||||
const int qinv= ((1<<(SHIFT-3)) + qmul/2)/ qmul;
|
||||
int bias= 0; //FIXME
|
||||
unsigned int threshold1, threshold2;
|
||||
|
||||
threshold1= (1<<SHIFT) - bias - 1;
|
||||
threshold2= (threshold1<<1);
|
||||
|
||||
memset(dst, 0, 64*sizeof(DCTELEM));
|
||||
dst[0]= (src[0] + 4)>>3;;
|
||||
|
||||
for(i=1; i<64; i++){
|
||||
int level= qinv*src[i];
|
||||
|
||||
if(((unsigned)(level+threshold1))>threshold2){
|
||||
const int j= permutation[i];
|
||||
if(level>0){
|
||||
level= (bias + level)>>SHIFT;
|
||||
dst[j]= level*qmul + qadd;
|
||||
}else{
|
||||
level= (bias - level)>>SHIFT;
|
||||
dst[j]= -level*qmul - qadd;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){
|
||||
int x,y;
|
||||
|
||||
for(y=0; y<8; y++){
|
||||
for(x=0; x<8; x++){
|
||||
dst[x + y*stride]+= block[x + y*8];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, int dst_stride, int src_stride, int width, int height, uint8_t *qp_store, int qp_stride, int is_luma){
|
||||
int x, y, i;
|
||||
const int count= 1<<p->log2_count;
|
||||
const int log2_scale= 6-p->log2_count;
|
||||
const int stride= p->temp_stride;
|
||||
uint64_t block_align[32];
|
||||
DCTELEM *block = (DCTELEM *)block_align;
|
||||
DCTELEM *block2= (DCTELEM *)(block_align+16);
|
||||
|
||||
for(y=0; y<height; y++){
|
||||
memcpy(p->src + 8 + 8*stride + y*stride, src + y*src_stride, width);
|
||||
memset(p->temp + 8*stride + y*stride, 0, stride*sizeof(int16_t));
|
||||
for(x=0; x<8; x++){
|
||||
int index= 8 + 8*stride + y*stride;
|
||||
p->src[index - x - 1]= p->src[index + x ];
|
||||
p->src[index + width + x ]= p->src[index + width - x - 1];
|
||||
}
|
||||
}
|
||||
for(y=0; y<8; y++){
|
||||
memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride);
|
||||
memcpy(p->src + (width+8+y)*stride, p->src + (width-y+7)*stride, stride);
|
||||
}
|
||||
//FIXME (try edge emu)
|
||||
|
||||
for(y=0; y<height+8; y+=8){
|
||||
for(x=0; x<width+8; x+=8){
|
||||
const int qps= 3 + is_luma;
|
||||
int qp;
|
||||
|
||||
if(p->qp)
|
||||
qp= p->qp;
|
||||
else{
|
||||
qp= qp_store[ (XMIN(x, width-1)>>qps) + (XMIN(y, height-1)>>qps) * qp_stride];
|
||||
if(p->mpeg2) qp>>=1;
|
||||
}
|
||||
for(i=0; i<count; i++){
|
||||
const int x1= x + offset[i][0];
|
||||
const int y1= y + offset[i][1];
|
||||
const int index= x1 + y1*stride;
|
||||
|
||||
p->dsp.get_pixels(block, p->src + index, stride);
|
||||
p->dsp.fdct(block);
|
||||
requantize(block2, block, qp, p->dsp.idct_permutation);
|
||||
p->dsp.idct(block2);
|
||||
add_block(p->temp + index, stride, block2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for(y=0; y<height; y++){
|
||||
uint8_t *d= dither[y&7];
|
||||
for(x=0; x<width; x+=8){
|
||||
const int index= 8 + 8*stride + x + y*stride;
|
||||
dst[x + y*src_stride + 0]= ((p->temp[index + 0]<<log2_scale) + d[0])>>6;
|
||||
dst[x + y*src_stride + 1]= ((p->temp[index + 1]<<log2_scale) + d[1])>>6;
|
||||
dst[x + y*src_stride + 2]= ((p->temp[index + 2]<<log2_scale) + d[2])>>6;
|
||||
dst[x + y*src_stride + 3]= ((p->temp[index + 3]<<log2_scale) + d[3])>>6;
|
||||
dst[x + y*src_stride + 4]= ((p->temp[index + 4]<<log2_scale) + d[4])>>6;
|
||||
dst[x + y*src_stride + 5]= ((p->temp[index + 5]<<log2_scale) + d[5])>>6;
|
||||
dst[x + y*src_stride + 6]= ((p->temp[index + 6]<<log2_scale) + d[6])>>6;
|
||||
dst[x + y*src_stride + 7]= ((p->temp[index + 7]<<log2_scale) + d[7])>>6;
|
||||
}
|
||||
}
|
||||
//FIXME reorder for better caching
|
||||
}
|
||||
|
||||
static int config(struct vf_instance_s* vf,
|
||||
int width, int height, int d_width, int d_height,
|
||||
unsigned int flags, unsigned int outfmt){
|
||||
|
||||
vf->priv->temp_stride= (width+16+15)&(~15);
|
||||
vf->priv->temp= malloc(vf->priv->temp_stride*(height+16)*sizeof(int16_t));
|
||||
vf->priv->src = malloc(vf->priv->temp_stride*(height+16)*sizeof(uint8_t));
|
||||
|
||||
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
|
||||
}
|
||||
|
||||
static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
|
||||
if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
|
||||
if(mpi->imgfmt!=vf->priv->outfmt) return; // colorspace differ
|
||||
// ok, we can do pp in-place (or pp disabled):
|
||||
vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
|
||||
mpi->type, mpi->flags, mpi->w, mpi->h);
|
||||
mpi->planes[0]=vf->dmpi->planes[0];
|
||||
mpi->stride[0]=vf->dmpi->stride[0];
|
||||
mpi->width=vf->dmpi->width;
|
||||
if(mpi->flags&MP_IMGFLAG_PLANAR){
|
||||
mpi->planes[1]=vf->dmpi->planes[1];
|
||||
mpi->planes[2]=vf->dmpi->planes[2];
|
||||
mpi->stride[1]=vf->dmpi->stride[1];
|
||||
mpi->stride[2]=vf->dmpi->stride[2];
|
||||
}
|
||||
mpi->flags|=MP_IMGFLAG_DIRECT;
|
||||
}
|
||||
|
||||
static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
|
||||
mp_image_t *dmpi;
|
||||
|
||||
if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
|
||||
// no DR, so get a new image! hope we'll get DR buffer:
|
||||
vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt,
|
||||
MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
|
||||
mpi->w,mpi->h);
|
||||
}
|
||||
|
||||
dmpi= vf->dmpi;
|
||||
|
||||
vf->priv->mpeg2= mpi->qscale_type;
|
||||
|
||||
filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, mpi->qscale, mpi->qstride, 1);
|
||||
filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>1, mpi->h>>1, mpi->qscale, mpi->qstride, 0);
|
||||
filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>1, mpi->h>>1, mpi->qscale, mpi->qstride, 0);
|
||||
|
||||
vf_clone_mpi_attributes(dmpi, mpi);
|
||||
|
||||
#ifdef HAVE_MMX
|
||||
if(gCpuCaps.hasMMX) asm volatile ("emms\n\t");
|
||||
#endif
|
||||
#ifdef HAVE_MMX2
|
||||
if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t");
|
||||
#endif
|
||||
|
||||
return vf_next_put_image(vf,dmpi);
|
||||
}
|
||||
|
||||
static void uninit(struct vf_instance_s* vf){
|
||||
if(!vf->priv) return;
|
||||
|
||||
if(vf->priv->temp) free(vf->priv->temp);
|
||||
vf->priv->temp= NULL;
|
||||
if(vf->priv->src) free(vf->priv->src);
|
||||
vf->priv->src= NULL;
|
||||
if(vf->priv->avctx) free(vf->priv->avctx);
|
||||
vf->priv->avctx= NULL;
|
||||
|
||||
free(vf->priv);
|
||||
vf->priv=NULL;
|
||||
}
|
||||
|
||||
//===========================================================================//
|
||||
|
||||
static int query_format(struct vf_instance_s* vf, unsigned int fmt){
|
||||
switch(fmt)
|
||||
{
|
||||
case IMGFMT_YV12:
|
||||
case IMGFMT_I420:
|
||||
case IMGFMT_IYUV:
|
||||
return vf_next_query_format(vf,vf->priv->outfmt);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static unsigned int fmt_list[]={
|
||||
IMGFMT_YV12,
|
||||
IMGFMT_I420,
|
||||
IMGFMT_IYUV,
|
||||
0
|
||||
};
|
||||
|
||||
static int open(vf_instance_t *vf, char* args){
|
||||
vf->config=config;
|
||||
vf->put_image=put_image;
|
||||
vf->get_image=get_image;
|
||||
vf->query_format=query_format;
|
||||
vf->uninit=uninit;
|
||||
vf->priv=malloc(sizeof(struct vf_priv_s));
|
||||
memset(vf->priv, 0, sizeof(struct vf_priv_s));
|
||||
vf->priv->avctx= avcodec_alloc_context();
|
||||
dsputil_init(&vf->priv->dsp, vf->priv->avctx);
|
||||
|
||||
vf->priv->log2_count= 6;
|
||||
|
||||
if (args) sscanf(args, "%d:%d", &vf->priv->log2_count, &vf->priv->qp);
|
||||
|
||||
// check csp:
|
||||
vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
|
||||
if(!vf->priv->outfmt)
|
||||
{
|
||||
uninit(vf);
|
||||
return 0; // no csp match :(
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
vf_info_t vf_info_spp = {
|
||||
"simple postprocess",
|
||||
"spp",
|
||||
"Michael Niedermayer",
|
||||
"",
|
||||
open,
|
||||
NULL
|
||||
};
|
||||
|
||||
//===========================================================================//
|
||||
Loading…
Reference in New Issue
Block a user