diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:23:32 +0300 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 20:23:32 +0300 |
commit | 04e4166536d3fb51ee9b9361de2a414fa876ab6e (patch) | |
tree | 6c46410d8346b3590e086abf4d2a0986aa37c923 /libavcodec/v210enc.c | |
parent | 6bff2b5f6a3dca43bf553866b0f110c47d4ec72d (diff) | |
parent | e280fe13291e9c712a5f4aa13b5263f3e8afed45 (diff) |
Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'
* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
v210: Use separate sample_factors
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/v210enc.c')
-rw-r--r-- | libavcodec/v210enc.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 00c89dc1d8..d3a8e26bc1 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -86,7 +86,8 @@ av_cold void ff_v210enc_init(V210EncContext *s) { s->pack_line_8 = v210_planar_pack_8_c; s->pack_line_10 = v210_planar_pack_10_c; - s->sample_factor = 1; + s->sample_factor_8 = 1; + s->sample_factor_10 = 1; if (ARCH_X86) ff_v210enc_init_x86(s); @@ -133,15 +134,19 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const uint16_t *y = (const uint16_t *)pic->data[0]; const uint16_t *u = (const uint16_t *)pic->data[1]; const uint16_t *v = (const uint16_t *)pic->data[2]; + + const int sample_size = 6 * s->sample_factor_10; + const int sample_w = avctx->width / sample_size; + for (h = 0; h < avctx->height; h++) { uint32_t val; - w = (avctx->width / (6 * s->sample_factor)) * 6 * s->sample_factor; + w = sample_w * sample_size; s->pack_line_10(y, u, v, dst, w); y += w; u += w >> 1; v += w >> 1; - dst += (w / (6 * s->sample_factor)) * 16 * s->sample_factor; + dst += sample_w * 16 * s->sample_factor_10; for (; w < avctx->width - 5; w += 6) { WRITE_PIXELS(u, y, v); @@ -178,15 +183,19 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const uint8_t *y = pic->data[0]; const uint8_t *u = pic->data[1]; const uint8_t *v = pic->data[2]; + + const int sample_size = 12 * s->sample_factor_8; + const int sample_w = avctx->width / sample_size; + for (h = 0; h < avctx->height; h++) { uint32_t val; - w = (avctx->width / (12 * s->sample_factor)) * 12 * s->sample_factor; + w = sample_w * sample_size; s->pack_line_8(y, u, v, dst, w); y += w; u += w >> 1; v += w >> 1; - dst += (w / (12 * s->sample_factor)) * 32 * s->sample_factor; + dst += sample_w * 32 * s->sample_factor_8; for (; w < avctx->width - 5; w += 6) { WRITE_PIXELS8(u, y, v); |