RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 03:37:27 +00:00
Code Issues Releases Wiki Activity

spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11994 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2004-02-24 11:23:27 +00:00
parent b49ee1f782
commit 694395d7bf
2 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DOCS/man/en/mplayer.1
View File

@ -2729,13 +2729,17 @@ off automatically depending on available CPU time.
.RE .RE
.PD 1 .PD 1
.TP .TP
.B spp[=quality[:qp]] .B spp[=quality[:qp[:mode]]]
simple postprocessing filter simple postprocessing filter
.RSs .RSs
.IPs quality .IPs quality
0\-6 0\-6 (default: 3)
.IPs qp\ \ \ .IPs qp\ \ \
force quantization parameter force quantization parameter (default: 0, use qp from video)
.IPs mode\ \ \
0: hard thresholding (default)
.br
1: soft thresholding (better deringing, but blurrier)
.RE .RE
.TP .TP
.B qp=equation .B qp=equation

52
libmpcodecs/vf_spp.c
View File

@ -95,6 +95,7 @@ static const uint8_t offset[127][2]= {
struct vf_priv_s { struct vf_priv_s {
int log2_count; int log2_count;
int qp; int qp;
int mode;
int mpeg2; int mpeg2;
unsigned int outfmt; unsigned int outfmt;
int temp_stride; int temp_stride;
@ -106,7 +107,7 @@ struct vf_priv_s {
#define SHIFT 22 #define SHIFT 22
static void requantize_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ static void hardthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
int i; int i;
int bias= 0; //FIXME int bias= 0; //FIXME
unsigned int threshold1, threshold2; unsigned int threshold1, threshold2;
@ -126,8 +127,31 @@ static void requantize_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *perm
} }
} }
static void softthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
int i;
int bias= 0; //FIXME
unsigned int threshold1, threshold2;
threshold1= qp*((1<<4) - 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= src[i];
if(((unsigned)(level+threshold1))>threshold2){
const int j= permutation[i];
if(level>0)
dst[j]= (level - threshold1 + 4)>>3;
else
dst[j]= (level + threshold1 + 4)>>3;
}
}
}
#ifdef HAVE_MMX #ifdef HAVE_MMX
static void requantize_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ static void hardthresh_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
int bias= 0; //FIXME int bias= 0; //FIXME
unsigned int threshold1; unsigned int threshold1;
@ -274,7 +298,7 @@ static void store_slice_mmx(uint8_t *dst, int16_t *src, int dst_stride, int src_
static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale)= store_slice_c; static void (*store_slice)(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale)= store_slice_c;
static void (*requantize)(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation)= requantize_c; static void (*requantize)(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation)= hardthresh_c;
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){ 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; int x, y, i;
@ -478,16 +502,24 @@ static int open(vf_instance_t *vf, char* args){
vf->priv->avctx= avcodec_alloc_context(); vf->priv->avctx= avcodec_alloc_context();
dsputil_init(&vf->priv->dsp, vf->priv->avctx); dsputil_init(&vf->priv->dsp, vf->priv->avctx);
#ifdef HAVE_MMX
if(gCpuCaps.hasMMX){
store_slice= store_slice_mmx;
requantize= requantize_mmx;
}
#endif
vf->priv->log2_count= 3; vf->priv->log2_count= 3;
if (args) sscanf(args, "%d:%d", &vf->priv->log2_count, &vf->priv->qp); if (args) sscanf(args, "%d:%d:%d", &vf->priv->log2_count, &vf->priv->qp, &vf->priv->mode);
switch(vf->priv->mode){
case 0: requantize= hardthresh_c; break;
case 1: requantize= softthresh_c; break;
}
#ifdef HAVE_MMX
if(gCpuCaps.hasMMX){
store_slice= store_slice_mmx;
switch(vf->priv->mode){
case 0: requantize= hardthresh_mmx; break;
//case 1: requantize= softthresh_mmx; break;
}
}
#endif
// check csp: // check csp:
vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12); vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);