From 0ce033f88852b2b40c6c0edb7b5cdbea05c4749d Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 3 Jan 2013 17:02:38 +0100 Subject: rawdec: cosmetics, reformat --- libavcodec/rawdec.c | 126 ++++++++++++++++++++++++++++------------------------ 1 file changed, 68 insertions(+), 58 deletions(-) (limited to 'libavcodec/rawdec.c') diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 16ee64e47a..2751f34974 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -32,8 +32,8 @@ typedef struct RawVideoContext { uint32_t palette[AVPALETTE_COUNT]; - unsigned char * buffer; /* block of memory for holding one frame */ - int length; /* number of bytes in buffer */ + unsigned char *buffer; /* block of memory for holding one frame */ + int length; /* number of bytes in buffer */ int flip; AVFrame pic; ///< AVCodecContext.coded_frame } RawVideoContext; @@ -46,7 +46,7 @@ static const PixelFormatTag pix_fmt_bps_avi[] = { { AV_PIX_FMT_RGB555, 16 }, { AV_PIX_FMT_BGR24, 24 }, { AV_PIX_FMT_RGB32, 32 }, - { AV_PIX_FMT_NONE, 0 }, + { AV_PIX_FMT_NONE, 0 }, }; static const PixelFormatTag pix_fmt_bps_mov[] = { @@ -60,10 +60,11 @@ static const PixelFormatTag pix_fmt_bps_mov[] = { { AV_PIX_FMT_RGB24, 24 }, { AV_PIX_FMT_ARGB, 32 }, { AV_PIX_FMT_MONOWHITE,33 }, - { AV_PIX_FMT_NONE, 0 }, + { AV_PIX_FMT_NONE, 0 }, }; -static enum AVPixelFormat find_pix_fmt(const PixelFormatTag *tags, unsigned int fourcc) +static enum AVPixelFormat find_pix_fmt(const PixelFormatTag *tags, + unsigned int fourcc) { while (tags->pix_fmt >= 0) { if (tags->fourcc == fourcc) @@ -77,20 +78,24 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) { RawVideoContext *context = avctx->priv_data; - if (avctx->codec_tag == MKTAG('r','a','w',' ')) - avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample); - else if (avctx->codec_tag == MKTAG('W','R','A','W')) - avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample); + if (avctx->codec_tag == MKTAG('r', 'a', 'w', ' ')) + avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov, + avctx->bits_per_coded_sample); + else if (avctx->codec_tag == MKTAG('W', 'R', 'A', 'W')) + avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, + avctx->bits_per_coded_sample); else if (avctx->codec_tag) avctx->pix_fmt = find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag); else if (avctx->pix_fmt == AV_PIX_FMT_NONE && avctx->bits_per_coded_sample) - avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample); + avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, + avctx->bits_per_coded_sample); avpriv_set_systematic_pal2(context->palette, avctx->pix_fmt); - context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); - if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && - avctx->pix_fmt==AV_PIX_FMT_PAL8 && - (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){ + context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, + avctx->height); + if ((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && + avctx->pix_fmt == AV_PIX_FMT_PAL8 && + (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))) { context->buffer = av_malloc(context->length); if (!context->buffer) return -1; @@ -98,28 +103,30 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) context->pic.pict_type = AV_PICTURE_TYPE_I; context->pic.key_frame = 1; - avctx->coded_frame= &context->pic; + avctx->coded_frame = &context->pic; - if((avctx->extradata_size >= 9 && !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) || - avctx->codec_tag == MKTAG(3, 0, 0, 0) || avctx->codec_tag == MKTAG('W','R','A','W')) - context->flip=1; + if ((avctx->extradata_size >= 9 && + !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9)) || + avctx->codec_tag == MKTAG(3, 0, 0, 0) || + avctx->codec_tag == MKTAG('W','R','A','W')) + context->flip = 1; return 0; } -static void flip(AVCodecContext *avctx, AVPicture * picture){ - picture->data[0] += picture->linesize[0] * (avctx->height-1); +static void flip(AVCodecContext *avctx, AVPicture *picture) +{ + picture->data[0] += picture->linesize[0] * (avctx->height - 1); picture->linesize[0] *= -1; } -static int raw_decode(AVCodecContext *avctx, - void *data, int *got_frame, - AVPacket *avpkt) +static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; - RawVideoContext *context = avctx->priv_data; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); + RawVideoContext *context = avctx->priv_data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; int res; AVFrame *frame = data; @@ -127,71 +134,74 @@ static int raw_decode(AVCodecContext *avctx, frame->pict_type = avctx->coded_frame->pict_type; frame->interlaced_frame = avctx->coded_frame->interlaced_frame; - frame->top_field_first = avctx->coded_frame->top_field_first; + frame->top_field_first = avctx->coded_frame->top_field_first; frame->reordered_opaque = avctx->reordered_opaque; frame->pkt_pts = avctx->pkt->pts; - if(buf_size < context->length - (avctx->pix_fmt==AV_PIX_FMT_PAL8 ? 256*4 : 0)) + if (buf_size < context->length - (avctx->pix_fmt == AV_PIX_FMT_PAL8 ? 256 * 4 : 0)) return -1; //2bpp and 4bpp raw in avi and mov (yes this is ugly ...) if (context->buffer) { int i; uint8_t *dst = context->buffer; - buf_size = context->length - 256*4; - if (avctx->bits_per_coded_sample == 4){ - for(i=0; 2*i+1 < buf_size; i++){ - dst[2*i+0]= buf[i]>>4; - dst[2*i+1]= buf[i]&15; + buf_size = context->length - 256 * 4; + if (avctx->bits_per_coded_sample == 4) { + for (i = 0; 2 * i + 1 < buf_size; i++) { + dst[2 * i + 0] = buf[i] >> 4; + dst[2 * i + 1] = buf[i] & 15; } - } else - for(i=0; 4*i+3 < buf_size; i++){ - dst[4*i+0]= buf[i]>>6; - dst[4*i+1]= buf[i]>>4&3; - dst[4*i+2]= buf[i]>>2&3; - dst[4*i+3]= buf[i] &3; + } else { + for (i = 0; 4 * i + 3 < buf_size; i++) { + dst[4 * i + 0] = buf[i] >> 6; + dst[4 * i + 1] = buf[i] >> 4 & 3; + dst[4 * i + 2] = buf[i] >> 2 & 3; + dst[4 * i + 3] = buf[i] & 3; } - buf= dst; + } + buf = dst; } - if(avctx->codec_tag == MKTAG('A', 'V', '1', 'x') || - avctx->codec_tag == MKTAG('A', 'V', 'u', 'p')) + if (avctx->codec_tag == MKTAG('A', 'V', '1', 'x') || + avctx->codec_tag == MKTAG('A', 'V', 'u', 'p')) buf += buf_size - context->length; if ((res = avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height)) < 0) return res; - if((avctx->pix_fmt==AV_PIX_FMT_PAL8 && buf_size < context->length) || - (desc->flags & PIX_FMT_PSEUDOPAL)) { - frame->data[1]= context->palette; + if ((avctx->pix_fmt == AV_PIX_FMT_PAL8 && buf_size < context->length) || + (desc->flags & PIX_FMT_PSEUDOPAL)) { + frame->data[1] = context->palette; } if (avctx->pix_fmt == AV_PIX_FMT_PAL8) { - const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); + const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, + NULL); if (pal) { memcpy(frame->data[1], pal, AVPALETTE_SIZE); frame->palette_has_changed = 1; } } - if(avctx->pix_fmt==AV_PIX_FMT_BGR24 && ((frame->linesize[0]+3)&~3)*avctx->height <= buf_size) - frame->linesize[0] = (frame->linesize[0]+3)&~3; + if (avctx->pix_fmt == AV_PIX_FMT_BGR24 && + ((frame->linesize[0] + 3) & ~3) * avctx->height <= buf_size) + frame->linesize[0] = (frame->linesize[0] + 3) & ~3; - if(context->flip) + if (context->flip) flip(avctx, picture); - if ( avctx->codec_tag == MKTAG('Y', 'V', '1', '2') - || avctx->codec_tag == MKTAG('Y', 'V', '1', '6') - || avctx->codec_tag == MKTAG('Y', 'V', '2', '4') - || avctx->codec_tag == MKTAG('Y', 'V', 'U', '9')) + if (avctx->codec_tag == MKTAG('Y', 'V', '1', '2') || + avctx->codec_tag == MKTAG('Y', 'V', '1', '6') || + avctx->codec_tag == MKTAG('Y', 'V', '2', '4') || + avctx->codec_tag == MKTAG('Y', 'V', 'U', '9')) FFSWAP(uint8_t *, picture->data[1], picture->data[2]); - if(avctx->codec_tag == AV_RL32("yuv2") && - avctx->pix_fmt == AV_PIX_FMT_YUYV422) { + if (avctx->codec_tag == AV_RL32("yuv2") && + avctx->pix_fmt == AV_PIX_FMT_YUYV422) { int x, y; uint8_t *line = picture->data[0]; - for(y = 0; y < avctx->height; y++) { - for(x = 0; x < avctx->width; x++) - line[2*x + 1] ^= 0x80; + for (y = 0; y < avctx->height; y++) { + for (x = 0; x < avctx->width; x++) + line[2 * x + 1] ^= 0x80; line += picture->linesize[0]; } } -- cgit v1.2.3