mirror of https://github.com/FFmpeg/FFmpeg.git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>pull/23/head
parent
160ea26560
commit
d4a4661342
11 changed files with 166 additions and 465 deletions
@ -1,386 +0,0 @@ |
||||
/*
|
||||
* Discrete wavelet transform |
||||
* Copyright (c) 2007 Kamil Nowosad |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
/**
|
||||
* Discrete wavelet transform |
||||
* @file |
||||
* @author Kamil Nowosad |
||||
*/ |
||||
|
||||
#include "j2k_dwt.h" |
||||
|
||||
static const float scale97[] = {1.625786, 1.230174}; |
||||
|
||||
static inline void extend53(int *p, int i0, int i1) |
||||
{ |
||||
p[i0 - 1] = p[i0 + 1]; |
||||
p[i1 ] = p[i1 - 2]; |
||||
p[i0 - 2] = p[i0 + 2]; |
||||
p[i1 + 1] = p[i1 - 3]; |
||||
} |
||||
|
||||
static inline void extend97(float *p, int i0, int i1) |
||||
{ |
||||
int i; |
||||
|
||||
for (i = 1; i <= 4; i++){ |
||||
p[i0 - i] = p[i0 + i]; |
||||
p[i1 + i - 1] = p[i1 - i - 1]; |
||||
} |
||||
} |
||||
|
||||
static void sd_1d53(int *p, int i0, int i1) |
||||
{ |
||||
int i; |
||||
|
||||
if (i1 == i0 + 1) |
||||
return; |
||||
|
||||
extend53(p, i0, i1); |
||||
|
||||
for (i = (i0+1)/2 - 1; i < (i1+1)/2; i++) |
||||
p[2*i+1] -= (p[2*i] + p[2*i+2]) >> 1; |
||||
for (i = (i0+1)/2; i < (i1+1)/2; i++) |
||||
p[2*i] += (p[2*i-1] + p[2*i+1] + 2) >> 2; |
||||
} |
||||
|
||||
static void dwt_encode53(DWTContext *s, int *t) |
||||
{ |
||||
int lev, |
||||
w = s->linelen[s->ndeclevels-1][0]; |
||||
int *line = s->linebuf; |
||||
line += 3; |
||||
|
||||
for (lev = s->ndeclevels-1; lev >= 0; lev--){ |
||||
int lh = s->linelen[lev][0], |
||||
lv = s->linelen[lev][1], |
||||
mh = s->mod[lev][0], |
||||
mv = s->mod[lev][1], |
||||
lp; |
||||
int *l; |
||||
|
||||
// HOR_SD
|
||||
l = line + mh; |
||||
for (lp = 0; lp < lv; lp++){ |
||||
int i, j = 0; |
||||
|
||||
for (i = 0; i < lh; i++) |
||||
l[i] = t[w*lp + i]; |
||||
|
||||
sd_1d53(line, mh, mh + lh); |
||||
|
||||
// copy back and deinterleave
|
||||
for (i = mh; i < lh; i+=2, j++) |
||||
t[w*lp + j] = l[i]; |
||||
for (i = 1-mh; i < lh; i+=2, j++) |
||||
t[w*lp + j] = l[i]; |
||||
} |
||||
|
||||
// VER_SD
|
||||
l = line + mv; |
||||
for (lp = 0; lp < lh; lp++) { |
||||
int i, j = 0; |
||||
|
||||
for (i = 0; i < lv; i++) |
||||
l[i] = t[w*i + lp]; |
||||
|
||||
sd_1d53(line, mv, mv + lv); |
||||
|
||||
// copy back and deinterleave
|
||||
for (i = mv; i < lv; i+=2, j++) |
||||
t[w*j + lp] = l[i]; |
||||
for (i = 1-mv; i < lv; i+=2, j++) |
||||
t[w*j + lp] = l[i]; |
||||
} |
||||
} |
||||
} |
||||
|
||||
static void sd_1d97(float *p, int i0, int i1) |
||||
{ |
||||
int i; |
||||
|
||||
if (i1 == i0 + 1) |
||||
return; |
||||
|
||||
extend97(p, i0, i1); |
||||
i0++; i1++; |
||||
|
||||
for (i = i0/2 - 2; i < i1/2 + 1; i++) |
||||
p[2*i+1] -= 1.586134 * (p[2*i] + p[2*i+2]); |
||||
for (i = i0/2 - 1; i < i1/2 + 1; i++) |
||||
p[2*i] -= 0.052980 * (p[2*i-1] + p[2*i+1]); |
||||
for (i = i0/2 - 1; i < i1/2; i++) |
||||
p[2*i+1] += 0.882911 * (p[2*i] + p[2*i+2]); |
||||
for (i = i0/2; i < i1/2; i++) |
||||
p[2*i] += 0.443506 * (p[2*i-1] + p[2*i+1]); |
||||
} |
||||
|
||||
static void dwt_encode97(DWTContext *s, int *t) |
||||
{ |
||||
int lev, |
||||
w = s->linelen[s->ndeclevels-1][0]; |
||||
float *line = s->linebuf; |
||||
line += 5; |
||||
|
||||
for (lev = s->ndeclevels-1; lev >= 0; lev--){ |
||||
int lh = s->linelen[lev][0], |
||||
lv = s->linelen[lev][1], |
||||
mh = s->mod[lev][0], |
||||
mv = s->mod[lev][1], |
||||
lp; |
||||
float *l; |
||||
|
||||
// HOR_SD
|
||||
l = line + mh; |
||||
for (lp = 0; lp < lv; lp++){ |
||||
int i, j = 0; |
||||
|
||||
for (i = 0; i < lh; i++) |
||||
l[i] = t[w*lp + i]; |
||||
|
||||
sd_1d97(line, mh, mh + lh); |
||||
|
||||
// copy back and deinterleave
|
||||
for (i = mh; i < lh; i+=2, j++) |
||||
t[w*lp + j] = scale97[0] * l[i] / 2; |
||||
for (i = 1-mh; i < lh; i+=2, j++) |
||||
t[w*lp + j] = scale97[1] * l[i] / 2; |
||||
} |
||||
|
||||
// VER_SD
|
||||
l = line + mv; |
||||
for (lp = 0; lp < lh; lp++) { |
||||
int i, j = 0; |
||||
|
||||
for (i = 0; i < lv; i++) |
||||
l[i] = t[w*i + lp]; |
||||
|
||||
sd_1d97(line, mv, mv + lv); |
||||
|
||||
// copy back and deinterleave
|
||||
for (i = mv; i < lv; i+=2, j++) |
||||
t[w*j + lp] = scale97[0] * l[i] / 2; |
||||
for (i = 1-mv; i < lv; i+=2, j++) |
||||
t[w*j + lp] = scale97[1] * l[i] / 2; |
||||
} |
||||
} |
||||
} |
||||
|
||||
static void sr_1d53(int *p, int i0, int i1) |
||||
{ |
||||
int i; |
||||
|
||||
if (i1 == i0 + 1) |
||||
return; |
||||
|
||||
extend53(p, i0, i1); |
||||
|
||||
for (i = i0/2; i < i1/2 + 1; i++) |
||||
p[2*i] -= (p[2*i-1] + p[2*i+1] + 2) >> 2; |
||||
for (i = i0/2; i < i1/2; i++) |
||||
p[2*i+1] += (p[2*i] + p[2*i+2]) >> 1; |
||||
} |
||||
|
||||
static void dwt_decode53(DWTContext *s, int *t) |
||||
{ |
||||
int lev, |
||||
w = s->linelen[s->ndeclevels-1][0]; |
||||
int *line = s->linebuf; |
||||
line += 3; |
||||
|
||||
for (lev = 0; lev < s->ndeclevels; lev++){ |
||||
int lh = s->linelen[lev][0], |
||||
lv = s->linelen[lev][1], |
||||
mh = s->mod[lev][0], |
||||
mv = s->mod[lev][1], |
||||
lp; |
||||
int *l; |
||||
|
||||
// HOR_SD
|
||||
l = line + mh; |
||||
for (lp = 0; lp < lv; lp++){ |
||||
int i, j = 0; |
||||
// copy with interleaving
|
||||
for (i = mh; i < lh; i+=2, j++) |
||||
l[i] = t[w*lp + j]; |
||||
for (i = 1-mh; i < lh; i+=2, j++) |
||||
l[i] = t[w*lp + j]; |
||||
|
||||
sr_1d53(line, mh, mh + lh); |
||||
|
||||
for (i = 0; i < lh; i++) |
||||
t[w*lp + i] = l[i]; |
||||
} |
||||
|
||||
// VER_SD
|
||||
l = line + mv; |
||||
for (lp = 0; lp < lh; lp++){ |
||||
int i, j = 0; |
||||
// copy with interleaving
|
||||
for (i = mv; i < lv; i+=2, j++) |
||||
l[i] = t[w*j + lp]; |
||||
for (i = 1-mv; i < lv; i+=2, j++) |
||||
l[i] = t[w*j + lp]; |
||||
|
||||
sr_1d53(line, mv, mv + lv); |
||||
|
||||
for (i = 0; i < lv; i++) |
||||
t[w*i + lp] = l[i]; |
||||
} |
||||
} |
||||
} |
||||
|
||||
static void sr_1d97(float *p, int i0, int i1) |
||||
{ |
||||
int i; |
||||
|
||||
if (i1 == i0 + 1) |
||||
return; |
||||
|
||||
extend97(p, i0, i1); |
||||
|
||||
for (i = i0/2 - 1; i < i1/2 + 2; i++) |
||||
p[2*i] -= 0.443506 * (p[2*i-1] + p[2*i+1]); |
||||
for (i = i0/2 - 1; i < i1/2 + 1; i++) |
||||
p[2*i+1] -= 0.882911 * (p[2*i] + p[2*i+2]); |
||||
for (i = i0/2; i < i1/2 + 1; i++) |
||||
p[2*i] += 0.052980 * (p[2*i-1] + p[2*i+1]); |
||||
for (i = i0/2; i < i1/2; i++) |
||||
p[2*i+1] += 1.586134 * (p[2*i] + p[2*i+2]); |
||||
} |
||||
|
||||
static void dwt_decode97(DWTContext *s, int *t) |
||||
{ |
||||
int lev, |
||||
w = s->linelen[s->ndeclevels-1][0]; |
||||
float *line = s->linebuf; |
||||
line += 5; |
||||
|
||||
for (lev = 0; lev < s->ndeclevels; lev++){ |
||||
int lh = s->linelen[lev][0], |
||||
lv = s->linelen[lev][1], |
||||
mh = s->mod[lev][0], |
||||
mv = s->mod[lev][1], |
||||
lp; |
||||
float *l; |
||||
|
||||
// HOR_SD
|
||||
l = line + mh; |
||||
for (lp = 0; lp < lv; lp++){ |
||||
int i, j = 0; |
||||
// copy with interleaving
|
||||
for (i = mh; i < lh; i+=2, j++) |
||||
l[i] = scale97[1] * t[w*lp + j]; |
||||
for (i = 1-mh; i < lh; i+=2, j++) |
||||
l[i] = scale97[0] * t[w*lp + j]; |
||||
|
||||
sr_1d97(line, mh, mh + lh); |
||||
|
||||
for (i = 0; i < lh; i++) |
||||
t[w*lp + i] = l[i]; |
||||
} |
||||
|
||||
// VER_SD
|
||||
l = line + mv; |
||||
for (lp = 0; lp < lh; lp++){ |
||||
int i, j = 0; |
||||
// copy with interleaving
|
||||
for (i = mv; i < lv; i+=2, j++) |
||||
l[i] = scale97[1] * t[w*j + lp]; |
||||
for (i = 1-mv; i < lv; i+=2, j++) |
||||
l[i] = scale97[0] * t[w*j + lp]; |
||||
|
||||
sr_1d97(line, mv, mv + lv); |
||||
|
||||
for (i = 0; i < lv; i++) |
||||
t[w*i + lp] = l[i]; |
||||
} |
||||
} |
||||
} |
||||
|
||||
int ff_j2k_dwt_init(DWTContext *s, uint16_t border[2][2], int decomp_levels, int type) |
||||
{ |
||||
int i, j, lev = decomp_levels, maxlen, |
||||
b[2][2]; |
||||
|
||||
if ((unsigned)decomp_levels >= FF_DWT_MAX_DECLVLS) |
||||
return AVERROR_INVALIDDATA; |
||||
s->ndeclevels = decomp_levels; |
||||
s->type = type; |
||||
|
||||
for (i = 0; i < 2; i++) |
||||
for(j = 0; j < 2; j++) |
||||
b[i][j] = border[i][j]; |
||||
|
||||
maxlen = FFMAX(b[0][1] - b[0][0], |
||||
b[1][1] - b[1][0]); |
||||
|
||||
while(--lev >= 0){ |
||||
for (i = 0; i < 2; i++){ |
||||
s->linelen[lev][i] = b[i][1] - b[i][0]; |
||||
s->mod[lev][i] = b[i][0] & 1; |
||||
for (j = 0; j < 2; j++) |
||||
b[i][j] = (b[i][j] + 1) >> 1; |
||||
} |
||||
} |
||||
if (type == FF_DWT97) |
||||
s->linebuf = av_malloc((maxlen + 12) * sizeof(float)); |
||||
else if (type == FF_DWT53) |
||||
s->linebuf = av_malloc((maxlen + 6) * sizeof(int)); |
||||
else |
||||
return -1; |
||||
|
||||
if (!s->linebuf) |
||||
return AVERROR(ENOMEM); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int ff_j2k_dwt_encode(DWTContext *s, int *t) |
||||
{ |
||||
switch(s->type){ |
||||
case FF_DWT97: |
||||
dwt_encode97(s, t); break; |
||||
case FF_DWT53: |
||||
dwt_encode53(s, t); break; |
||||
default: |
||||
return -1; |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
int ff_j2k_dwt_decode(DWTContext *s, int *t) |
||||
{ |
||||
switch(s->type){ |
||||
case FF_DWT97: |
||||
dwt_decode97(s, t); break; |
||||
case FF_DWT53: |
||||
dwt_decode53(s, t); break; |
||||
default: |
||||
return -1; |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
void ff_j2k_dwt_destroy(DWTContext *s) |
||||
{ |
||||
av_freep(&s->linebuf); |
||||
} |
@ -1,63 +0,0 @@ |
||||
/*
|
||||
* Discrete wavelet transform |
||||
* Copyright (c) 2007 Kamil Nowosad |
||||
* |
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVCODEC_DWT_H |
||||
#define AVCODEC_DWT_H |
||||
|
||||
/**
|
||||
* Discrete wavelet transform |
||||
* @file |
||||
* @author Kamil Nowosad |
||||
*/ |
||||
|
||||
#include "avcodec.h" |
||||
|
||||
#define FF_DWT_MAX_DECLVLS 32 ///< max number of decomposition levels
|
||||
|
||||
enum DWTType{ |
||||
FF_DWT97, |
||||
FF_DWT53 |
||||
}; |
||||
|
||||
typedef struct { |
||||
///line lengths {horizontal, vertical} in consecutive decomposition levels
|
||||
uint16_t linelen[FF_DWT_MAX_DECLVLS][2]; |
||||
uint8_t mod[FF_DWT_MAX_DECLVLS][2]; ///< coordinates (x0, y0) of decomp. levels mod 2
|
||||
uint8_t ndeclevels; ///< number of decomposition levels
|
||||
uint8_t type; ///< 0 for 9/7; 1 for 5/3
|
||||
void *linebuf; ///< buffer used by transform (int or float)
|
||||
} DWTContext; |
||||
|
||||
/**
|
||||
* initialize DWT |
||||
* @param s DWT context |
||||
* @param border coordinates of transformed region {{x0, x1}, {y0, y1}} |
||||
* @param decomp_levels number of decomposition levels |
||||
* @param type 0 for DWT 9/7; 1 for DWT 5/3 |
||||
*/ |
||||
int ff_j2k_dwt_init(DWTContext *s, uint16_t border[2][2], int decomp_levels, int type); |
||||
|
||||
int ff_j2k_dwt_encode(DWTContext *s, int *t); |
||||
int ff_j2k_dwt_decode(DWTContext *s, int *t); |
||||
|
||||
void ff_j2k_dwt_destroy(DWTContext *s); |
||||
|
||||
#endif /* AVCODEC_DWT_H */ |
@ -1,4 +1,4 @@ |
||||
fc02bacb438c091a96ab327ab7aca5f9 *tests/data/fate/vsynth1-j2k-97.avi |
||||
2034146 tests/data/fate/vsynth1-j2k-97.avi |
||||
5975c315f9fd79e57e26bda1f749e8f6 *tests/data/fate/vsynth1-j2k-97.out.rawvideo |
||||
stddev: 8.77 PSNR: 29.26 MAXDIFF: 104 bytes: 7603200/ 7603200 |
||||
1222a8f36e34ce161a04afc1a0be37ec *tests/data/fate/vsynth1-j2k-97.avi |
||||
2034226 tests/data/fate/vsynth1-j2k-97.avi |
||||
42bb661ff1927fd6691ed99a755df5ea *tests/data/fate/vsynth1-j2k-97.out.rawvideo |
||||
stddev: 7.58 PSNR: 30.53 MAXDIFF: 104 bytes: 7603200/ 7603200 |
||||
|
@ -1,4 +1,4 @@ |
||||
316ae4cce1ba8cf0b359c9d25322711f *tests/data/fate/vsynth2-j2k-97.avi |
||||
1005146 tests/data/fate/vsynth2-j2k-97.avi |
||||
b7826bc75f9c04754d12fa01b3e69a4a *tests/data/fate/vsynth2-j2k-97.out.rawvideo |
||||
stddev: 7.91 PSNR: 30.16 MAXDIFF: 64 bytes: 7603200/ 7603200 |
||||
82b35e3f587babe909da920597fcf4a8 *tests/data/fate/vsynth2-j2k-97.avi |
||||
1004984 tests/data/fate/vsynth2-j2k-97.avi |
||||
3d29c50c8f2ae433c39cb46855fe8a34 *tests/data/fate/vsynth2-j2k-97.out.rawvideo |
||||
stddev: 6.57 PSNR: 31.77 MAXDIFF: 61 bytes: 7603200/ 7603200 |
||||
|
Loading…
Reference in new issue