diff options
Diffstat (limited to 'libavcodec/r210dec.c')
| -rw-r--r-- | libavcodec/r210dec.c | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/libavcodec/r210dec.c b/libavcodec/r210dec.c index 6adaac0d35..fc9e7e5ce5 100644 --- a/libavcodec/r210dec.c +++ b/libavcodec/r210dec.c @@ -3,20 +3,20 @@ * * Copyright (c) 2009 Reimar Doeffinger <Reimar.Doeffinger@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,7 +27,11 @@ static av_cold int decode_init(AVCodecContext *avctx) { - avctx->pix_fmt = AV_PIX_FMT_RGB48; + if ((avctx->codec_tag & 0xFFFFFF) == MKTAG('r', '1', '0', 0)) { + avctx->pix_fmt = AV_PIX_FMT_BGR48; + } else { + avctx->pix_fmt = AV_PIX_FMT_RGB48; + } avctx->bits_per_raw_sample = 10; return 0; @@ -39,8 +43,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int h, w, ret; AVFrame *pic = data; const uint32_t *src = (const uint32_t *)avpkt->data; - int aligned_width = FFALIGN(avctx->width, 64); + int aligned_width = FFALIGN(avctx->width, + avctx->codec_id == AV_CODEC_ID_R10K ? 1 : 64); uint8_t *dst_line; + int r10 = (avctx->codec_tag & 0xFFFFFF) == MKTAG('r', '1', '0', 0); + int le = avctx->codec_tag == MKTAG('R', '1', '0', 'k') && + avctx->extradata_size >= 12 && !memcmp(&avctx->extradata[4], "DpxE", 4) && + !avctx->extradata[11]; if (avpkt->size < 4 * aligned_width * avctx->height) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); @@ -57,14 +66,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, for (h = 0; h < avctx->height; h++) { uint16_t *dst = (uint16_t *)dst_line; for (w = 0; w < avctx->width; w++) { - uint32_t pixel = av_be2ne32(*src++); + uint32_t pixel; uint16_t r, g, b; - if (avctx->codec_id==AV_CODEC_ID_R210) { + if (avctx->codec_id == AV_CODEC_ID_AVRP || r10 || le) { + pixel = av_le2ne32(*src++); + } else { + pixel = av_be2ne32(*src++); + } + if (avctx->codec_id == AV_CODEC_ID_R210 || r10) { b = pixel << 6; g = (pixel >> 4) & 0xffc0; r = (pixel >> 14) & 0xffc0; } else { - b = pixel << 4; + b = (pixel << 4) & 0xffc0; g = (pixel >> 6) & 0xffc0; r = (pixel >> 16) & 0xffc0; } @@ -103,3 +117,14 @@ AVCodec ff_r10k_decoder = { .capabilities = CODEC_CAP_DR1, }; #endif +#if CONFIG_AVRP_DECODER +AVCodec ff_avrp_decoder = { + .name = "avrp", + .long_name = NULL_IF_CONFIG_SMALL("Avid 1:1 10-bit RGB Packer"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_AVRP, + .init = decode_init, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1, +}; +#endif |