libkvazaar: Set frame rate as a rational number

[ffmpeg] / libavcodec / v210enc.c

diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c
index 061224885f1034563e37d3ec50435dbe3ad89f63..00c89dc1d89f40926f3eca80690f27ef57495c26 100644 (file)
--- a/libavcodec/v210enc.c
+++ b/libavcodec/v210enc.c
@@ -86,6 +86,7 @@ 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;
 
     if (ARCH_X86)
         ff_v210enc_init_x86(s);
@@ -134,13 +135,20 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         const uint16_t *v = (const uint16_t *)pic->data[2];
         for (h = 0; h < avctx->height; h++) {
             uint32_t val;
-            w = (avctx->width / 6) * 6;
+            w = (avctx->width / (6 * s->sample_factor)) * 6 * s->sample_factor;
             s->pack_line_10(y, u, v, dst, w);
 
             y += w;
             u += w >> 1;
             v += w >> 1;
-            dst += (w / 6) * 16;
+            dst += (w / (6 * s->sample_factor)) * 16 * s->sample_factor;
+
+            for (; w < avctx->width - 5; w += 6) {
+                WRITE_PIXELS(u, y, v);
+                WRITE_PIXELS(y, u, y);
+                WRITE_PIXELS(v, y, u);
+                WRITE_PIXELS(y, v, y);
+            }
             if (w < avctx->width - 1) {
                 WRITE_PIXELS(u, y, v);
 
@@ -172,13 +180,13 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         const uint8_t *v = pic->data[2];
         for (h = 0; h < avctx->height; h++) {
             uint32_t val;
-            w = (avctx->width / 12) * 12;
+            w = (avctx->width / (12 * s->sample_factor)) * 12 * s->sample_factor;
             s->pack_line_8(y, u, v, dst, w);
 
             y += w;
             u += w >> 1;
             v += w >> 1;
-            dst += (w / 12) * 32;
+            dst += (w / (12 * s->sample_factor)) * 32 * s->sample_factor;
 
             for (; w < avctx->width - 5; w += 6) {
                 WRITE_PIXELS8(u, y, v);