From d3067047e71e0cc975fb85be5a0f5c3b50ed6969 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 27 Oct 2009 16:57:35 +0000 Subject: whitespace cosmetics: K&R coding style, prettyprinting Originally committed as revision 20381 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/pnmenc.c | 253 +++++++++++++++++++++++++++------------------------- 1 file changed, 129 insertions(+), 124 deletions(-) (limited to 'libavcodec/pnmenc.c') diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 545578b68e..6f0832427c 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -18,51 +18,52 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include "avcodec.h" #include "bytestream.h" #include "pnm.h" -static av_cold int common_init(AVCodecContext *avctx){ +static av_cold int common_init(AVCodecContext *avctx) +{ PNMContext *s = avctx->priv_data; avcodec_get_frame_defaults((AVFrame*)&s->picture); - avctx->coded_frame= (AVFrame*)&s->picture; + avctx->coded_frame = (AVFrame*)&s->picture; return 0; } -static int pnm_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) +static int pnm_decode_frame(AVCodecContext *avctx, void *data, + int *data_size, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; PNMContext * const s = avctx->priv_data; - AVFrame *picture = data; - AVFrame * const p= (AVFrame*)&s->picture; + AVFrame *picture = data; + AVFrame * const p = (AVFrame*)&s->picture; int i, n, linesize, h, upgrade = 0; unsigned char *ptr; - s->bytestream_start= - s->bytestream= buf; - s->bytestream_end= buf + buf_size; + s->bytestream_start = + s->bytestream = buf; + s->bytestream_end = buf + buf_size; - if(ff_pnm_decode_header(avctx, s) < 0) + if (ff_pnm_decode_header(avctx, s) < 0) return -1; - if(p->data[0]) + if (p->data[0]) avctx->release_buffer(avctx, p); - p->reference= 0; - if(avctx->get_buffer(avctx, p) < 0){ + p->reference = 0; + if (avctx->get_buffer(avctx, p) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - p->pict_type= FF_I_TYPE; - p->key_frame= 1; + p->pict_type = FF_I_TYPE; + p->key_frame = 1; - switch(avctx->pix_fmt) { + switch (avctx->pix_fmt) { default: return -1; case PIX_FMT_RGB48BE: @@ -86,47 +87,47 @@ static int pnm_decode_frame(AVCodecContext *avctx, case PIX_FMT_MONOBLACK: n = (avctx->width + 7) >> 3; do_read: - ptr = p->data[0]; + ptr = p->data[0]; linesize = p->linesize[0]; - if(s->bytestream + n*avctx->height > s->bytestream_end) + if (s->bytestream + n * avctx->height > s->bytestream_end) return -1; - for(i = 0; i < avctx->height; i++) { + for (i = 0; i < avctx->height; i++) { if (!upgrade) memcpy(ptr, s->bytestream, n); else if (upgrade == 1) { - unsigned int j, f = (255*128 + s->maxval/2) / s->maxval; - for (j=0; jmaxval / 2) / s->maxval; + for (j = 0; j < n; j++) ptr[j] = (s->bytestream[j] * f + 64) >> 7; } else if (upgrade == 2) { - unsigned int j, v, f = (65535*32768 + s->maxval/2) / s->maxval; - for (j=0; jmaxval / 2) / s->maxval; + for (j = 0; j < n / 2; j++) { v = be2me_16(((uint16_t *)s->bytestream)[j]); ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; } } s->bytestream += n; - ptr += linesize; + ptr += linesize; } break; case PIX_FMT_YUV420P: { unsigned char *ptr1, *ptr2; - n = avctx->width; - ptr = p->data[0]; + n = avctx->width; + ptr = p->data[0]; linesize = p->linesize[0]; - if(s->bytestream + n*avctx->height*3/2 > s->bytestream_end) + if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end) return -1; - for(i = 0; i < avctx->height; i++) { + for (i = 0; i < avctx->height; i++) { memcpy(ptr, s->bytestream, n); s->bytestream += n; - ptr += linesize; + ptr += linesize; } ptr1 = p->data[1]; ptr2 = p->data[2]; n >>= 1; h = avctx->height >> 1; - for(i = 0; i < h; i++) { + for (i = 0; i < h; i++) { memcpy(ptr1, s->bytestream, n); s->bytestream += n; memcpy(ptr2, s->bytestream, n); @@ -137,14 +138,14 @@ static int pnm_decode_frame(AVCodecContext *avctx, } break; case PIX_FMT_RGB32: - ptr = p->data[0]; + ptr = p->data[0]; linesize = p->linesize[0]; - if(s->bytestream + avctx->width*avctx->height*4 > s->bytestream_end) + if (s->bytestream + avctx->width * avctx->height * 4 > s->bytestream_end) return -1; - for(i = 0; i < avctx->height; i++) { + for (i = 0; i < avctx->height; i++) { int j, r, g, b, a; - for(j = 0;j < avctx->width; j++) { + for (j = 0; j < avctx->width; j++) { r = *s->bytestream++; g = *s->bytestream++; b = *s->bytestream++; @@ -155,66 +156,67 @@ static int pnm_decode_frame(AVCodecContext *avctx, } break; } - *picture= *(AVFrame*)&s->picture; + *picture = *(AVFrame*)&s->picture; *data_size = sizeof(AVPicture); return s->bytestream - s->bytestream_start; } -static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int buf_size, void *data){ - PNMContext *s = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p= (AVFrame*)&s->picture; +static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, + int buf_size, void *data) +{ + PNMContext *s = avctx->priv_data; + AVFrame *pict = data; + AVFrame * const p = (AVFrame*)&s->picture; int i, h, h1, c, n, linesize; uint8_t *ptr, *ptr1, *ptr2; - if(buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200){ + if (buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200) { av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); return -1; } - *p = *pict; - p->pict_type= FF_I_TYPE; - p->key_frame= 1; + *p = *pict; + p->pict_type = FF_I_TYPE; + p->key_frame = 1; - s->bytestream_start= - s->bytestream= outbuf; - s->bytestream_end= outbuf+buf_size; + s->bytestream_start = + s->bytestream = outbuf; + s->bytestream_end = outbuf + buf_size; - h = avctx->height; + h = avctx->height; h1 = h; - switch(avctx->pix_fmt) { + switch (avctx->pix_fmt) { case PIX_FMT_MONOWHITE: - c = '4'; - n = (avctx->width + 7) >> 3; + c = '4'; + n = (avctx->width + 7) >> 3; break; case PIX_FMT_GRAY8: - c = '5'; - n = avctx->width; + c = '5'; + n = avctx->width; break; case PIX_FMT_GRAY16BE: - c = '5'; - n = avctx->width * 2; + c = '5'; + n = avctx->width * 2; break; case PIX_FMT_RGB24: - c = '6'; - n = avctx->width * 3; + c = '6'; + n = avctx->width * 3; break; case PIX_FMT_RGB48BE: - c = '6'; - n = avctx->width * 6; + c = '6'; + n = avctx->width * 6; break; case PIX_FMT_YUV420P: - c = '5'; - n = avctx->width; + c = '5'; + n = avctx->width; h1 = (h * 3) / 2; break; default: return -1; } snprintf(s->bytestream, s->bytestream_end - s->bytestream, - "P%c\n%d %d\n", - c, avctx->width, h1); + "P%c\n%d %d\n", c, avctx->width, h1); s->bytestream += strlen(s->bytestream); if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { snprintf(s->bytestream, s->bytestream_end - s->bytestream, @@ -222,12 +224,12 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu s->bytestream += strlen(s->bytestream); } - ptr = p->data[0]; + ptr = p->data[0]; linesize = p->linesize[0]; - for(i=0;ibytestream, ptr, n); s->bytestream += n; - ptr += linesize; + ptr += linesize; } if (avctx->pix_fmt == PIX_FMT_YUV420P) { @@ -235,7 +237,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu n >>= 1; ptr1 = p->data[1]; ptr2 = p->data[2]; - for(i=0;ibytestream, ptr1, n); s->bytestream += n; memcpy(s->bytestream, ptr2, n); @@ -247,52 +249,54 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu return s->bytestream - s->bytestream_start; } -static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int buf_size, void *data){ - PNMContext *s = avctx->priv_data; - AVFrame *pict = data; - AVFrame * const p= (AVFrame*)&s->picture; +static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, + int buf_size, void *data) +{ + PNMContext *s = avctx->priv_data; + AVFrame *pict = data; + AVFrame * const p = (AVFrame*)&s->picture; int i, h, w, n, linesize, depth, maxval; const char *tuple_type; uint8_t *ptr; - if(buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200){ + if (buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200) { av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); return -1; } - *p = *pict; - p->pict_type= FF_I_TYPE; - p->key_frame= 1; + *p = *pict; + p->pict_type = FF_I_TYPE; + p->key_frame = 1; - s->bytestream_start= - s->bytestream= outbuf; - s->bytestream_end= outbuf+buf_size; + s->bytestream_start = + s->bytestream = outbuf; + s->bytestream_end = outbuf+buf_size; h = avctx->height; w = avctx->width; - switch(avctx->pix_fmt) { + switch (avctx->pix_fmt) { case PIX_FMT_MONOWHITE: - n = (w + 7) >> 3; - depth = 1; - maxval = 1; + n = (w + 7) >> 3; + depth = 1; + maxval = 1; tuple_type = "BLACKANDWHITE"; break; case PIX_FMT_GRAY8: - n = w; - depth = 1; - maxval = 255; + n = w; + depth = 1; + maxval = 255; tuple_type = "GRAYSCALE"; break; case PIX_FMT_RGB24: - n = w * 3; - depth = 3; - maxval = 255; + n = w * 3; + depth = 3; + maxval = 255; tuple_type = "RGB"; break; case PIX_FMT_RGB32: - n = w * 4; - depth = 4; - maxval = 255; + n = w * 4; + depth = 4; + maxval = 255; tuple_type = "RGB_ALPHA"; break; default: @@ -303,15 +307,15 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu w, h, depth, maxval, tuple_type); s->bytestream += strlen(s->bytestream); - ptr = p->data[0]; + ptr = p->data[0]; linesize = p->linesize[0]; if (avctx->pix_fmt == PIX_FMT_RGB32) { int j; unsigned int v; - for(i=0;ibytestream, v); *s->bytestream++ = v >> 24; @@ -319,16 +323,17 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, int bu ptr += linesize; } } else { - for(i=0;ibytestream, ptr, n); s->bytestream += n; - ptr += linesize; + ptr += linesize; } } return s->bytestream - s->bytestream_start; } -static av_cold int common_end(AVCodecContext *avctx){ +static av_cold int common_end(AVCodecContext *avctx) +{ PNMContext *s = avctx->priv_data; if (s->picture.data[0]) @@ -349,8 +354,8 @@ AVCodec pgm_decoder = { common_end, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif @@ -362,10 +367,10 @@ AVCodec pgm_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; -#endif // CONFIG_PGM_ENCODER +#endif #if CONFIG_PGMYUV_DECODER AVCodec pgmyuv_decoder = { @@ -378,8 +383,8 @@ AVCodec pgmyuv_decoder = { common_end, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif @@ -391,10 +396,10 @@ AVCodec pgmyuv_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; -#endif // CONFIG_PGMYUV_ENCODER +#endif #if CONFIG_PPM_DECODER AVCodec ppm_decoder = { @@ -407,8 +412,8 @@ AVCodec ppm_decoder = { common_end, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif @@ -420,10 +425,10 @@ AVCodec ppm_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; -#endif // CONFIG_PPM_ENCODER +#endif #if CONFIG_PBM_DECODER AVCodec pbm_decoder = { @@ -436,8 +441,8 @@ AVCodec pbm_decoder = { common_end, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif @@ -449,10 +454,10 @@ AVCodec pbm_encoder = { sizeof(PNMContext), common_init, pnm_encode_frame, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; -#endif // CONFIG_PBM_ENCODER +#endif #if CONFIG_PAM_DECODER AVCodec pam_decoder = { @@ -465,8 +470,8 @@ AVCodec pam_decoder = { common_end, pnm_decode_frame, CODEC_CAP_DR1, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif @@ -478,7 +483,7 @@ AVCodec pam_encoder = { sizeof(PNMContext), common_init, pam_encode_frame, - .pix_fmts= (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, - .long_name= NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), + .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; -#endif // CONFIG_PAM_ENCODER +#endif -- cgit v1.2.3