Skip to content

L
libswscale
Commit c8684bc4 authored by diego's avatar diego
Browse files
Options

whitespace cosmetics: Consistently format function calls without space 

between name and parentheses; shorten some overly long lines.


git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@28981 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 0a10a984
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 65 deletions
swscale_bfin.c
View file @ c8684bc4
...@@ -37,15 +37,15 @@ ...@@ -37,15 +37,15 @@
#define L1CODE #define L1CODE
#endif #endif
int ff_bfin_uyvytoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int ff_bfin_uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
long width, long height, long width, long height,
long lumStride, long chromStride, long srcStride) L1CODE; long lumStride, long chromStride, long srcStride) L1CODE;
int ff_bfin_yuyvtoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
long width, long height, long width, long height,
long lumStride, long chromStride, long srcStride) L1CODE; long lumStride, long chromStride, long srcStride) L1CODE;
static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static int uyvytoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY; uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
...@@ -54,12 +54,13 @@ static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], ...@@ -54,12 +54,13 @@ static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[],
uint8_t *ip = src[0] + srcStride[0]*srcSliceY; uint8_t *ip = src[0] + srcStride[0]*srcSliceY;
int w = dstStride[0]; int w = dstStride[0];
ff_bfin_uyvytoyv12 (ip, dsty, dstu, dstv, w, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
dstStride[0], dstStride[1], srcStride[0]);
return srcSliceH; return srcSliceH;
} }
static int yuyvtoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dst[], int dstStride[]) int srcSliceH, uint8_t* dst[], int dstStride[])
{ {
uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY; uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
...@@ -68,13 +69,14 @@ static int yuyvtoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], ...@@ -68,13 +69,14 @@ static int yuyvtoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[],
uint8_t *ip = src[0] + srcStride[0]*srcSliceY; uint8_t *ip = src[0] + srcStride[0]*srcSliceY;
int w = dstStride[0]; int w = dstStride[0];
ff_bfin_yuyvtoyv12 (ip, dsty, dstu, dstv, w, srcSliceH, dstStride[0], dstStride[1], srcStride[0]); ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
dstStride[0], dstStride[1], srcStride[0]);
return srcSliceH; return srcSliceH;
} }
void ff_bfin_get_unscaled_swscale (SwsContext *c) void ff_bfin_get_unscaled_swscale(SwsContext *c)
{ {
SwsFunc swScale = c->swScale; SwsFunc swScale = c->swScale;
if (c->flags & SWS_CPU_CAPS_BFIN) if (c->flags & SWS_CPU_CAPS_BFIN)
......
yuv2rgb_bfin.c
View file @ c8684bc4
...@@ -38,20 +38,20 @@ ...@@ -38,20 +38,20 @@
#define L1CODE #define L1CODE
#endif #endif
void ff_bfin_yuv2rgb555_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb555_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;
void ff_bfin_yuv2rgb565_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb565_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;
void ff_bfin_yuv2rgb24_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, void ff_bfin_yuv2rgb24_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs) L1CODE; int w, uint32_t *coeffs) L1CODE;
typedef void (* ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out, typedef void (* ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
int w, uint32_t *coeffs); int w, uint32_t *coeffs);
static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks) static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks)
{ {
int oy; int oy;
oy = c->yOffset&0xffff; oy = c->yOffset&0xffff;
...@@ -88,7 +88,7 @@ static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks) ...@@ -88,7 +88,7 @@ static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks)
} }
} }
static int core_yuv420_rgb (SwsContext *c, static int core_yuv420_rgb(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides, uint8_t **oplanes, int *outstrides,
...@@ -99,7 +99,7 @@ static int core_yuv420_rgb (SwsContext *c, ...@@ -99,7 +99,7 @@ static int core_yuv420_rgb (SwsContext *c,
int h2 = srcSliceH>>1; int h2 = srcSliceH>>1;
int i; int i;
bfin_prepare_coefficients (c, rgb, masks); bfin_prepare_coefficients(c, rgb, masks);
py = in[0]; py = in[0];
pu = in[1+(1^rgb)]; pu = in[1+(1^rgb)];
...@@ -109,12 +109,12 @@ static int core_yuv420_rgb (SwsContext *c, ...@@ -109,12 +109,12 @@ static int core_yuv420_rgb (SwsContext *c,
for (i=0;i<h2;i++) { for (i=0;i<h2;i++) {
lcscf (py, pu, pv, op, w, &c->oy); lcscf(py, pu, pv, op, w, &c->oy);
py += instrides[0]; py += instrides[0];
op += outstrides[0]; op += outstrides[0];
lcscf (py, pu, pv, op, w, &c->oy); lcscf(py, pu, pv, op, w, &c->oy);
py += instrides[0]; py += instrides[0];
pu += instrides[1]; pu += instrides[1];
...@@ -126,62 +126,62 @@ static int core_yuv420_rgb (SwsContext *c, ...@@ -126,62 +126,62 @@ static int core_yuv420_rgb (SwsContext *c,
} }
static int bfin_yuv420_rgb555 (SwsContext *c, static int bfin_yuv420_rgb555(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides, return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
ff_bfin_yuv2rgb555_line, 1, 555); outstrides, ff_bfin_yuv2rgb555_line, 1, 555);
} }
static int bfin_yuv420_bgr555 (SwsContext *c, static int bfin_yuv420_bgr555(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides, return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
ff_bfin_yuv2rgb555_line, 0, 555); outstrides, ff_bfin_yuv2rgb555_line, 0, 555);
} }
static int bfin_yuv420_rgb24 (SwsContext *c, static int bfin_yuv420_rgb24(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides, return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
ff_bfin_yuv2rgb24_line, 1, 888); outstrides, ff_bfin_yuv2rgb24_line, 1, 888);
} }
static int bfin_yuv420_bgr24 (SwsContext *c, static int bfin_yuv420_bgr24(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides, return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
ff_bfin_yuv2rgb24_line, 0, 888); outstrides, ff_bfin_yuv2rgb24_line, 0, 888);
} }
static int bfin_yuv420_rgb565 (SwsContext *c, static int bfin_yuv420_rgb565(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides, return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
ff_bfin_yuv2rgb565_line, 1, 565); outstrides, ff_bfin_yuv2rgb565_line, 1, 565);
} }
static int bfin_yuv420_bgr565 (SwsContext *c, static int bfin_yuv420_bgr565(SwsContext *c,
uint8_t **in, int *instrides, uint8_t **in, int *instrides,
int srcSliceY, int srcSliceH, int srcSliceY, int srcSliceH,
uint8_t **oplanes, int *outstrides) uint8_t **oplanes, int *outstrides)
{ {
return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides, return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
ff_bfin_yuv2rgb565_line, 0, 565); outstrides, ff_bfin_yuv2rgb565_line, 0, 565);
} }
SwsFunc ff_bfin_yuv2rgb_get_func_ptr (SwsContext *c) SwsFunc ff_bfin_yuv2rgb_get_func_ptr(SwsContext *c)
{ {
SwsFunc f; SwsFunc f;
......
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