From patchwork Fri Sep 4 10:17:04 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: 22085 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 4CA9E44B7F3 for ; Fri, 4 Sep 2020 13:17:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B4EB68AAA0; Fri, 4 Sep 2020 13:17:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41629680AD6 for ; Fri, 4 Sep 2020 13:17:17 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z9so5569128wmk.1 for ; Fri, 04 Sep 2020 03:17:17 -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=RKKK5N1R95YHufqAj6ydITbtGfFaytQErI3H9ZlcQ6/ZTJQMg60LxwcNUVrO8gmIS0 F+AbE0yw1sdhloP8X8QtDPZtPbKevvJE+IUDgZKbHc3UMz3OlZ5rTgVa/FidwO9SW9aL a3No6iO98orgHjdWOQTTeWErRrTmR3raSAVRvetQkCNZVYUbqWE5bwQGtJphyzaE86Sn CP6m/6MVMvgmTW1CS6jDFniaKrjj4LEe8a+w2ytllULwTDi5hLov/ibOFDwD7dhuFUcO q7zMdjAgg18S+cwCzWupP7Z42pVtvR4ieQNmJBRryL1LegMs6bQ7kdI9mTCt0Wfkpzho M3PQ== 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=EWg/pxY9QyS8ANDW0FeES08TBqyd7Ti+Zv0Ac9f3l8oW/caes09YyMgUyOexvK2FM1 Epc1bZa39lNBxMMfO3tr9mLc01iG6vp2sKafyi8ztH0vy6wKxg/TistuJAhPNfn/Xsy3 73ULrXx5sMDSDLY7hPY3OKUk2Y3ZibaV9fDnbz1iqQjJqYZEUzK3AizNfPPTygibXOX+ z5jRzmmxtoKg8kePX6ZKbj5dAVIxLgQ+tZpNySiRQsy6UhgeiNWzJCKLMec7XdLH8RZK 2y5pmuEn6c/iui8zWZypzmoeuS9N6CTvGJ/1YogV/dNKT/k1E675bV4wllXeAbY15PPE gSmg== X-Gm-Message-State: AOAM532gHHSGEbQOZEb/IPgKoZ25JuxOC+niQ6S9suAGk06zW/wCa6Eq H8VFqLJAesp2dzRtYTUx1GQGJ56d2lG+uQ== X-Google-Smtp-Source: ABdhPJzJSzpi09gSO5y7JQDVflsYptBSOfpfo8+z2Jdbo8YGxEzG9vtPtFlN78YvkFAWizp3j+rEBA== X-Received: by 2002:a1c:1f41:: with SMTP id f62mr7185225wmf.51.1599214636449; Fri, 04 Sep 2020 03:17:16 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id 128sm10095746wmz.43.2020.09.04.03.17.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 03:17:15 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 12:17:04 +0200 Message-Id: <20200904101706.24228-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 Fri Sep 4 10:17:05 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: 22086 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 416F144B7F3 for ; Fri, 4 Sep 2020 13:17:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 211B768AD50; Fri, 4 Sep 2020 13:17:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71029687ED6 for ; Fri, 4 Sep 2020 13:17:18 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id c15so6138701wrs.11 for ; Fri, 04 Sep 2020 03:17:18 -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=9u25dL5iDu6LdseekA/TvV0mrsvTu+zvpGDvzEsa/QI=; b=V3CwVC2thlHxZQD5yx7rUiWL/UgiSuGGjD+823m7vjP9VUC+DXRRwHPupToowdQLwx O3Q+ttbu8dy6EsW/9LlwjpoRi/Dmc0lqBlV1HtFvjZUR6KlS7bFPzqLpL47i1+UK3n7T UXvLNQiVi++He3SWet49KkkC+mNkZOng142XBg8k9JtnvTbve8QPw72MsSk2TjAgDeRI 7mUZXDM5r+VfzkGOjw3cbSSxAaBxvLrbA0xE6p1810NvSjJY3wU8UzJPH3KtQqiLTNkC 0iXQJKB0GVorjz5kxxyrleaBZu3W1GRceZuhxwkBbIq08I8CY1naDQX7l156Y9eyqUgE 36Bw== 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=9u25dL5iDu6LdseekA/TvV0mrsvTu+zvpGDvzEsa/QI=; b=IS3/q94fAGEyPSP4uUl7DzTPBHpSf9uQoiIQiaMFPOw/T2W4b3REgpHibqHSIwV7xa 2swjzDwbVTlUYNUS+SY91WDt8IA23xJ9oZ4FlqBJ6JMwc697DVTPosUnly+JEfF5T14I GbFC6hVqb/IXz4jRIxCym+WURyl44Svp4ZXaBOLANIWpimMyc5NN2IvchPCRGlbEC149 QCJJDY3MMKLTs3r8JmjhCcE3l9j8ffaCkWESX/c9dQXc0nF5ZRUDQbM8ih74Zz9mtmN8 zp3AQoL+ER2z/xgMF/mvcIu/TvCLwd8liORDWA2YTEXKMgsKDIqXs4bFfRk2pd7xHTck RZpg== X-Gm-Message-State: AOAM533/ElWoqkzhWdlTWzf6Dv76YJxUy0wPBmVL90j/XwDj1jsky1YI 9vlrVXVsN/kVcx9nOYhESU6P0LJE8xAHtw== X-Google-Smtp-Source: ABdhPJwW4rDM91IO5sG2syQ17mAb+FCQIQnmT7Si5u4Py8snYLKa3dl4Jd5J0A4IOI3c1I24zfWnIg== X-Received: by 2002:adf:f6c2:: with SMTP id y2mr6750830wrp.79.1599214637586; Fri, 04 Sep 2020 03:17:17 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id 128sm10095746wmz.43.2020.09.04.03.17.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 03:17:17 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 12:17:05 +0200 Message-Id: <20200904101706.24228-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200904101706.24228-1-onemda@gmail.com> References: <20200904101706.24228-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 | 191 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 175 insertions(+), 16 deletions(-) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 3cd95afe80..123833741b 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,56 @@ 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) >= 4 * width; y += 4) { - for (x = 0; x < width; x += 4) { + 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) >= 18 * w / 4 + hmargin * 4 + (!!hmargin * 2); y += 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 && y + vmargin == left) { + 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; + } + + y += vmargin; + } + return y; } @@ -552,9 +684,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; - for (y = 0; y < left - 1 && get_bits_left(gb) >= 3 * width; y += 2) { - for (x = 0; x < width; x += 2) { + 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 * w + hmargin * 4; y += 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 +702,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; } From patchwork Fri Sep 4 10:17:06 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: 22087 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 94BC344B7F3 for ; Fri, 4 Sep 2020 13:17:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 795EC68B29C; Fri, 4 Sep 2020 13:17:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58C98680AD6 for ; Fri, 4 Sep 2020 13:17:19 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id g4so6177151wrs.5 for ; Fri, 04 Sep 2020 03:17:19 -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=qHyWEcAkQ4wA+A+6aaFG1l97tVFib8ZrPH+iQ7hbiDY=; b=gdNTemTRJZjsi3dlFt/X7T4FibK1VfKsn7jeYcXfrIu0+/1aqYwOThYnCkO9KdwlRj 5xzti3Y0jc+T+LbWj6AjMPOl4mbQhOpLS/uOu6rl490mTsdaVcswuinCkaiPrR5K08L2 18uqM7TrWK+0IEuvM6xTRdtix1Jc0Dw501+sLVzvTRhqxRNbHwrZB9EAaJ99ZEBPVywb 3UX/BuMwa+E4I44kkO3sRe9fK4hebUbwWiFZMdPewWCBnVECh04Kwq3gu69CuvnNsxYX JtOjLMB23iFeh5bYYqBA+Jk7K2gxyLOjsatPzuI18XYHOJ/Lf7DY1RoeQdRwPckZ6/jl sViA== 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=qHyWEcAkQ4wA+A+6aaFG1l97tVFib8ZrPH+iQ7hbiDY=; b=OEzAmaAy25fQT5VATnm8I2Xg76VWbzql0092UgKaudZDbwC0PnWlKec90JYhVtH4B2 wWWCLxbaVHNxfnGxVoq4lOt/fc3J+a71baUP8gxBJwBmE5lmhezdK3emarptgrjJ33lO Fh77kkqbTmE5bLq6r/NOqAV7bFhmplJdjpB60n0PhRi2yRJRrfwAZNBg/BV22k8eQbSO eurLxl/ofMzn7IqvyfpDCq8YOI17Vq/5imBeKPeWgWGbMfki1NqRhcka3vzyMZnMOth3 yLSO+YCBxEeS0Qk9kR5bCS7N67wPA4Ygmh0pBd7cBggBZnMPhsnCCRnRljVksfmMuKZP +2TQ== X-Gm-Message-State: AOAM5306Y79vsR4wlRW8N4TWYIbKYn+VPC2N5MBissbik2ILLHmMdnbl vKhdEEZNV8c8EqgCESsygoyaWQIXn9XdkA== X-Google-Smtp-Source: ABdhPJwUdT4yCqdVqJceQ00BelKILhXl5PPGca2fbtEzWfyP4Ay3so6DvfHUqA68iGQudb8AD6JIfw== X-Received: by 2002:adf:f7d0:: with SMTP id a16mr6542539wrq.381.1599214638558; Fri, 04 Sep 2020 03:17:18 -0700 (PDT) Received: from localhost.localdomain ([31.45.254.223]) by smtp.gmail.com with ESMTPSA id 128sm10095746wmz.43.2020.09.04.03.17.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 03:17:18 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Sep 2020 12:17:06 +0200 Message-Id: <20200904101706.24228-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200904101706.24228-1-onemda@gmail.com> References: <20200904101706.24228-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/dxtory: add missed rgb555/rgb565 formats for vflip case 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 123833741b..e239abe233 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -62,6 +62,8 @@ static void do_vflip(AVCodecContext *avctx, AVFrame *pic, int vflip) pic->linesize[1] = -pic->linesize[1]; pic->data[2] += (avctx->height - 1) * pic->linesize[2]; pic->linesize[2] = -pic->linesize[2]; + case AV_PIX_FMT_RGB555LE: + case AV_PIX_FMT_RGB565LE: case AV_PIX_FMT_BGR24: case AV_PIX_FMT_RGB24: pic->data[0] += (avctx->height - 1) * pic->linesize[0];