From patchwork Mon Jun 19 15:10:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 4035 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp959017vsw; Mon, 19 Jun 2017 08:17:55 -0700 (PDT) X-Received: by 10.223.164.214 with SMTP id h22mr18023580wrb.174.1497885475395; Mon, 19 Jun 2017 08:17:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497885475; cv=none; d=google.com; s=arc-20160816; b=WjoqdBukPdQayIuX741fBwgOsQeYZnDsmSHNG1ocvhITUeCP+oi3za2WHy/VQNfL6P WwV786NFb20+Qh0CbpZZJ3iSoAPMwwg+o33fkjpSqa7ti/bqwRttF02SwgEN5jaoRinl aIGDx5mO1AhD40XmA5gilFxSpkl1mt2utXdc31kzdCH95hR0H9drGAb0Pal5Q0j6jCTS Pm6nk3Hu+Ny2wzoCxYHmox2bCjLSF0uM4gQrJkeJPFVezpw9HWTAofkSZsHAhK6TZVcE D3RLCP8wzTrkKrqml6hICB1vJo2vBN0jaQbwPQuQaHo2tZuoAgtrkXB/q+3cw6GbHF/k jRQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=KJ0gWuIIKnGAx3N/alsvrtTsaodyKf5BAJanZTeWpUI=; b=QiU8L4NJ04jpHdRqWW+LK7rPVnz+SMngtQaBA2SXe7VrdqPYRNDbupZWSPOFxf6kYA 5U5w0zX4DkD8nW/YBhX0YfnLiWs5m0QWfUtfsZsS8wsOyL6xXZZBFhy0rUqc52Tse315 9KGnR5O6lDe/tyNDPH6QnDu5zlvhcc4URsAnnAtnroBq26W+B5cMQtNsCc1OFka+tFHa jNckSl5EUoyiIWMYjWDVDO1ZzsHOT/rNkqVAup0pA6rM7EjcyrK/wDakXkTJ3A0z3GbT zbQI7OE07V9mUZ8nEalndI3DQb34hHOpIQApBfqEppg1d3FusER5esJVJPwqMuL19twl 7sPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.b=yo9iGMUj; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s132si11126918wme.147.2017.06.19.08.17.54; Mon, 19 Jun 2017 08:17:55 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.b=yo9iGMUj; 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 43C9F68A4E7; Mon, 19 Jun 2017 18:17:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0808968A4DE for ; Mon, 19 Jun 2017 18:17:34 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id 77so14064908wrb.3 for ; Mon, 19 Jun 2017 08:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=5+p0fRutbJeFmzTBqjdu7sMiovhZO7N6V7mwxho8op4=; b=yo9iGMUjypvZRqdpXbFTXM8vQEpuqpd4GK9NXY3UaZeQ96BTlJHRu0b/x42r48ggZh e0pQsAqycXtrS/njK/9jhOuGmEwRil1F/hwDtVrnZRFEoDoWGwsLZKLdl7ak8srlbyDR +EETEp4+C1jLvayVz7KkoEZlaQGqxRNyWOAdncl7Enyj22fQpoOITs7fEpxghzoG7184 iNuyFsEYMrsKSLycO5vV4v9MxFRgoUB3QVuvCUhdmDWTT2nIkMnCaw1a1w1fZ2D4qdVu fx1keVdFSng9dxmkoRQ6jp4DesF9KRJrtFRiHvT98PyE6eR4TKabBLqZ1pj5IeEZtS2y puQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=5+p0fRutbJeFmzTBqjdu7sMiovhZO7N6V7mwxho8op4=; b=WyUnLoEmnaiXLvQ6SCdcsab3XT7qrdTXDo26JabnRiXFQC16lqvH2S5jMfYRO9Qri8 zKLRb2ktAY8IKwF6qx/2nrRpdObjRGE8CIjUvItiE+x9HBcRDFNxlfQ/rJEgvRGBCnVE 0iKbLcOjjE/onbt72f6tIu37fAlv+uaAbvdswWJSkqdDIur00SilxlVosNTIXZsn6d3I jLYYqJTDcrMxV+NQfFiWX5HmhVj681a4EHRPQABJ77SIa+09HB7PqOEQgdzV3vU0ECkb Cau4iDeULzKCHT8LoRIQ52g1y2aa+bZ238I/kx33ERekk0CU+4C2NK0eN23yEtx18yg2 eCRg== X-Gm-Message-State: AKS2vOy3oyw0blx5WRiA6kWk8K6/2jUIA5ZE48dpjzvq1cBuB9yPowmz RGs+WX4uiXqZyoI7sik= X-Received: by 10.223.170.7 with SMTP id p7mr18087007wrd.72.1497885458198; Mon, 19 Jun 2017 08:17:38 -0700 (PDT) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 6sm8059540wrg.61.2017.06.19.08.17.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 08:17:37 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 19 Jun 2017 17:10:54 +0200 Message-Id: <20170619151104.31273-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170619151104.31273-1-jdarnley@obe.tv> References: <20170619151104.31273-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/x86/mpegenc: check IDCT permutation type is a valid value 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" --- libavcodec/x86/mpegvideoenc_template.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/mpegvideoenc_template.c b/libavcodec/x86/mpegvideoenc_template.c index b2512744ca..3ce72e1367 100644 --- a/libavcodec/x86/mpegvideoenc_template.c +++ b/libavcodec/x86/mpegvideoenc_template.c @@ -322,7 +322,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s, block[0x3E] = temp_block[0x3D]; block[0x33] = temp_block[0x36]; block[0x2F] = temp_block[0x2F]; block[0x37] = temp_block[0x37]; block[0x3B] = temp_block[0x3E]; block[0x3F] = temp_block[0x3F]; - }else{ + } else if (s->idsp.perm_type == FF_IDCT_PERM_NONE) { if(last_non_zero_p1 <= 1) goto end; block[0x01] = temp_block[0x01]; block[0x08] = temp_block[0x08]; block[0x10] = temp_block[0x10]; @@ -366,6 +366,12 @@ static int RENAME(dct_quantize)(MpegEncContext *s, block[0x3D] = temp_block[0x3D]; block[0x36] = temp_block[0x36]; block[0x2F] = temp_block[0x2F]; block[0x37] = temp_block[0x37]; block[0x3E] = temp_block[0x3E]; block[0x3F] = temp_block[0x3F]; + } else { + av_log(s, AV_LOG_DEBUG, "s->idsp.perm_type: %d\n", + (int)s->idsp.perm_type); + av_assert0(s->idsp.perm_type == FF_IDCT_PERM_NONE || + s->idsp.perm_type == FF_IDCT_PERM_LIBMPEG2 || + s->idsp.perm_type == FF_IDCT_PERM_SIMPLE); } end: return last_non_zero_p1 - 1;