diff options
| author | Paul B Mahol <onemda@gmail.com> | 2018-12-02 17:49:03 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-12-03 17:17:42 +0100 |
| commit | 3d8d8c7199717a0a31fbe01f8931d96fe8408bd6 (patch) | |
| tree | 3eb90a6ebc14d86ad026351aab0bff1e047301a3 /libavcodec/r210enc.c | |
| parent | 42d5b59bdcf8404767c4368b7bd1ccb4bbaf1d47 (diff) | |
| download | ffmpeg-3d8d8c7199717a0a31fbe01f8931d96fe8408bd6.tar.gz | |
avcodec/r210: use correct pixel format
Diffstat (limited to 'libavcodec/r210enc.c')
| -rw-r--r-- | libavcodec/r210enc.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c index a55e5434f3..02412f3684 100644 --- a/libavcodec/r210enc.c +++ b/libavcodec/r210enc.c @@ -43,22 +43,26 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int aligned_width = FFALIGN(avctx->width, avctx->codec_id == AV_CODEC_ID_R10K ? 1 : 64); int pad = (aligned_width - avctx->width) * 4; - uint8_t *src_line; + uint8_t *srcr_line, *srcg_line, *srcb_line; uint8_t *dst; if ((ret = ff_alloc_packet2(avctx, pkt, 4 * aligned_width * avctx->height, 0)) < 0) return ret; - src_line = pic->data[0]; + srcg_line = pic->data[0]; + srcb_line = pic->data[1]; + srcr_line = pic->data[2]; dst = pkt->data; for (i = 0; i < avctx->height; i++) { - uint16_t *src = (uint16_t *)src_line; + uint16_t *srcr = (uint16_t *)srcr_line; + uint16_t *srcg = (uint16_t *)srcg_line; + uint16_t *srcb = (uint16_t *)srcb_line; for (j = 0; j < avctx->width; j++) { uint32_t pixel; - uint16_t r = *src++ >> 6; - uint16_t g = *src++ >> 6; - uint16_t b = *src++ >> 6; + uint16_t r = *srcr++; + uint16_t g = *srcg++; + uint16_t b = *srcb++; if (avctx->codec_id == AV_CODEC_ID_R210) pixel = (r << 20) | (g << 10) | b; else @@ -70,7 +74,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } memset(dst, 0, pad); dst += pad; - src_line += pic->linesize[0]; + srcr_line += pic->linesize[2]; + srcg_line += pic->linesize[0]; + srcb_line += pic->linesize[1]; } pkt->flags |= AV_PKT_FLAG_KEY; @@ -87,7 +93,7 @@ AVCodec ff_r210_encoder = { .id = AV_CODEC_ID_R210, .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }, .capabilities = AV_CODEC_CAP_INTRA_ONLY, }; #endif @@ -99,7 +105,7 @@ AVCodec ff_r10k_encoder = { .id = AV_CODEC_ID_R10K, .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }, .capabilities = AV_CODEC_CAP_INTRA_ONLY, }; #endif @@ -111,7 +117,7 @@ AVCodec ff_avrp_encoder = { .id = AV_CODEC_ID_AVRP, .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRP10, AV_PIX_FMT_NONE }, .capabilities = AV_CODEC_CAP_INTRA_ONLY, }; #endif |