From patchwork Wed Mar 1 22:49:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2721 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp12305vsf; Wed, 1 Mar 2017 14:49:24 -0800 (PST) X-Received: by 10.28.69.17 with SMTP id s17mr5602594wma.60.1488408564467; Wed, 01 Mar 2017 14:49:24 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u10si132341wrd.256.2017.03.01.14.49.23; Wed, 01 Mar 2017 14:49:24 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 745EA688253; Thu, 2 Mar 2017 00:49:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-2.mx.upcmail.net (vie01a-dmta-pe01-2.mx.upcmail.net [62.179.121.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF071687ECB for ; Thu, 2 Mar 2017 00:49:04 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cjD3b-0006pB-IP for ffmpeg-devel@ffmpeg.org; Wed, 01 Mar 2017 23:49:15 +0100 Received: from [192.168.1.3] ([80.110.113.165]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id qmpD1u00i3aALgo01mpEG2; Wed, 01 Mar 2017 23:49:14 +0100 X-SourceIP: 80.110.113.165 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Wed, 1 Mar 2017 23:49:13 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201703012349.13409.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/sheervideo: Fix Y prediction for interlaced frames with alpha 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes ticket #6210 visually. Please review, Carl Eugen From 305b1916d99465896abbd1fbf401c6e4fba062a5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 1 Mar 2017 23:45:10 +0100 Subject: [PATCH] lavc/sheervideo: Fix Y prediction for interlaced frames with transparency. Based on 260de8a2 by Paul B Mahol. Fixes ticket #6210. --- libavcodec/sheervideo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/sheervideo.c b/libavcodec/sheervideo.c index e8f008b..9d2da7f 100644 --- a/libavcodec/sheervideo.c +++ b/libavcodec/sheervideo.c @@ -2185,7 +2185,7 @@ static void decode_aybri(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) dst_v[x] = get_bits(gb, 8); } } else { - int pred[4] = { 125, 125, -128, -128 }; + int pred[4] = { 125, s->alt ? 125 : -146, -128, -128 }; for (x = 0; x < avctx->width; x++) { int a, y, u, v; @@ -2263,7 +2263,7 @@ static void decode_aybr(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb) dst_v[x] = get_bits(gb, 8); } } else { - int pred[4] = { 125, 125, -128, -128 }; + int pred[4] = { 125, s->alt ? 125 : -146, -128, -128 }; for (x = 0; x < avctx->width; x++) { int a, y, u, v; @@ -2959,6 +2959,7 @@ static int decode_frame(AVCodecContext *avctx, } break; case MKTAG('A', 'Y', 'B', 'R'): + s->alt = 1; case MKTAG('A', 'Y', 'b', 'R'): avctx->pix_fmt = AV_PIX_FMT_YUVA444P; s->decode_frame = decode_aybr; @@ -2968,6 +2969,7 @@ static int decode_frame(AVCodecContext *avctx, } break; case MKTAG('A', 'y', 'B', 'R'): + s->alt = 1; case MKTAG('A', 'y', 'b', 'R'): avctx->pix_fmt = AV_PIX_FMT_YUVA444P; s->decode_frame = decode_aybri;