From patchwork Thu Sep 3 22:30:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22081 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 83ADA44B502 for ; Fri, 4 Sep 2020 01:31:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6811D68A9AA; Fri, 4 Sep 2020 01:31:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0197E680867 for ; Fri, 4 Sep 2020 01:30:54 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id o21so4375553wmc.0 for ; Thu, 03 Sep 2020 15:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=fhs7EuwlPfRWNV4qS7IPKCJ5w6vML4Hd0ocF+gwqQD8=; b=jtwjx8d5V1nzRgpEX4FpMR/9148x8fEbK1Uga2Ha379GfFVL6aDI992Fa65qBQWGkc 2pbJSXdFCaxVOqF6fBEFNpYiXiaeadd3BrMf9JTIsCnk03tlEJ4HRk0JTkUxL2Dfzrky hdDi5k3/41FFoQJbkqrcLetdl1vTjhjPuJLHPmPxW93EJP4fmsFSGAxlT0i4W+bt3tiS /2+FR7ndWDNpmfXozyPWoD6IehDNmP6l0QE+wt0k6QxEiAlYw81h9W4pV3xNl5lVx1xf +5L9zp3sVFhEqUVpJR9cizH/VzxM7DhbygIR5jfr8KKI2u5uyJB9HpAAid0HuWEJGJXx 1X2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=fhs7EuwlPfRWNV4qS7IPKCJ5w6vML4Hd0ocF+gwqQD8=; b=AJjH2FgypJEyiqGQbxYE7QtMZZHd4KqJwnE6lbG20iR+jYzqvsIlcIP5diWMh27wih 7WZdfe66I7D3ztOIvB322trmSm+WLx8WEt0WGompmcc9EULVDKifngU9Mk4o/OLjU9pH EAsCg1OKWPtjhpikJr8cFAodsnnldlHyBKYDG3aS7mrHRNNrVBdIJSnAB4bvGyMM4/WF iacxqfKHOSrMT9tlPo8Qum/mH43r60ZsgHoDFgwRMPeYjqEDGN/86Fz2P5Z0kI52Y9TL IEDUhplXNpxSkLXAlzfqE40G7l3di3pA8xPbG/a98awv5TX2hyVDijn/7229HjHsyjjF vPgQ== X-Gm-Message-State: AOAM531sFWo7yNhgg9MKqaNJa4JJaoTQvWaozOQIzl0LYLJM/wVQBV8Z r2+PqiO+6P4yYZ6jBU9IcBL+uXdorcbhyQ== X-Google-Smtp-Source: ABdhPJzcdrQQngX0PVXJ4nvglAynvuilgNO3PtzN4aYCdRPbf5ZohJ+FtLVq5KbFpcr2Ti9s5V5RUA== X-Received: by 2002:a1c:7314:: with SMTP id d20mr3479074wmb.164.1599172254220; Thu, 03 Sep 2020 15:30:54 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id o9sm6949052wrw.58.2020.09.03.15.30.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 15:30:53 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 00:30:41 +0200 Message-Id: <20200903223043.30596-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dxtory: unbreak decoding after 6e1a167c556 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" get_unary() takes at minimum only 1 bit. Signed-off-by: Paul B Mahol --- libavcodec/dxtory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index bc19f27951..3cd95afe80 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -395,7 +395,7 @@ static int dx2_decode_slice_5x5(GetBitContext *gb, AVFrame *frame, int stride = frame->linesize[0]; uint8_t *dst = frame->data[0] + stride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { b = decode_sym_565(gb, lru[0], 5); g = decode_sym_565(gb, lru[1], is_565 ? 6 : 5); @@ -462,7 +462,7 @@ static int dx2_decode_slice_rgb(GetBitContext *gb, AVFrame *frame, int stride = frame->linesize[0]; uint8_t *dst = frame->data[0] + stride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { dst[x * 3 + 0] = decode_sym(gb, lru[0]); dst[x * 3 + 1] = decode_sym(gb, lru[1]); @@ -508,7 +508,7 @@ static int dx2_decode_slice_410(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + (ustride >> 2) * line; uint8_t *V = frame->data[2] + (vstride >> 2) * line; - for (y = 0; y < left - 3 && get_bits_left(gb) > 9 * width; y += 4) { + for (y = 0; y < left - 3 && get_bits_left(gb) >= 4 * width; y += 4) { for (x = 0; x < width; x += 4) { for (j = 0; j < 4; j++) for (i = 0; i < 4; i++) @@ -553,7 +553,7 @@ static int dx2_decode_slice_420(GetBitContext *gb, AVFrame *frame, uint8_t *V = frame->data[2] + (vstride >> 1) * line; - for (y = 0; y < left - 1 && get_bits_left(gb) > 6 * width; y += 2) { + for (y = 0; y < left - 1 && get_bits_left(gb) >= 3 * width; y += 2) { for (x = 0; x < width; x += 2) { Y[x + 0 + 0 * ystride] = decode_sym(gb, lru[0]); Y[x + 1 + 0 * ystride] = decode_sym(gb, lru[0]); @@ -597,7 +597,7 @@ static int dx2_decode_slice_444(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + ustride * line; uint8_t *V = frame->data[2] + vstride * line; - for (y = 0; y < left && get_bits_left(gb) > 6 * width; y++) { + for (y = 0; y < left && get_bits_left(gb) >= 3 * width; y++) { for (x = 0; x < width; x++) { Y[x] = decode_sym(gb, lru[0]); U[x] = decode_sym(gb, lru[1]) ^ 0x80; From patchwork Thu Sep 3 22:30:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22084 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BC72C4495C8 for ; Fri, 4 Sep 2020 01:36:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B10F68A345; Fri, 4 Sep 2020 01:36:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0A91688265 for ; Fri, 4 Sep 2020 01:36:11 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id w1so4280579edr.3 for ; Thu, 03 Sep 2020 15:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=8BrQIyrRfnm+KdpZZQnoYymQGdTcK5fQNSRgcZCabjY=; b=bIyuFju/Kdl6f4OaFzisKnJQf0gQQqEIy75Q92RFMpIfEGzXhY86ye92jszBgvjRB2 vJ//Z0sS/NhnIFLfgUdblaTmQtE46sDEznpmVETg98F640xbFivX9NqVkk5xKtVO/c9J YY7/HarVeMTLM0fMdWn36yToGftbNCxRDTyyVljIvKAGGactAjqJ9Zc6E9oT56LQ2jXL U+gqHC12aMT7PDFFdsGnpxECTKfFAudjuzMDGPjln5B26WQZBdwem51CyA/HInN1PZH/ lzdLEGmauVmTbQAN3lXrybk/OJayiQA6ostohF/04asO7bQE1b+Y3usAw46h44hgKwXv n5mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8BrQIyrRfnm+KdpZZQnoYymQGdTcK5fQNSRgcZCabjY=; b=TLTa8QQ9lJ4IWHQ2gh3QXGYxHi3pUjZNHE+mUhlu1/GOeVdS7CjBx/g3FKwEUUQw+M Rg7EalZLV3vwbjwPOhr3hzt0419sjQwzNuxU4Ij8z5h6y28jYb2+ptMEcbsI2ziBd3Yu hWMHf0fcogNqMR0jFB5/fmDvItYHwp7/k14+4ZcwrFy2ENXlSkm55gLW37X2pqxy9TcJ QNbpBgdyR0EpDx0MwYTDGsX0tQ9Wk7UI87WFZ1MJGgaHUq1CyRGL0g4VFduCqTt5g8j5 a/JunL67EIiHTFmqAaYRgQZrgvDVzHb8RtMZbHpg7jb0L5yKvHLqB5XCn49JFRwBlJK1 W64w== X-Gm-Message-State: AOAM532S0YIjY9g14FRAB8m4h3mUdvtaZVPvHMb2QaVGnj3ysocTgrWe Beq/EYDb2gjI+JFFl/REXeQGakfyIMSZHg== X-Google-Smtp-Source: ABdhPJyQCV5tvBMHm7hzP2uy2AdQIcInSZTJBW2OzIjAIZctQG4ceRQva5wLd567gZEMnfjRnnSTJQ== X-Received: by 2002:adf:8405:: with SMTP id 5mr4537014wrf.393.1599172255451; Thu, 03 Sep 2020 15:30:55 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id o9sm6949052wrw.58.2020.09.03.15.30.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 15:30:55 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 00:30:42 +0200 Message-Id: <20200903223043.30596-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200903223043.30596-1-onemda@gmail.com> References: <20200903223043.30596-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/dxtory: support subsample formats with non-aligned dimensions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/dxtory.c | 185 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 171 insertions(+), 14 deletions(-) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 3cd95afe80..9e7ba3e94d 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -32,6 +32,25 @@ #include "internal.h" #include "unary.h" +static int64_t get_raw_size(enum AVPixelFormat fmt, int width, int height) +{ + switch (fmt) { + case AV_PIX_FMT_RGB555LE: + case AV_PIX_FMT_RGB565LE: + return width * height * 2LL; + case AV_PIX_FMT_RGB24: + case AV_PIX_FMT_BGR24: + case AV_PIX_FMT_YUV444P: + return width * height * 3LL; + case AV_PIX_FMT_YUV420P: + return (int64_t)(width * height) + AV_CEIL_RSHIFT(width, 1) * AV_CEIL_RSHIFT(height, 1); + case AV_PIX_FMT_YUV410P: + return (int64_t)(width * height) + AV_CEIL_RSHIFT(width, 2) * AV_CEIL_RSHIFT(height, 2); + } + + return 0; +} + static void do_vflip(AVCodecContext *avctx, AVFrame *pic, int vflip) { if (!vflip) @@ -51,17 +70,17 @@ static void do_vflip(AVCodecContext *avctx, AVFrame *pic, int vflip) case AV_PIX_FMT_YUV410P: pic->data[0] += (avctx->height - 1) * pic->linesize[0]; pic->linesize[0] = -pic->linesize[0]; - pic->data[1] += ((avctx->height >> 2) - 1) * pic->linesize[1]; + pic->data[1] += (AV_CEIL_RSHIFT(avctx->height, 2) - 1) * pic->linesize[1]; pic->linesize[1] = -pic->linesize[1]; - pic->data[2] += ((avctx->height >> 2) - 1) * pic->linesize[2]; + pic->data[2] += (AV_CEIL_RSHIFT(avctx->height, 2) - 1) * pic->linesize[2]; pic->linesize[2] = -pic->linesize[2]; break; case AV_PIX_FMT_YUV420P: pic->data[0] += (avctx->height - 1) * pic->linesize[0]; pic->linesize[0] = -pic->linesize[0]; - pic->data[1] += ((avctx->height >> 1) - 1) * pic->linesize[1]; + pic->data[1] += (AV_CEIL_RSHIFT(avctx->height, 1) - 1) * pic->linesize[1]; pic->linesize[1] = -pic->linesize[1]; - pic->data[2] += ((avctx->height >> 1) - 1) * pic->linesize[2]; + pic->data[2] += (AV_CEIL_RSHIFT(avctx->height, 1) - 1) * pic->linesize[2]; pic->linesize[2] = -pic->linesize[2]; break; } @@ -75,7 +94,7 @@ static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic, uint8_t *dst; int ret; - if (src_size < avctx->width * avctx->height * (int64_t)bpp) { + if (src_size < get_raw_size(id, avctx->width, avctx->height)) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); return AVERROR_INVALIDDATA; } @@ -104,9 +123,11 @@ static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic, { int h, w; uint8_t *Y1, *Y2, *Y3, *Y4, *U, *V; + int height, width, hmargin, vmargin; + int huvborder; int ret; - if (src_size < FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) * 9LL / 8) { + if (src_size < get_raw_size(AV_PIX_FMT_YUV410P, avctx->width, avctx->height)) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); return AVERROR_INVALIDDATA; } @@ -117,14 +138,20 @@ static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic, do_vflip(avctx, pic, vflipped); + height = avctx->height & ~3; + width = avctx->width & ~3; + hmargin = avctx->width - width; + vmargin = avctx->height - height; + huvborder = AV_CEIL_RSHIFT(avctx->width, 2) - 1; + Y1 = pic->data[0]; Y2 = pic->data[0] + pic->linesize[0]; Y3 = pic->data[0] + pic->linesize[0] * 2; Y4 = pic->data[0] + pic->linesize[0] * 3; U = pic->data[1]; V = pic->data[2]; - for (h = 0; h < avctx->height; h += 4) { - for (w = 0; w < avctx->width; w += 4) { + for (h = 0; h < height; h += 4) { + for (w = 0; w < width; w += 4) { AV_COPY32U(Y1 + w, src); AV_COPY32U(Y2 + w, src + 4); AV_COPY32U(Y3 + w, src + 8); @@ -133,6 +160,18 @@ static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic, V[w >> 2] = src[17] + 0x80; src += 18; } + if (hmargin) { + for (w = 0; w < hmargin; w++) { + Y1[width + w] = src[w]; + Y2[width + w] = src[w + hmargin * 1]; + Y3[width + w] = src[w + hmargin * 2]; + Y4[width + w] = src[w + hmargin * 3]; + } + src += 4 * hmargin; + U[huvborder] = src[0] + 0x80; + V[huvborder] = src[1] + 0x80; + src += 2; + } Y1 += pic->linesize[0] << 2; Y2 += pic->linesize[0] << 2; Y3 += pic->linesize[0] << 2; @@ -141,6 +180,33 @@ static int dxtory_decode_v1_410(AVCodecContext *avctx, AVFrame *pic, V += pic->linesize[2]; } + if (vmargin) { + for (w = 0; w < width; w += 4) { + AV_COPY32U(Y1 + w, src); + if (vmargin > 1) + AV_COPY32U(Y2 + w, src + 4); + if (vmargin > 2) + AV_COPY32U(Y3 + w, src + 8); + src += 4 * vmargin; + U[w >> 2] = src[0] + 0x80; + V[w >> 2] = src[1] + 0x80; + src += 2; + } + if (hmargin) { + for (w = 0; w < hmargin; w++) { + AV_COPY32U(Y1 + w, src); + if (vmargin > 1) + AV_COPY32U(Y2 + w, src + 4); + if (vmargin > 2) + AV_COPY32U(Y3 + w, src + 8); + src += 4 * vmargin; + } + U[huvborder] = src[0] + 0x80; + V[huvborder] = src[1] + 0x80; + src += 2; + } + } + do_vflip(avctx, pic, vflipped); return 0; @@ -152,9 +218,11 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, AVFrame *pic, { int h, w; uint8_t *Y1, *Y2, *U, *V; + int height, width, hmargin, vmargin; + int huvborder; int ret; - if (src_size < FFALIGN(avctx->width, 2) * FFALIGN(avctx->height, 2) * 3LL / 2) { + if (src_size < get_raw_size(AV_PIX_FMT_YUV420P, avctx->width, avctx->height)) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); return AVERROR_INVALIDDATA; } @@ -165,24 +233,52 @@ static int dxtory_decode_v1_420(AVCodecContext *avctx, AVFrame *pic, do_vflip(avctx, pic, vflipped); + height = avctx->height & ~1; + width = avctx->width & ~1; + hmargin = avctx->width - width; + vmargin = avctx->height - height; + huvborder = AV_CEIL_RSHIFT(avctx->width, 1) - 1; + Y1 = pic->data[0]; Y2 = pic->data[0] + pic->linesize[0]; U = pic->data[1]; V = pic->data[2]; - for (h = 0; h < avctx->height; h += 2) { - for (w = 0; w < avctx->width; w += 2) { + for (h = 0; h < height; h += 2) { + for (w = 0; w < width; w += 2) { AV_COPY16(Y1 + w, src); AV_COPY16(Y2 + w, src + 2); U[w >> 1] = src[4] + 0x80; V[w >> 1] = src[5] + 0x80; src += 6; } + if (hmargin) { + Y1[width + 1] = src[0]; + Y2[width + 1] = src[1]; + U[huvborder] = src[2] + 0x80; + V[huvborder] = src[3] + 0x80; + src += 4; + } Y1 += pic->linesize[0] << 1; Y2 += pic->linesize[0] << 1; U += pic->linesize[1]; V += pic->linesize[2]; } + if (vmargin) { + for (w = 0; w < width; w += 2) { + AV_COPY16U(Y1 + w, src); + U[w >> 1] = src[0] + 0x80; + V[w >> 1] = src[1] + 0x80; + src += 4; + } + if (hmargin) { + Y1[w] = src[0]; + U[huvborder] = src[1] + 0x80; + V[huvborder] = src[2] + 0x80; + src += 3; + } + } + do_vflip(avctx, pic, vflipped); return 0; @@ -196,7 +292,7 @@ static int dxtory_decode_v1_444(AVCodecContext *avctx, AVFrame *pic, uint8_t *Y, *U, *V; int ret; - if (src_size < avctx->width * avctx->height * 3LL) { + if (src_size < get_raw_size(AV_PIX_FMT_YUV444P, avctx->width, avctx->height)) { av_log(avctx, AV_LOG_ERROR, "packet too small\n"); return AVERROR_INVALIDDATA; } @@ -508,20 +604,54 @@ static int dx2_decode_slice_410(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + (ustride >> 2) * line; uint8_t *V = frame->data[2] + (vstride >> 2) * line; + int h, w, hmargin, vmargin; + int huvborder; + + h = frame->height & ~3; + w = frame->width & ~3; + hmargin = frame->width - w; + vmargin = frame->height - h; + huvborder = AV_CEIL_RSHIFT(frame->width, 2) - 1; + for (y = 0; y < left - 3 && get_bits_left(gb) >= 4 * width; y += 4) { - for (x = 0; x < width; x += 4) { + for (x = 0; x < w; x += 4) { for (j = 0; j < 4; j++) for (i = 0; i < 4; i++) Y[x + i + j * ystride] = decode_sym(gb, lru[0]); U[x >> 2] = decode_sym(gb, lru[1]) ^ 0x80; V[x >> 2] = decode_sym(gb, lru[2]) ^ 0x80; } + if (hmargin) { + for (j = 0; j < 4; j++) + for (i = 0; i < hmargin; i++) + Y[x + i + j * ystride] = decode_sym(gb, lru[0]); + U[huvborder] = decode_sym(gb, lru[1]) ^ 0x80; + V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; + } Y += ystride << 2; U += ustride; V += vstride; } + if (vmargin) { + for (x = 0; x < width; x += 4) { + for (j = 0; j < vmargin; j++) + for (i = 0; i < 4; i++) + Y[x + i + j * ystride] = decode_sym(gb, lru[0]); + U[x >> 2] = decode_sym(gb, lru[1]) ^ 0x80; + V[x >> 2] = decode_sym(gb, lru[2]) ^ 0x80; + } + if (hmargin) { + for (j = 0; j < vmargin; j++) { + for (i = 0; i < hmargin; i++) + Y[x + i + j * ystride] = decode_sym(gb, lru[0]); + } + U[huvborder] = decode_sym(gb, lru[1]) ^ 0x80; + V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; + } + } + return y; } @@ -552,9 +682,17 @@ static int dx2_decode_slice_420(GetBitContext *gb, AVFrame *frame, uint8_t *U = frame->data[1] + (ustride >> 1) * line; uint8_t *V = frame->data[2] + (vstride >> 1) * line; + int h, w, hmargin, vmargin; + int huvborder; + + h = frame->height & ~1; + w = frame->width & ~1; + hmargin = frame->width - w; + vmargin = frame->height - h; + huvborder = AV_CEIL_RSHIFT(frame->width, 1) - 1; for (y = 0; y < left - 1 && get_bits_left(gb) >= 3 * width; y += 2) { - for (x = 0; x < width; x += 2) { + for (x = 0; x < w; x += 2) { Y[x + 0 + 0 * ystride] = decode_sym(gb, lru[0]); Y[x + 1 + 0 * ystride] = decode_sym(gb, lru[0]); Y[x + 0 + 1 * ystride] = decode_sym(gb, lru[0]); @@ -562,12 +700,31 @@ static int dx2_decode_slice_420(GetBitContext *gb, AVFrame *frame, U[x >> 1] = decode_sym(gb, lru[1]) ^ 0x80; V[x >> 1] = decode_sym(gb, lru[2]) ^ 0x80; } + if (hmargin) { + Y[x + 0 * ystride] = decode_sym(gb, lru[0]); + Y[x + 1 * ystride] = decode_sym(gb, lru[0]); + U[huvborder] = decode_sym(gb, lru[1]) ^ 0x80; + V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; + } Y += ystride << 1; U += ustride; V += vstride; } + if (vmargin) { + for (x = 0; x < width; x += 2) { + Y[x + 0] = decode_sym(gb, lru[0]); + U[x >> 1] = decode_sym(gb, lru[1]) ^ 0x80; + V[x >> 1] = decode_sym(gb, lru[2]) ^ 0x80; + } + if (hmargin) { + Y[x] = decode_sym(gb, lru[0]); + U[huvborder] = decode_sym(gb, lru[1]) ^ 0x80; + V[huvborder] = decode_sym(gb, lru[2]) ^ 0x80; + } + } + return y; }