Hi,
On Sat, Dec 17, 2011 at 2:37 PM, Nathan Maxson <[email protected]>wrote:
> [..]
> --- a/libswscale/swscale_unscaled.c
> +++ b/libswscale/swscale_unscaled.c
> @@ -87,26 +87,27 @@ DECLARE_ALIGNED(8, const uint8_t,
dither_8x8_256)[8][8] = {
> #define RV ( (int)(0.500*224/255*(1<<RGB2YUV_SHIFT)+0.5))
> #define RU (-(int)(0.169*224/255*(1<<RGB2YUV_SHIFT)+0.5))
>
> -static void fillPlane(uint8_t* plane, int stride, int width, int height,
int y, uint8_t val)
> +static void fillPlane(uint8_t * plane, int stride, int width, int
height, int y,
"uint8_t *plane" is actually correct, i.e. space between "*" and type, but
not between "*" and variable name.
> - uint8_t *ptr = plane + stride*y;
> - for (i=0; i<height; i++) {
> + uint8_t * ptr = plane + stride * y;
"uint8_t *ptr".
> -static void copyPlane(const uint8_t *src, int srcStride,
> +static void copyPlane(const uint8_t * src, int srcStride,
"uint8_t *src".
> - uint8_t *dst, int dstStride)
> + uint8_t * dst, int dstStride)
"uint8_t *dst".
> -static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int planarToNv12Wrapper(SwsContext * c, const uint8_t * src[],
"SwsContext *c" and "const uint8_t *src[]".
> + int srcSliceH, uint8_t * dstParam[],
"uint8_t *dstParam[]".
> - uint8_t *dst = dstParam[1] + dstStride[1]*srcSliceY/2;
> + uint8_t * dst = dstParam[1] + dstStride[1] * srcSliceY / 2;
"uint8_t *dst".
> -static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int planarToYuy2Wrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
See above.
> - uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
> + uint8_t * dst=dstParam[0] + dstStride[0] * srcSliceY;
Same.
> -static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int planarToUyvyWrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
> + uint8_t * dst = dstParam[0] + dstStride[0] * srcSliceY;
Same.
> -static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int yuv422pToYuy2Wrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
> + uint8_t * dst = dstParam[0] + dstStride[0] * srcSliceY;
Same.
> -static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int yuv422pToUyvyWrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
> + uint8_t * dst = dstParam[0] + dstStride[0] * srcSliceY;
Same.
> -static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int yuyvToYuv420Wrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
> - uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY/2;
> - uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY/2;
> + uint8_t * ydst = dstParam[0] + dstStride[0] * srcSliceY;
> + uint8_t * udst = dstParam[1] + dstStride[1] * srcSliceY/2;
> + uint8_t * vdst = dstParam[2] + dstStride[2] * srcSliceY/2;
Same, plus spaces around "/", i.e. "srcSliceY / 2".
> -static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int yuyvToYuv422Wrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
> - uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY;
> - uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY;
> + uint8_t * ydst = dstParam[0] + dstStride[0] * srcSliceY;
> + uint8_t * udst = dstParam[1] + dstStride[1] * srcSliceY;
> + uint8_t * vdst = dstParam[2] + dstStride[2] * srcSliceY;
See above.
> -static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int uyvyToYuv420Wrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
> - uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY/2;
> - uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY/2;
> + uint8_t * ydst = dstParam[0] + dstStride[0] * srcSliceY;
> + uint8_t * udst = dstParam[1] + dstStride[1] * srcSliceY/2;
> + uint8_t * vdst = dstParam[2] + dstStride[2] * srcSliceY/2;
See earlier comments plus spaces around "/".
> -static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int
srcStride[], int srcSliceY,
> - int srcSliceH, uint8_t* dstParam[], int
dstStride[])
> +static int uyvyToYuv422Wrapper(SwsContext * c, const uint8_t * src[],
> + int srcStride[], int srcSliceY, int
srcSliceH,
> + uint8_t * dstParam[], int dstStride[])
> {
> - uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
> - uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY;
> - uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY;
> + uint8_t * ydst = dstParam[0] + dstStride[0] * srcSliceY;
> + uint8_t * udst = dstParam[1] + dstStride[1] * srcSliceY;
> + uint8_t * vdst = dstParam[2] + dstStride[2] * srcSliceY;
See earlier comments.
> -static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int
num_pixels, const uint8_t *palette)
> +static void gray8aToPacked32(const uint8_t * src, uint8_t * dst, int
num_pixels,
> + const uint8_t * palette)
Same.
> - for (i=0; i<num_pixels; i++)
> - ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] |
(src[(i<<1)+1] << 24);
> + for (i = 0; i < num_pixels; i++)
> + ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] |
(src[(i<<1) + 1] << 24);
Always spaces around "<<". Also space between variable and cast, i.e.
"((const uint32_t *) palette)[src[i << 1]]".
> -static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int
num_pixels, const uint8_t *palette)
> +static void gray8aToPacked32_1(const uint8_t * src, uint8_t * dst, int
num_pixels,
> + const uint8_t * palette)
See earlier comments.
> - for (i=0; i<num_pixels; i++)
> - ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] |
src[(i<<1)+1];
> + for (i = 0; i < num_pixels; i++)
> + ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] |
src[(i<<1) + 1];
See 2 comments above.
> -static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int
num_pixels, const uint8_t *palette)
> +static void gray8aToPacked24(const uint8_t * src, uint8_t * dst, int
num_pixels,
> + const uint8_t * palette)
See earlier comments. I'll skip this for the rest of the patch, I think you
get the idea.
> - dst[0]= palette[src[i<<1]*4+0];
> - dst[1]= palette[src[i<<1]*4+1];
> - dst[2]= palette[src[i<<1]*4+2];
> - dst+= 3;
> + dst[0] = palette[src[i<<1]* 4 + 0];
> + dst[1] = palette[src[i<<1]* 4 + 1];
> + dst[2] = palette[src[i<<1]* 4 + 2];
Spaces around "<<", spaces between "]" and "*".
> - uint16_t *dstPtr = (uint16_t *)dst[0];
> - const uint16_t *srcPtr = (const uint16_t *)src[0];
> + uint16_t * dstPtr = (uint16_t *)dst[0];
> + const uint16_t * srcPtr = (const uint16_t *)src[0];
Spaces between cast and variable name, and remove space between "*" and
variable name.
> - const int srcBpp= (c->srcFormatBpp + 7) >> 3;
> - const int dstBpp= (c->dstFormatBpp + 7) >> 3;
> - const int srcId= c->srcFormatBpp >> 2; /* 1:0, 4:1, 8:2, 15:3, 16:4,
24:6, 32:8 */
> - const int dstId= c->dstFormatBpp >> 2;
> - void (*conv)(const uint8_t *src, uint8_t *dst, int src_size)=NULL;
> + const int srcBpp = (c->srcFormatBpp + 7) >> 3;
> + const int dstBpp = (c->dstFormatBpp + 7) >> 3;
> + const int srcId = c->srcFormatBpp >> 2; /* 1:0, 4:1, 8:2, 15:3,
16:4, 24:6, 32:8 */
> + const int dstId = c->dstFormatBpp >> 2;
> + void (* conv)(const uint8_t * src, uint8_t * dst, int src_size) =
NULL;
"void (*conv)(...".
> - const uint8_t *srcPtr= src[0];
> - uint8_t *dstPtr= dst[0];
> - if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat ==
PIX_FMT_BGR32_1) && !isRGBA32(dstFormat))
> + const uint8_t * srcPtr = src[0];
> + uint8_t * dstPtr = dst[0];
> + if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat ==
PIX_FMT_BGR32_1)
> + && !isRGBA32(dstFormat))
Please put the "&&" on the previous line.
> - if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat ==
PIX_FMT_BGR32_1) && !isRGBA32(srcFormat))
> + if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat ==
PIX_FMT_BGR32_1)
> + && !isRGBA32(srcFormat))
Same.
> - if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] >
0 && !(srcStride[0] % srcBpp))
> - conv(srcPtr, dstPtr + dstStride[0]*srcSliceY,
srcSliceH*srcStride[0]);
> + if (dstStride[0] * srcBpp == srcStride[0] * dstBpp &&
srcStride[0] > 0
> + && !(srcStride[0] % srcBpp))
Same.
> - dst[0]+ srcSliceY *dstStride[0],
> - dst[1]+(srcSliceY>>1)*dstStride[1],
> - dst[2]+(srcSliceY>>1)*dstStride[2],
> + dst[0]+ srcSliceY * dstStride[0],
> + dst[1]+(srcSliceY>>1) * dstStride[1],
> + dst[2]+(srcSliceY>>1) * dstStride[2],
Spaces around "+" and ">>".
> while(length+c->srcW <= FFABS(dstStride[0])
> - && length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW;
> - assert(length!=0);
> + && length+c->srcW <= FFABS(srcStride[0])) length += c->srcW;
"&&" one line above.
> - for (plane=0; plane<4; plane++) {
> - int length= (plane==0 || plane==3) ? c->srcW : -((-c->srcW
)>>c->chrDstHSubSample);
> - int y= (plane==0 || plane==3) ? srcSliceY:
-((-srcSliceY)>>c->chrDstVSubSample);
> - int height= (plane==0 || plane==3) ? srcSliceH:
-((-srcSliceH)>>c->chrDstVSubSample);
> - const uint8_t *srcPtr= src[plane];
> - uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
> + for (plane = 0; plane < 4; plane++) {
> + int length= (plane == 0 || plane == 3) ? c->srcW : -((-c->srcW
)>>c->chrDstHSubSample);
> + int y= (plane == 0 || plane == 3) ? srcSliceY:
-((-srcSliceY)>>c->chrDstVSubSample);
> + int height= (plane == 0 || plane == 3) ? srcSliceH:
-((-srcSliceH)>>c->chrDstVSubSample);
int length = ..
int y = ..
int height = ..
Also spaces around the ">>" at the end of each line.
> - const uint16_t *srcPtr2 = (const uint16_t*)srcPtr;
> + const uint16_t * srcPtr2 = (const uint16_t *)srcPtr;
Spaces between cast and variable name.
> - uint16_t *dstPtr2 = (uint16_t*)dstPtr;
> + uint16_t * dstPtr2 = (uint16_t *)dstPtr;
Same.
> - wfunc(&dstPtr2[j], (srcpx<<(16-src_depth)) |
(srcpx>>(2*src_depth-16))); \
> + wfunc(&dstPtr2[j], (srcpx<<(16-src_depth)) |
(srcpx>>(2 * src_depth-16))); \
Spaces around "<<", "-", ">>".
The same concept throughout the rest of the file, you should be able to
finish 99% by applying the same comments from here on, and then I'll review
the rest.
Ronald
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
