whitespace cosmetics: Consistently format function calls without space
between name and parentheses; shorten some overly long lines. Originally committed as revision 28981 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
This commit is contained in:
		
							parent
							
								
									137707e53a
								
							
						
					
					
						commit
						7f5ee4eaa9
					
				@ -37,16 +37,16 @@
 | 
			
		||||
#define L1CODE
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
int ff_bfin_uyvytoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 | 
			
		||||
                        long width, long height,
 | 
			
		||||
                        long lumStride, long chromStride, long srcStride) L1CODE;
 | 
			
		||||
int ff_bfin_uyvytoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 | 
			
		||||
                       long width, long height,
 | 
			
		||||
                       long lumStride, long chromStride, long srcStride) L1CODE;
 | 
			
		||||
 | 
			
		||||
int ff_bfin_yuyvtoyv12 (const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 | 
			
		||||
                        long width, long height,
 | 
			
		||||
                        long lumStride, long chromStride, long srcStride) L1CODE;
 | 
			
		||||
int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst,
 | 
			
		||||
                       long width, long height,
 | 
			
		||||
                       long lumStride, long chromStride, long srcStride) L1CODE;
 | 
			
		||||
 | 
			
		||||
static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
 | 
			
		||||
                                int srcSliceH, uint8_t* dst[], int dstStride[])
 | 
			
		||||
static int uyvytoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
 | 
			
		||||
                               int srcSliceH, uint8_t* dst[], int dstStride[])
 | 
			
		||||
{
 | 
			
		||||
    uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
 | 
			
		||||
    uint8_t *dstu = dst[1] + dstStride[1]*srcSliceY/2;
 | 
			
		||||
@ -54,13 +54,14 @@ static int uyvytoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[],
 | 
			
		||||
    uint8_t *ip   = src[0] + srcStride[0]*srcSliceY;
 | 
			
		||||
    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;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int yuyvtoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
 | 
			
		||||
                                int srcSliceH, uint8_t* dst[], int dstStride[])
 | 
			
		||||
static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
 | 
			
		||||
                               int srcSliceH, uint8_t* dst[], int dstStride[])
 | 
			
		||||
{
 | 
			
		||||
    uint8_t *dsty = dst[0] + dstStride[0]*srcSliceY;
 | 
			
		||||
    uint8_t *dstu = dst[1] + dstStride[1]*srcSliceY/2;
 | 
			
		||||
@ -68,13 +69,14 @@ static int yuyvtoyv12_unscaled (SwsContext *c, uint8_t* src[], int srcStride[],
 | 
			
		||||
    uint8_t *ip   = src[0] + srcStride[0]*srcSliceY;
 | 
			
		||||
    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;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void ff_bfin_get_unscaled_swscale (SwsContext *c)
 | 
			
		||||
void ff_bfin_get_unscaled_swscale(SwsContext *c)
 | 
			
		||||
{
 | 
			
		||||
    SwsFunc swScale = c->swScale;
 | 
			
		||||
    if (c->flags & SWS_CPU_CAPS_BFIN)
 | 
			
		||||
 | 
			
		||||
@ -38,20 +38,20 @@
 | 
			
		||||
#define L1CODE
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
void ff_bfin_yuv2rgb555_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
 | 
			
		||||
                              int w, uint32_t *coeffs) L1CODE;
 | 
			
		||||
 | 
			
		||||
void ff_bfin_yuv2rgb565_line (uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
 | 
			
		||||
                              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_yuv2rgb555_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
 | 
			
		||||
                             int w, uint32_t *coeffs) L1CODE;
 | 
			
		||||
 | 
			
		||||
void ff_bfin_yuv2rgb565_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
 | 
			
		||||
                             int w, uint32_t *coeffs) L1CODE;
 | 
			
		||||
 | 
			
		||||
void ff_bfin_yuv2rgb24_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
 | 
			
		||||
                            int w, uint32_t *coeffs) L1CODE;
 | 
			
		||||
 | 
			
		||||
typedef void (* ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
 | 
			
		||||
                            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;
 | 
			
		||||
    oy      = c->yOffset&0xffff;
 | 
			
		||||
@ -88,18 +88,18 @@ static void bfin_prepare_coefficients (SwsContext *c, int rgb, int masks)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int core_yuv420_rgb (SwsContext *c,
 | 
			
		||||
                            uint8_t **in, int *instrides,
 | 
			
		||||
                            int srcSliceY, int srcSliceH,
 | 
			
		||||
                            uint8_t **oplanes, int *outstrides,
 | 
			
		||||
                            ltransform lcscf, int rgb, int masks)
 | 
			
		||||
static int core_yuv420_rgb(SwsContext *c,
 | 
			
		||||
                           uint8_t **in, int *instrides,
 | 
			
		||||
                           int srcSliceY, int srcSliceH,
 | 
			
		||||
                           uint8_t **oplanes, int *outstrides,
 | 
			
		||||
                           ltransform lcscf, int rgb, int masks)
 | 
			
		||||
{
 | 
			
		||||
    uint8_t *py,*pu,*pv,*op;
 | 
			
		||||
    int w  = instrides[0];
 | 
			
		||||
    int h2 = srcSliceH>>1;
 | 
			
		||||
    int i;
 | 
			
		||||
 | 
			
		||||
    bfin_prepare_coefficients (c, rgb, masks);
 | 
			
		||||
    bfin_prepare_coefficients(c, rgb, masks);
 | 
			
		||||
 | 
			
		||||
    py = in[0];
 | 
			
		||||
    pu = in[1+(1^rgb)];
 | 
			
		||||
@ -109,12 +109,12 @@ static int core_yuv420_rgb (SwsContext *c,
 | 
			
		||||
 | 
			
		||||
    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];
 | 
			
		||||
        op += outstrides[0];
 | 
			
		||||
 | 
			
		||||
        lcscf (py, pu, pv, op, w, &c->oy);
 | 
			
		||||
        lcscf(py, pu, pv, op, w, &c->oy);
 | 
			
		||||
 | 
			
		||||
        py += instrides[0];
 | 
			
		||||
        pu += instrides[1];
 | 
			
		||||
@ -126,62 +126,62 @@ static int core_yuv420_rgb (SwsContext *c,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_rgb555 (SwsContext *c,
 | 
			
		||||
                               uint8_t **in, int *instrides,
 | 
			
		||||
                               int srcSliceY, int srcSliceH,
 | 
			
		||||
                               uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides,
 | 
			
		||||
                            ff_bfin_yuv2rgb555_line, 1, 555);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_bgr555 (SwsContext *c,
 | 
			
		||||
                               uint8_t **in, int *instrides,
 | 
			
		||||
                               int srcSliceY, int srcSliceH,
 | 
			
		||||
                               uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides,
 | 
			
		||||
                            ff_bfin_yuv2rgb555_line, 0, 555);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_rgb24 (SwsContext *c,
 | 
			
		||||
static int bfin_yuv420_rgb555(SwsContext *c,
 | 
			
		||||
                              uint8_t **in, int *instrides,
 | 
			
		||||
                              int srcSliceY, int srcSliceH,
 | 
			
		||||
                              uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides,
 | 
			
		||||
                            ff_bfin_yuv2rgb24_line, 1, 888);
 | 
			
		||||
    return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
 | 
			
		||||
                           outstrides, ff_bfin_yuv2rgb555_line, 1, 555);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_bgr24 (SwsContext *c,
 | 
			
		||||
static int bfin_yuv420_bgr555(SwsContext *c,
 | 
			
		||||
                              uint8_t **in, int *instrides,
 | 
			
		||||
                              int srcSliceY, int srcSliceH,
 | 
			
		||||
                              uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides,
 | 
			
		||||
                            ff_bfin_yuv2rgb24_line, 0, 888);
 | 
			
		||||
    return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
 | 
			
		||||
                           outstrides, ff_bfin_yuv2rgb555_line, 0, 555);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_rgb565 (SwsContext *c,
 | 
			
		||||
                               uint8_t **in, int *instrides,
 | 
			
		||||
                               int srcSliceY, int srcSliceH,
 | 
			
		||||
                               uint8_t **oplanes, int *outstrides)
 | 
			
		||||
static int bfin_yuv420_rgb24(SwsContext *c,
 | 
			
		||||
                             uint8_t **in, int *instrides,
 | 
			
		||||
                             int srcSliceY, int srcSliceH,
 | 
			
		||||
                             uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides,
 | 
			
		||||
                            ff_bfin_yuv2rgb565_line, 1, 565);
 | 
			
		||||
    return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
 | 
			
		||||
                           outstrides, ff_bfin_yuv2rgb24_line, 1, 888);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_bgr565 (SwsContext *c,
 | 
			
		||||
                               uint8_t **in, int *instrides,
 | 
			
		||||
                               int srcSliceY, int srcSliceH,
 | 
			
		||||
                               uint8_t **oplanes, int *outstrides)
 | 
			
		||||
static int bfin_yuv420_bgr24(SwsContext *c,
 | 
			
		||||
                             uint8_t **in, int *instrides,
 | 
			
		||||
                             int srcSliceY, int srcSliceH,
 | 
			
		||||
                             uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb (c, in, instrides, srcSliceY, srcSliceH, oplanes, outstrides,
 | 
			
		||||
                            ff_bfin_yuv2rgb565_line, 0, 565);
 | 
			
		||||
    return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
 | 
			
		||||
                           outstrides, ff_bfin_yuv2rgb24_line, 0, 888);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_rgb565(SwsContext *c,
 | 
			
		||||
                              uint8_t **in, int *instrides,
 | 
			
		||||
                              int srcSliceY, int srcSliceH,
 | 
			
		||||
                              uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
 | 
			
		||||
                           outstrides, ff_bfin_yuv2rgb565_line, 1, 565);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int bfin_yuv420_bgr565(SwsContext *c,
 | 
			
		||||
                              uint8_t **in, int *instrides,
 | 
			
		||||
                              int srcSliceY, int srcSliceH,
 | 
			
		||||
                              uint8_t **oplanes, int *outstrides)
 | 
			
		||||
{
 | 
			
		||||
    return core_yuv420_rgb(c, in, instrides, srcSliceY, srcSliceH, oplanes,
 | 
			
		||||
                           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;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user