annotate libmpcodecs/vf_spp.c @ 26273:8c92e7e4ccd9

command.h: Remove unnecessary includes Remove #include of "mp_core.h" and "input/input.h". Their only use was that functions declared in command.h took pointers to structs defined in those headers. Declare the structs directly as incomplete types instead.
author uau
date Mon, 31 Mar 2008 04:10:54 +0000
parents 00fff9a3b735
children 82601a38e2a7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
1 /*
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
2 Copyright (C) 2003 Michael Niedermayer <michaelni@gmx.at>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
3
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
5 it under the terms of the GNU General Public License as published by
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
6 the Free Software Foundation; either version 2 of the License, or
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
7 (at your option) any later version.
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
8
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
9 This program is distributed in the hope that it will be useful,
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
12 GNU General Public License for more details.
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
13
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
14 You should have received a copy of the GNU General Public License
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
15 along with this program; if not, write to the Free Software
17367
401b440a6d76 Update licensing information: The FSF changed postal address.
diego
parents: 17110
diff changeset
16 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
17 */
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
18
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
19 /*
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
20 * This implementation is based on an algorithm described in
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
21 * "Aria Nosratinia Embedded Post-Processing for
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
22 * Enhancement of Compressed Images (1999)"
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
23 * (http://citeseer.nj.nec.com/nosratinia99embedded.html)
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
24 */
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
25
11334
michael
parents: 11308
diff changeset
26
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
27 #include <stdio.h>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
28 #include <stdlib.h>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
29 #include <string.h>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
30 #include <inttypes.h>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
31 #include <math.h>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
32
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16018
diff changeset
33 #include "config.h"
11335
michael
parents: 11334
diff changeset
34
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16018
diff changeset
35 #include "mp_msg.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16018
diff changeset
36 #include "cpudetect.h"
11568
cf76671b3d77 Fix compilation if lavc is compiled as a shared lib. Patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
alex
parents: 11477
diff changeset
37
24977
1e25755bc0c4 Add missing header files, fixes the warnings:
diego
parents: 24865
diff changeset
38 #include "libavutil/intreadwrite.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16018
diff changeset
39 #include "libavcodec/avcodec.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16018
diff changeset
40 #include "libavcodec/dsputil.h"
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
41
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
42 #ifdef HAVE_MALLOC_H
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
43 #include <malloc.h>
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
44 #endif
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
45
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
46 #include "img_format.h"
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
47 #include "mp_image.h"
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
48 #include "vf.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16018
diff changeset
49 #include "libvo/fastmemcpy.h"
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
50
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
51 #define XMIN(a,b) ((a) < (b) ? (a) : (b))
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
52
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
53 //===========================================================================//
11477
9785bff83777 memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents: 11335
diff changeset
54 static const uint8_t __attribute__((aligned(8))) dither[8][8]={
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
55 { 0, 48, 12, 60, 3, 51, 15, 63, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
56 { 32, 16, 44, 28, 35, 19, 47, 31, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
57 { 8, 56, 4, 52, 11, 59, 7, 55, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
58 { 40, 24, 36, 20, 43, 27, 39, 23, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
59 { 2, 50, 14, 62, 1, 49, 13, 61, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
60 { 34, 18, 46, 30, 33, 17, 45, 29, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
61 { 10, 58, 6, 54, 9, 57, 5, 53, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
62 { 42, 26, 38, 22, 41, 25, 37, 21, },
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
63 };
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
64
11477
9785bff83777 memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents: 11335
diff changeset
65 static const uint8_t offset[127][2]= {
11298
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
66 {0,0},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
67 {0,0}, {4,4},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
68 {0,0}, {2,2}, {6,4}, {4,6},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
69 {0,0}, {5,1}, {2,2}, {7,3}, {4,4}, {1,5}, {6,6}, {3,7},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
70
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
71 {0,0}, {4,0}, {1,1}, {5,1}, {3,2}, {7,2}, {2,3}, {6,3},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
72 {0,4}, {4,4}, {1,5}, {5,5}, {3,6}, {7,6}, {2,7}, {6,7},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
73
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
74 {0,0}, {0,2}, {0,4}, {0,6}, {1,1}, {1,3}, {1,5}, {1,7},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
75 {2,0}, {2,2}, {2,4}, {2,6}, {3,1}, {3,3}, {3,5}, {3,7},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
76 {4,0}, {4,2}, {4,4}, {4,6}, {5,1}, {5,3}, {5,5}, {5,7},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
77 {6,0}, {6,2}, {6,4}, {6,6}, {7,1}, {7,3}, {7,5}, {7,7},
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
78
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
79 {0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
80 {0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
81 {1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
82 {1,3}, {5,7}, {1,7}, {5,3}, {3,1}, {7,5}, {3,5}, {7,1},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
83 {0,1}, {4,5}, {0,5}, {4,1}, {2,3}, {6,7}, {2,7}, {6,3},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
84 {0,3}, {4,7}, {0,7}, {4,3}, {2,1}, {6,5}, {2,5}, {6,1},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
85 {1,0}, {5,4}, {1,4}, {5,0}, {3,2}, {7,6}, {3,6}, {7,2},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
86 {1,2}, {5,6}, {1,6}, {5,2}, {3,0}, {7,4}, {3,4}, {7,0},
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
87 };
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
88
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
89 struct vf_priv_s {
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
90 int log2_count;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
91 int qp;
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
92 int mode;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
93 int mpeg2;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
94 int temp_stride;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
95 uint8_t *src;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
96 int16_t *temp;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
97 AVCodecContext *avctx;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
98 DSPContext dsp;
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
99 char *non_b_qp;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
100 };
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
101
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
102 #define SHIFT 22
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
103
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
104 static void hardthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
105 int i;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
106 int bias= 0; //FIXME
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
107 unsigned int threshold1, threshold2;
11296
86916e46d445 different / faster / simpler "quantization"
michael
parents: 11295
diff changeset
108
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
109 threshold1= qp*((1<<4) - bias) - 1;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
110 threshold2= (threshold1<<1);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
111
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
112 memset(dst, 0, 64*sizeof(DCTELEM));
11296
86916e46d445 different / faster / simpler "quantization"
michael
parents: 11295
diff changeset
113 dst[0]= (src[0] + 4)>>3;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
114
11296
86916e46d445 different / faster / simpler "quantization"
michael
parents: 11295
diff changeset
115 for(i=1; i<64; i++){
86916e46d445 different / faster / simpler "quantization"
michael
parents: 11295
diff changeset
116 int level= src[i];
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
117 if(((unsigned)(level+threshold1))>threshold2){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
118 const int j= permutation[i];
11296
86916e46d445 different / faster / simpler "quantization"
michael
parents: 11295
diff changeset
119 dst[j]= (level + 4)>>3;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
120 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
121 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
122 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
123
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
124 static void softthresh_c(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
125 int i;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
126 int bias= 0; //FIXME
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
127 unsigned int threshold1, threshold2;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
128
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
129 threshold1= qp*((1<<4) - bias) - 1;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
130 threshold2= (threshold1<<1);
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
131
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
132 memset(dst, 0, 64*sizeof(DCTELEM));
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
133 dst[0]= (src[0] + 4)>>3;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
134
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
135 for(i=1; i<64; i++){
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
136 int level= src[i];
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
137 if(((unsigned)(level+threshold1))>threshold2){
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
138 const int j= permutation[i];
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
139 if(level>0)
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
140 dst[j]= (level - threshold1 + 4)>>3;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
141 else
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
142 dst[j]= (level + threshold1 + 4)>>3;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
143 }
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
144 }
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
145 }
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
146
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
147 #ifdef HAVE_MMX
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
148 static void hardthresh_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
149 int bias= 0; //FIXME
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
150 unsigned int threshold1;
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
151
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
152 threshold1= qp*((1<<4) - bias) - 1;
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
153
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
154 asm volatile(
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
155 #define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
156 "movq " #src0 ", %%mm0 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
157 "movq " #src1 ", %%mm1 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
158 "movq " #src2 ", %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
159 "movq " #src3 ", %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
160 "psubw %%mm4, %%mm0 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
161 "psubw %%mm4, %%mm1 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
162 "psubw %%mm4, %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
163 "psubw %%mm4, %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
164 "paddusw %%mm5, %%mm0 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
165 "paddusw %%mm5, %%mm1 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
166 "paddusw %%mm5, %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
167 "paddusw %%mm5, %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
168 "paddw %%mm6, %%mm0 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
169 "paddw %%mm6, %%mm1 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
170 "paddw %%mm6, %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
171 "paddw %%mm6, %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
172 "psubusw %%mm6, %%mm0 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
173 "psubusw %%mm6, %%mm1 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
174 "psubusw %%mm6, %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
175 "psubusw %%mm6, %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
176 "psraw $3, %%mm0 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
177 "psraw $3, %%mm1 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
178 "psraw $3, %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
179 "psraw $3, %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
180 \
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
181 "movq %%mm0, %%mm7 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
182 "punpcklwd %%mm2, %%mm0 \n\t" /*A*/\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
183 "punpckhwd %%mm2, %%mm7 \n\t" /*C*/\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
184 "movq %%mm1, %%mm2 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
185 "punpcklwd %%mm3, %%mm1 \n\t" /*B*/\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
186 "punpckhwd %%mm3, %%mm2 \n\t" /*D*/\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
187 "movq %%mm0, %%mm3 \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
188 "punpcklwd %%mm1, %%mm0 \n\t" /*A*/\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
189 "punpckhwd %%mm7, %%mm3 \n\t" /*C*/\
13393
74fa728e6fc2 100l typo
michael
parents: 13149
diff changeset
190 "punpcklwd %%mm2, %%mm7 \n\t" /*B*/\
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
191 "punpckhwd %%mm2, %%mm1 \n\t" /*D*/\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
192 \
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
193 "movq %%mm0, " #dst0 " \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
194 "movq %%mm7, " #dst1 " \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
195 "movq %%mm3, " #dst2 " \n\t"\
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
196 "movq %%mm1, " #dst3 " \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
197
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
198 "movd %2, %%mm4 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
199 "movd %3, %%mm5 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
200 "movd %4, %%mm6 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
201 "packssdw %%mm4, %%mm4 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
202 "packssdw %%mm5, %%mm5 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
203 "packssdw %%mm6, %%mm6 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
204 "packssdw %%mm4, %%mm4 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
205 "packssdw %%mm5, %%mm5 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
206 "packssdw %%mm6, %%mm6 \n\t"
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
207 REQUANT_CORE( (%1), 8(%1), 16(%1), 24(%1), (%0), 8(%0), 64(%0), 72(%0))
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
208 REQUANT_CORE(32(%1), 40(%1), 48(%1), 56(%1),16(%0),24(%0), 48(%0), 56(%0))
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
209 REQUANT_CORE(64(%1), 72(%1), 80(%1), 88(%1),32(%0),40(%0), 96(%0),104(%0))
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
210 REQUANT_CORE(96(%1),104(%1),112(%1),120(%1),80(%0),88(%0),112(%0),120(%0))
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
211 : : "r" (src), "r" (dst), "g" (threshold1+1), "g" (threshold1+5), "g" (threshold1-4) //FIXME maybe more accurate then needed?
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
212 );
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
213 dst[0]= (src[0] + 4)>>3;
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
214 }
11994
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
215
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
216 static void softthresh_mmx(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
217 int bias= 0; //FIXME
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
218 unsigned int threshold1;
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
219
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
220 threshold1= qp*((1<<4) - bias) - 1;
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
221
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
222 asm volatile(
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
223 #undef REQUANT_CORE
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
224 #define REQUANT_CORE(dst0, dst1, dst2, dst3, src0, src1, src2, src3) \
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
225 "movq " #src0 ", %%mm0 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
226 "movq " #src1 ", %%mm1 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
227 "pxor %%mm6, %%mm6 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
228 "pxor %%mm7, %%mm7 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
229 "pcmpgtw %%mm0, %%mm6 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
230 "pcmpgtw %%mm1, %%mm7 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
231 "pxor %%mm6, %%mm0 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
232 "pxor %%mm7, %%mm1 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
233 "psubusw %%mm4, %%mm0 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
234 "psubusw %%mm4, %%mm1 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
235 "pxor %%mm6, %%mm0 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
236 "pxor %%mm7, %%mm1 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
237 "movq " #src2 ", %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
238 "movq " #src3 ", %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
239 "pxor %%mm6, %%mm6 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
240 "pxor %%mm7, %%mm7 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
241 "pcmpgtw %%mm2, %%mm6 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
242 "pcmpgtw %%mm3, %%mm7 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
243 "pxor %%mm6, %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
244 "pxor %%mm7, %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
245 "psubusw %%mm4, %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
246 "psubusw %%mm4, %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
247 "pxor %%mm6, %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
248 "pxor %%mm7, %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
249 \
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
250 "paddsw %%mm5, %%mm0 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
251 "paddsw %%mm5, %%mm1 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
252 "paddsw %%mm5, %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
253 "paddsw %%mm5, %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
254 "psraw $3, %%mm0 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
255 "psraw $3, %%mm1 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
256 "psraw $3, %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
257 "psraw $3, %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
258 \
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
259 "movq %%mm0, %%mm7 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
260 "punpcklwd %%mm2, %%mm0 \n\t" /*A*/\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
261 "punpckhwd %%mm2, %%mm7 \n\t" /*C*/\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
262 "movq %%mm1, %%mm2 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
263 "punpcklwd %%mm3, %%mm1 \n\t" /*B*/\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
264 "punpckhwd %%mm3, %%mm2 \n\t" /*D*/\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
265 "movq %%mm0, %%mm3 \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
266 "punpcklwd %%mm1, %%mm0 \n\t" /*A*/\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
267 "punpckhwd %%mm7, %%mm3 \n\t" /*C*/\
13393
74fa728e6fc2 100l typo
michael
parents: 13149
diff changeset
268 "punpcklwd %%mm2, %%mm7 \n\t" /*B*/\
11994
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
269 "punpckhwd %%mm2, %%mm1 \n\t" /*D*/\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
270 \
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
271 "movq %%mm0, " #dst0 " \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
272 "movq %%mm7, " #dst1 " \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
273 "movq %%mm3, " #dst2 " \n\t"\
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
274 "movq %%mm1, " #dst3 " \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
275
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
276 "movd %2, %%mm4 \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
277 "movd %3, %%mm5 \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
278 "packssdw %%mm4, %%mm4 \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
279 "packssdw %%mm5, %%mm5 \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
280 "packssdw %%mm4, %%mm4 \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
281 "packssdw %%mm5, %%mm5 \n\t"
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
282 REQUANT_CORE( (%1), 8(%1), 16(%1), 24(%1), (%0), 8(%0), 64(%0), 72(%0))
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
283 REQUANT_CORE(32(%1), 40(%1), 48(%1), 56(%1),16(%0),24(%0), 48(%0), 56(%0))
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
284 REQUANT_CORE(64(%1), 72(%1), 80(%1), 88(%1),32(%0),40(%0), 96(%0),104(%0))
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
285 REQUANT_CORE(96(%1),104(%1),112(%1),120(%1),80(%0),88(%0),112(%0),120(%0))
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
286 : : "r" (src), "r" (dst), "g" (threshold1), "rm" (4) //FIXME maybe more accurate then needed?
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
287 );
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
288
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
289 dst[0]= (src[0] + 4)>>3;
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
290 }
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
291 #endif
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
292
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
293 static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){
11280
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
294 int y;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
295
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
296 for(y=0; y<8; y++){
11280
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
297 *(uint32_t*)&dst[0 + y*stride]+= *(uint32_t*)&block[0 + y*8];
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
298 *(uint32_t*)&dst[2 + y*stride]+= *(uint32_t*)&block[2 + y*8];
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
299 *(uint32_t*)&dst[4 + y*stride]+= *(uint32_t*)&block[4 + y*8];
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
300 *(uint32_t*)&dst[6 + y*stride]+= *(uint32_t*)&block[6 + y*8];
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
301 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
302 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
303
11305
michael
parents: 11304
diff changeset
304 static void store_slice_c(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale){
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
305 int y, x;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
306
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
307 #define STORE(pos) \
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
308 temp= ((src[x + y*src_stride + pos]<<log2_scale) + d[pos])>>6;\
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
309 if(temp & 0x100) temp= ~(temp>>31);\
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
310 dst[x + y*dst_stride + pos]= temp;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
311
11305
michael
parents: 11304
diff changeset
312 for(y=0; y<height; y++){
12157
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
313 const uint8_t *d= dither[y];
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
314 for(x=0; x<width; x+=8){
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
315 int temp;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
316 STORE(0);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
317 STORE(1);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
318 STORE(2);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
319 STORE(3);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
320 STORE(4);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
321 STORE(5);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
322 STORE(6);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
323 STORE(7);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
324 }
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
325 }
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
326 }
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
327
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
328 #ifdef HAVE_MMX
11305
michael
parents: 11304
diff changeset
329 static void store_slice_mmx(uint8_t *dst, int16_t *src, int dst_stride, int src_stride, int width, int height, int log2_scale){
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
330 int y;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
331
11305
michael
parents: 11304
diff changeset
332 for(y=0; y<height; y++){
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
333 uint8_t *dst1= dst;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
334 int16_t *src1= src;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
335 asm volatile(
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
336 "movq (%3), %%mm3 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
337 "movq (%3), %%mm4 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
338 "movd %4, %%mm2 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
339 "pxor %%mm0, %%mm0 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
340 "punpcklbw %%mm0, %%mm3 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
341 "punpckhbw %%mm0, %%mm4 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
342 "psraw %%mm2, %%mm3 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
343 "psraw %%mm2, %%mm4 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
344 "movd %5, %%mm2 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
345 "1: \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
346 "movq (%0), %%mm0 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
347 "movq 8(%0), %%mm1 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
348 "paddw %%mm3, %%mm0 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
349 "paddw %%mm4, %%mm1 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
350 "psraw %%mm2, %%mm0 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
351 "psraw %%mm2, %%mm1 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
352 "packuswb %%mm1, %%mm0 \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
353 "movq %%mm0, (%1) \n\t"
13720
821f464b4d90 adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
aurel
parents: 13393
diff changeset
354 "add $16, %0 \n\t"
821f464b4d90 adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
aurel
parents: 13393
diff changeset
355 "add $8, %1 \n\t"
821f464b4d90 adapting existing mmx/mmx2/sse/3dnow optimizations so they work on x86_64
aurel
parents: 13393
diff changeset
356 "cmp %2, %1 \n\t"
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
357 " jb 1b \n\t"
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
358 : "+r" (src1), "+r"(dst1)
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
359 : "r"(dst + width), "r"(dither[y]), "g"(log2_scale), "g"(6-log2_scale)
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
360 );
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
361 src += src_stride;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
362 dst += dst_stride;
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
363 }
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
364 // if(width != mmxw)
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
365 // store_slice_c(dst + mmxw, src + mmxw, dst_stride, src_stride, width - mmxw, log2_scale);
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
366 }
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
367 #endif
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
368
11305
michael
parents: 11304
diff changeset
369 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;
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
370
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
371 static void (*requantize)(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation)= hardthresh_c;
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
372
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
373 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){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
374 int x, y, i;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
375 const int count= 1<<p->log2_count;
11307
michael
parents: 11305
diff changeset
376 const int stride= is_luma ? p->temp_stride : ((width+16+15)&(~15));
17082
c6da587be0b2 attribute align
michael
parents: 17012
diff changeset
377 uint64_t __attribute__((aligned(16))) block_align[32];
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
378 DCTELEM *block = (DCTELEM *)block_align;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
379 DCTELEM *block2= (DCTELEM *)(block_align+16);
11301
a8dfeb7180ff optimize
michael
parents: 11299
diff changeset
380
13729
045dbaccaccc crash with Y8 colourspace fixed
reimar
parents: 13720
diff changeset
381 if (!src || !dst) return; // HACK avoid crash for Y8 colourspace
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
382 for(y=0; y<height; y++){
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
383 int index= 8 + 8*stride + y*stride;
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 20585
diff changeset
384 fast_memcpy(p->src + index, src + y*src_stride, width);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
385 for(x=0; x<8; x++){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
386 p->src[index - x - 1]= p->src[index + x ];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
387 p->src[index + width + x ]= p->src[index + width - x - 1];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
388 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
389 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
390 for(y=0; y<8; y++){
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 20585
diff changeset
391 fast_memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride);
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 20585
diff changeset
392 fast_memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
393 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
394 //FIXME (try edge emu)
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
395
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
396 for(y=0; y<height+8; y+=8){
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
397 memset(p->temp + (8+y)*stride, 0, 8*stride*sizeof(int16_t));
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
398 for(x=0; x<width+8; x+=8){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
399 const int qps= 3 + is_luma;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
400 int qp;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
401
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
402 if(p->qp)
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
403 qp= p->qp;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
404 else{
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
405 qp= qp_store[ (XMIN(x, width-1)>>qps) + (XMIN(y, height-1)>>qps) * qp_stride];
24552
c9c2e550a449 MPEG-2 blocks at qp 1 get overfiltered by spp, apparently because "qp>>1" turns
diego
parents: 23457
diff changeset
406 if(p->mpeg2) qp = FFMAX(1, qp>>1);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
407 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
408 for(i=0; i<count; i++){
11298
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
409 const int x1= x + offset[i+count-1][0];
14dbc88adaf0 change offsets (quality 2-4 looks better now)
michael
parents: 11296
diff changeset
410 const int y1= y + offset[i+count-1][1];
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
411 const int index= x1 + y1*stride;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
412 p->dsp.get_pixels(block, p->src + index, stride);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
413 p->dsp.fdct(block);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
414 requantize(block2, block, qp, p->dsp.idct_permutation);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
415 p->dsp.idct(block2);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
416 add_block(p->temp + index, stride, block2);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
417 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
418 }
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
419 if(y)
11305
michael
parents: 11304
diff changeset
420 store_slice(dst + (y-8)*dst_stride, p->temp + 8 + y*stride, dst_stride, stride, width, XMIN(8, height+8-y), 6-p->log2_count);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
421 }
11295
michael
parents: 11281
diff changeset
422 #if 0
michael
parents: 11281
diff changeset
423 for(y=0; y<height; y++){
michael
parents: 11281
diff changeset
424 for(x=0; x<width; x++){
michael
parents: 11281
diff changeset
425 if((((x>>6) ^ (y>>6)) & 1) == 0)
michael
parents: 11281
diff changeset
426 dst[x + y*dst_stride]= p->src[8 + 8*stride + x + y*stride];
michael
parents: 11281
diff changeset
427 if((x&63) == 0 || (y&63)==0)
michael
parents: 11281
diff changeset
428 dst[x + y*dst_stride] += 128;
michael
parents: 11281
diff changeset
429 }
michael
parents: 11281
diff changeset
430 }
michael
parents: 11281
diff changeset
431 #endif
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
432 //FIXME reorder for better caching
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
433 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
434
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
435 static int config(struct vf_instance_s* vf,
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
436 int width, int height, int d_width, int d_height,
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
437 unsigned int flags, unsigned int outfmt){
11305
michael
parents: 11304
diff changeset
438 int h= (height+16+15)&(~15);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
439
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
440 vf->priv->temp_stride= (width+16+15)&(~15);
11305
michael
parents: 11304
diff changeset
441 vf->priv->temp= malloc(vf->priv->temp_stride*h*sizeof(int16_t));
michael
parents: 11304
diff changeset
442 vf->priv->src = malloc(vf->priv->temp_stride*h*sizeof(uint8_t));
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
443
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
444 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
445 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
446
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
447 static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
448 if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
449 // ok, we can do pp in-place (or pp disabled):
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
450 vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
16018
bdf1b4ecb906 use stored dimensions instead of visible one when (vf_)get_image is called
iive
parents: 15965
diff changeset
451 mpi->type, mpi->flags | MP_IMGFLAG_READABLE, mpi->width, mpi->height);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
452 mpi->planes[0]=vf->dmpi->planes[0];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
453 mpi->stride[0]=vf->dmpi->stride[0];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
454 mpi->width=vf->dmpi->width;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
455 if(mpi->flags&MP_IMGFLAG_PLANAR){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
456 mpi->planes[1]=vf->dmpi->planes[1];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
457 mpi->planes[2]=vf->dmpi->planes[2];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
458 mpi->stride[1]=vf->dmpi->stride[1];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
459 mpi->stride[2]=vf->dmpi->stride[2];
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
460 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
461 mpi->flags|=MP_IMGFLAG_DIRECT;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
462 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
463
17906
20aca9baf5d8 passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents: 17523
diff changeset
464 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
465 mp_image_t *dmpi;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
466
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
467 if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
468 // no DR, so get a new image! hope we'll get DR buffer:
14022
803be9a78854 removing strange csp matching code (was copy&pasted from vf_pp where it originated from arpi 2.5 years ago) -> fixes spp+scale+x11 crash
michael
parents: 13729
diff changeset
469 dmpi=vf_get_image(vf->next,mpi->imgfmt,
12631
6cbccc0c7d7b Fix memory corruption, noticable at reallocate image
iive
parents: 12163
diff changeset
470 MP_IMGTYPE_TEMP,
6cbccc0c7d7b Fix memory corruption, noticable at reallocate image
iive
parents: 12163
diff changeset
471 MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE,
16018
bdf1b4ecb906 use stored dimensions instead of visible one when (vf_)get_image is called
iive
parents: 15965
diff changeset
472 mpi->width,mpi->height);
12631
6cbccc0c7d7b Fix memory corruption, noticable at reallocate image
iive
parents: 12163
diff changeset
473 vf_clone_mpi_attributes(dmpi, mpi);
6cbccc0c7d7b Fix memory corruption, noticable at reallocate image
iive
parents: 12163
diff changeset
474 }else{
13149
michael
parents: 12631
diff changeset
475 dmpi=vf->dmpi;
12631
6cbccc0c7d7b Fix memory corruption, noticable at reallocate image
iive
parents: 12163
diff changeset
476 }
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
477
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
478 vf->priv->mpeg2= mpi->qscale_type;
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
479 if(mpi->pict_type != 3 && mpi->qscale && !vf->priv->qp){
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
480 if(!vf->priv->non_b_qp)
20585
68b55a823fd4 qp height should be in macroblocks, not pixels
henry
parents: 18131
diff changeset
481 vf->priv->non_b_qp= malloc(mpi->qstride * ((mpi->h + 15) >> 4));
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 20585
diff changeset
482 fast_memcpy(vf->priv->non_b_qp, mpi->qscale, mpi->qstride * ((mpi->h + 15) >> 4));
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
483 }
11307
michael
parents: 11305
diff changeset
484 if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
485 char *qp_tab= vf->priv->non_b_qp;
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
486 if((vf->priv->mode&4) || !qp_tab)
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
487 qp_tab= mpi->qscale;
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
488
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
489 if(qp_tab || vf->priv->qp){
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
490 filter(vf->priv, dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h, qp_tab, mpi->qstride, 1);
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
491 filter(vf->priv, dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0);
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
492 filter(vf->priv, dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, qp_tab, mpi->qstride, 0);
11477
9785bff83777 memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents: 11335
diff changeset
493 }else{
9785bff83777 memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents: 11335
diff changeset
494 memcpy_pic(dmpi->planes[0], mpi->planes[0], mpi->w, mpi->h, dmpi->stride[0], mpi->stride[0]);
9785bff83777 memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents: 11335
diff changeset
495 memcpy_pic(dmpi->planes[1], mpi->planes[1], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[1], mpi->stride[1]);
9785bff83777 memcpy pix instead of black screen if no DR and codec provides no qscale table
michael
parents: 11335
diff changeset
496 memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]);
11308
0c8d12a58a29 skip filter if codec doesnt provide the QP array and user didnt force a QP (fixes diegos segfault)
michael
parents: 11307
diff changeset
497 }
11307
michael
parents: 11305
diff changeset
498 }
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
499
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
500 #ifdef HAVE_MMX
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
501 if(gCpuCaps.hasMMX) asm volatile ("emms\n\t");
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
502 #endif
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
503 #ifdef HAVE_MMX2
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
504 if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t");
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
505 #endif
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
506
17906
20aca9baf5d8 passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents: 17523
diff changeset
507 return vf_next_put_image(vf,dmpi, pts);
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
508 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
509
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
510 static void uninit(struct vf_instance_s* vf){
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
511 if(!vf->priv) return;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
512
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
513 if(vf->priv->temp) free(vf->priv->temp);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
514 vf->priv->temp= NULL;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
515 if(vf->priv->src) free(vf->priv->src);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
516 vf->priv->src= NULL;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
517 if(vf->priv->avctx) free(vf->priv->avctx);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
518 vf->priv->avctx= NULL;
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
519 if(vf->priv->non_b_qp) free(vf->priv->non_b_qp);
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
520 vf->priv->non_b_qp= NULL;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
521
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
522 free(vf->priv);
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
523 vf->priv=NULL;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
524 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
525
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
526 //===========================================================================//
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
527 static int query_format(struct vf_instance_s* vf, unsigned int fmt){
11307
michael
parents: 11305
diff changeset
528 switch(fmt){
michael
parents: 11305
diff changeset
529 case IMGFMT_YVU9:
michael
parents: 11305
diff changeset
530 case IMGFMT_IF09:
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
531 case IMGFMT_YV12:
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
532 case IMGFMT_I420:
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
533 case IMGFMT_IYUV:
11307
michael
parents: 11305
diff changeset
534 case IMGFMT_CLPL:
michael
parents: 11305
diff changeset
535 case IMGFMT_Y800:
michael
parents: 11305
diff changeset
536 case IMGFMT_Y8:
michael
parents: 11305
diff changeset
537 case IMGFMT_444P:
michael
parents: 11305
diff changeset
538 case IMGFMT_422P:
michael
parents: 11305
diff changeset
539 case IMGFMT_411P:
michael
parents: 11305
diff changeset
540 return vf_next_query_format(vf,fmt);
michael
parents: 11305
diff changeset
541 }
michael
parents: 11305
diff changeset
542 return 0;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
543 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
544
11307
michael
parents: 11305
diff changeset
545 static int control(struct vf_instance_s* vf, int request, void* data){
michael
parents: 11305
diff changeset
546 switch(request){
michael
parents: 11305
diff changeset
547 case VFCTRL_QUERY_MAX_PP_LEVEL:
michael
parents: 11305
diff changeset
548 return 6;
michael
parents: 11305
diff changeset
549 case VFCTRL_SET_PP_LEVEL:
michael
parents: 11305
diff changeset
550 vf->priv->log2_count= *((unsigned int*)data);
michael
parents: 11305
diff changeset
551 return CONTROL_TRUE;
michael
parents: 11305
diff changeset
552 }
michael
parents: 11305
diff changeset
553 return vf_next_control(vf,request,data);
michael
parents: 11305
diff changeset
554 }
michael
parents: 11305
diff changeset
555
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
556 static int open(vf_instance_t *vf, char* args){
12157
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
557
14022
803be9a78854 removing strange csp matching code (was copy&pasted from vf_pp where it originated from arpi 2.5 years ago) -> fixes spp+scale+x11 crash
michael
parents: 13729
diff changeset
558 int log2c=-1;
12157
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
559
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
560 vf->config=config;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
561 vf->put_image=put_image;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
562 vf->get_image=get_image;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
563 vf->query_format=query_format;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
564 vf->uninit=uninit;
11307
michael
parents: 11305
diff changeset
565 vf->control= control;
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
566 vf->priv=malloc(sizeof(struct vf_priv_s));
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
567 memset(vf->priv, 0, sizeof(struct vf_priv_s));
11280
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
568
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
569 avcodec_init();
b677102fa650 10l and minor optimization
michael
parents: 11277
diff changeset
570
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
571 vf->priv->avctx= avcodec_alloc_context();
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
572 dsputil_init(&vf->priv->dsp, vf->priv->avctx);
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
573
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
574 vf->priv->log2_count= 3;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
575
12157
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
576 if (args) sscanf(args, "%d:%d:%d", &log2c, &vf->priv->qp, &vf->priv->mode);
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
577
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
578 if( log2c >=0 && log2c <=6 )
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
579 vf->priv->log2_count = log2c;
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
580
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
581 if(vf->priv->qp < 0)
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
582 vf->priv->qp = 0;
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
583
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
584 switch(vf->priv->mode&3){
12157
e26d5e388618 check for invalid user input
iive
parents: 11994
diff changeset
585 default:
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
586 case 0: requantize= hardthresh_c; break;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
587 case 1: requantize= softthresh_c; break;
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
588 }
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
589
11304
f89e212dd5b9 another 10l ...
michael
parents: 11301
diff changeset
590 #ifdef HAVE_MMX
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
591 if(gCpuCaps.hasMMX){
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
592 store_slice= store_slice_mmx;
17110
ba9bf9beb23f prevent flicker, to get old behaviour use spp=x:y:4 / x:y:5
michael
parents: 17082
diff changeset
593 switch(vf->priv->mode&3){
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
594 case 0: requantize= hardthresh_mmx; break;
11994
a7751694c177 spp softthresholding in mmx
michael
parents: 11993
diff changeset
595 case 1: requantize= softthresh_mmx; break;
11993
4e2d99dbef78 spp soft thresholding patch by (James Crowson <jbcrowso at ncsu dot edu>)
michael
parents: 11568
diff changeset
596 }
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
597 }
11304
f89e212dd5b9 another 10l ...
michael
parents: 11301
diff changeset
598 #endif
11299
66bdf2002aab optimizing
michael
parents: 11298
diff changeset
599
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
600 return 1;
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
601 }
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
602
25221
00fff9a3b735 Make all vf_info_t structs const
reimar
parents: 24977
diff changeset
603 const vf_info_t vf_info_spp = {
11277
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
604 "simple postprocess",
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
605 "spp",
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
606 "Michael Niedermayer",
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
607 "",
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
608 open,
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
609 NULL
fffd200d81a7 simple alternative postprocessing filter
michael
parents:
diff changeset
610 };