Skip to content

F
ffmpeg.wasm-core
Commit 49aa3974 authored by Jordi Ortiz's avatar Jordi Ortiz Committed by Michael Niedermayer
Browse files
Options

Dirac: More formating 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent ca239e1c
Show whitespace changes
Inline Side-by-side
Showing with 120 additions and 122 deletions
libavcodec/dirac_arith.c
View file @ 49aa3974
...@@ -20,13 +20,14 @@ ...@@ -20,13 +20,14 @@
*/ */
/** /**
* @file libavcodec/dirac_arith.c * @file
* Arithmetic decoder for Dirac * Arithmetic decoder for Dirac
* @author Marco Gerards <marco@gnu.org> * @author Marco Gerards <marco@gnu.org>
*/ */
#include "dirac_arith.h" #include "dirac_arith.h"
const uint16_t ff_dirac_prob[256] = { const uint16_t ff_dirac_prob[256] = {
0, 2, 5, 8, 11, 15, 20, 24, 0, 2, 5, 8, 11, 15, 20, 24,
29, 35, 41, 47, 53, 60, 67, 74, 29, 35, 41, 47, 53, 60, 67, 74,
......
libavcodec/dirac_arith.h
View file @ 49aa3974
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
/** /**
* @file libavcodec/dirac_arith.h * @file
* Arithmetic decoder for Dirac * Arithmetic decoder for Dirac
* @author Marco Gerards <marco@gnu.org> * @author Marco Gerards <marco@gnu.org>
*/ */
......
libavcodec/diracdec.c
View file @ 49aa3974
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#include "dirac.h" #include "dirac.h"
#include "diracdsp.h" #include "diracdsp.h"
#undef printf
/** /**
* The spec limits the number of wavelet decompositions to 4 for both * The spec limits the number of wavelet decompositions to 4 for both
* level 1 (VC-2) and 128 (long-gop default). * level 1 (VC-2) and 128 (long-gop default).
...@@ -81,7 +79,6 @@ ...@@ -81,7 +79,6 @@
typedef struct { typedef struct {
AVFrame avframe; AVFrame avframe;
int interpolated[3]; /* 1 if hpel[] is valid */ int interpolated[3]; /* 1 if hpel[] is valid */
uint8_t *hpel[3][4]; uint8_t *hpel[3][4];
uint8_t *hpel_base[3][4]; uint8_t *hpel_base[3][4];
......
libavcodec/diracdsp.c
View file @ 49aa3974
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "diracdsp.h" #include "diracdsp.h"
//MMX_DISABLE #include "libavcodec/x86/diracdsp_mmx.h" /* MMX_DISABLE #include "libavcodec/x86/diracdsp_mmx.h" */
#define FILTER(src, stride) \ #define FILTER(src, stride) \
((21*((src)[ 0*stride] + (src)[1*stride]) \ ((21*((src)[ 0*stride] + (src)[1*stride]) \
...@@ -51,27 +51,27 @@ static void dirac_hpel_filter(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, uint8 ...@@ -51,27 +51,27 @@ static void dirac_hpel_filter(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, uint8
} }
#define PIXOP_BILINEAR(PFX, OP, WIDTH) \ #define PIXOP_BILINEAR(PFX, OP, WIDTH) \
static void ff_ ## PFX ## _dirac_pixels ## WIDTH ## _bilinear_c(uint8_t *dst, const uint8_t *src[5], int stride, int h)\ static void ff_ ## PFX ## _dirac_pixels ## WIDTH ## _bilinear_c(uint8_t *dst, const uint8_t *src[5], int stride, int h) \
{\ { \
int x;\ int x; \
const uint8_t *s0 = src[0];\ const uint8_t *s0 = src[0]; \
const uint8_t *s1 = src[1];\ const uint8_t *s1 = src[1]; \
const uint8_t *s2 = src[2];\ const uint8_t *s2 = src[2]; \
const uint8_t *s3 = src[3];\ const uint8_t *s3 = src[3]; \
const uint8_t *w = src[4];\ const uint8_t *w = src[4]; \
\ \
while (h--) {\ while (h--) { \
for (x = 0; x < WIDTH; x++) {\ for (x = 0; x < WIDTH; x++) { \
OP(dst[x], (s0[x]*w[0] + s1[x]*w[1] + s2[x]*w[2] + s3[x]*w[3] + 8) >> 4);\ OP(dst[x], (s0[x]*w[0] + s1[x]*w[1] + s2[x]*w[2] + s3[x]*w[3] + 8) >> 4); \
}\ } \
\ \
dst += stride;\ dst += stride; \
s0 += stride;\ s0 += stride; \
s1 += stride;\ s1 += stride; \
s2 += stride;\ s2 += stride; \
s3 += stride;\ s3 += stride; \
}\ } \
} }
#define OP_PUT(dst, val) (dst) = (val) #define OP_PUT(dst, val) (dst) = (val)
#define OP_AVG(dst, val) (dst) = (((dst) + (val) + 1)>>1) #define OP_AVG(dst, val) (dst) = (((dst) + (val) + 1)>>1)
...@@ -87,7 +87,7 @@ PIXOP_BILINEAR(avg, OP_AVG, 32) ...@@ -87,7 +87,7 @@ PIXOP_BILINEAR(avg, OP_AVG, 32)
#define op_scale2(x) dst[x] = av_clip_uint8( (src[x]*weights + dst[x]*weightd + (1<<(log2_denom-1))) >> log2_denom) #define op_scale2(x) dst[x] = av_clip_uint8( (src[x]*weights + dst[x]*weightd + (1<<(log2_denom-1))) >> log2_denom)
#define DIRAC_WEIGHT(W) \ #define DIRAC_WEIGHT(W) \
static void weight_dirac_pixels ## W ## _c(uint8_t *block, int stride, int log2_denom, \ static void weight_dirac_pixels ## W ## _c(uint8_t *block, int stride, int log2_denom, \
int weight, int h) { \ int weight, int h) { \
int x; \ int x; \
while (h--) { \ while (h--) { \
...@@ -97,8 +97,8 @@ static void weight_dirac_pixels ## W ## _c(uint8_t *block, int stride, int log2_ ...@@ -97,8 +97,8 @@ static void weight_dirac_pixels ## W ## _c(uint8_t *block, int stride, int log2_
} \ } \
block += stride; \ block += stride; \
} \ } \
} \ } \
static void biweight_dirac_pixels ## W ## _c(uint8_t *dst, uint8_t *src, int stride, int log2_denom, \ static void biweight_dirac_pixels ## W ## _c(uint8_t *dst, uint8_t *src, int stride, int log2_denom, \
int weightd, int weights, int h) { \ int weightd, int weights, int h) { \
int x; \ int x; \
while (h--) { \ while (h--) { \
...@@ -109,16 +109,16 @@ static void biweight_dirac_pixels ## W ## _c(uint8_t *dst, uint8_t *src, int str ...@@ -109,16 +109,16 @@ static void biweight_dirac_pixels ## W ## _c(uint8_t *dst, uint8_t *src, int str
dst += stride; \ dst += stride; \
src += stride; \ src += stride; \
} \ } \
} }
DIRAC_WEIGHT(8) DIRAC_WEIGHT(8)
DIRAC_WEIGHT(16) DIRAC_WEIGHT(16)
DIRAC_WEIGHT(32) DIRAC_WEIGHT(32)
#define ADD_OBMC(xblen) \ #define ADD_OBMC(xblen) \
static void add_obmc ## xblen ## _c(uint16_t *dst, const uint8_t *src, int stride, \ static void add_obmc ## xblen ## _c(uint16_t *dst, const uint8_t *src, int stride, \
const uint8_t *obmc_weight, int yblen) \ const uint8_t *obmc_weight, int yblen) \
{ \ { \
int x; \ int x; \
while (yblen--) { \ while (yblen--) { \
for (x = 0; x < xblen; x += 2) { \ for (x = 0; x < xblen; x += 2) { \
...@@ -129,7 +129,7 @@ static void add_obmc ## xblen ## _c(uint16_t *dst, const uint8_t *src, int strid ...@@ -129,7 +129,7 @@ static void add_obmc ## xblen ## _c(uint16_t *dst, const uint8_t *src, int strid
src += stride; \ src += stride; \
obmc_weight += 32; \ obmc_weight += 32; \
} \ } \
} }
ADD_OBMC(8) ADD_OBMC(8)
ADD_OBMC(16) ADD_OBMC(16)
...@@ -197,5 +197,5 @@ void ff_diracdsp_init(DiracDSPContext *c) ...@@ -197,5 +197,5 @@ void ff_diracdsp_init(DiracDSPContext *c)
PIXFUNC(avg, 16); PIXFUNC(avg, 16);
PIXFUNC(avg, 32); PIXFUNC(avg, 32);
//MMX_DISABLE if (HAVE_MMX) ff_diracdsp_init_mmx(c); /* MMX_DISABLE if (HAVE_MMX) ff_diracdsp_init_mmx(c); */
} }
libavcodec/x86/diracdsp_mmx.c
View file @ 49aa3974
...@@ -27,24 +27,24 @@ void ff_put_signed_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t ...@@ -27,24 +27,24 @@ void ff_put_signed_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t
void ff_put_signed_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height); void ff_put_signed_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
#define HPEL_FILTER(MMSIZE, EXT) \ #define HPEL_FILTER(MMSIZE, EXT) \
void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, uint8_t *, int, int);\ void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, uint8_t *, int, int); \
void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, uint8_t *, int);\ void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, uint8_t *, int); \
\ \
static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc,\ static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \
uint8_t *src, int stride, int width, int height)\ uint8_t *src, int stride, int width, int height) \
{\ { \
while( height-- )\ while( height-- ) \
{\ { \
ff_dirac_hpel_filter_v_ ## EXT(dstv-MMSIZE, src-MMSIZE, stride, width+MMSIZE+5);\ ff_dirac_hpel_filter_v_ ## EXT(dstv-MMSIZE, src-MMSIZE, stride, width+MMSIZE+5); \
ff_dirac_hpel_filter_h_ ## EXT(dsth, src, width);\ ff_dirac_hpel_filter_h_ ## EXT(dsth, src, width); \
ff_dirac_hpel_filter_h_ ## EXT(dstc, dstv, width);\ ff_dirac_hpel_filter_h_ ## EXT(dstc, dstv, width); \
\ \
dsth += stride;\ dsth += stride; \
dstv += stride;\ dstv += stride; \
dstc += stride;\ dstc += stride; \
src += stride;\ src += stride; \
}\ } \
} }
#if !ARCH_X86_64 #if !ARCH_X86_64
HPEL_FILTER(8, mmx) HPEL_FILTER(8, mmx)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment