From patchwork Fri Jun 16 13:53:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 4000 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1300008vsw; Fri, 16 Jun 2017 07:00:09 -0700 (PDT) X-Received: by 10.223.163.27 with SMTP id c27mr7337502wrb.85.1497621609790; Fri, 16 Jun 2017 07:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497621609; cv=none; d=google.com; s=arc-20160816; b=ZV7zQ5qYEsOS2Oz8uUXamqwIM96hIg+oQPiUxC1ZekYujRZPqzevzLd7XZil012BDA K0LriJ2IPApjLiwT0GIq3bpWKl3EYik9kEJ49KKNzlTKRvKEzhVIR8Wj2bMmJyPz87xN TxwnvK+LT07E+PIjBIYprngRSgF8pSqd0FwAW1o1DxZ6izGN8YyxlvLZ/PW24p1pu8gR FyBvNZC7Ul52dqLDY/xee+Y7nr8leiAzAZ42g4FvlraiEyOJY2EAlC7sp+AhMJ8wtMZk i04Q7KPNcXdV46ocARHkwlfLIkM0ZPvNm8G/E4qb47eFtsouwiXw8HTBAH3s4uxt7Xir HEyQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=KJ0gWuIIKnGAx3N/alsvrtTsaodyKf5BAJanZTeWpUI=; b=QO8G76l4cdQYv1lTzRHdPWtzDWKlEFkp4kp7gD7adGCdcU7lKis/6pyRlcGJGbV42M mebGpr+PGcyxlzXUZlgXFGU5v7ktojA9J4oU1vQDNBBC3jwqG8G6PNMsPF6mhhv8ounS Pbj+0905FuI40mZaN+gIGOhSjEKIbqqX/4tkHOQtV/h0oLR9oJgMwStVReSG4Dq/WwHu yGAE5V3gBeiTNZRLNGJLOM/6TCzfgE5qXUQnyBhfusIv2pGSmivLEacUfoL1s9Tzh/m4 Wew+5ejlAtwccr1fDFNjNoyKoXAQnIlQKiPRmVmLvwhMjojkCTVJhyxrbRoCudBRbwjH J1Sw== 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=VDvu58uX; 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 y23si2376109wrb.262.2017.06.16.07.00.09; Fri, 16 Jun 2017 07:00:09 -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=VDvu58uX; 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 B5C2368A1D6; Fri, 16 Jun 2017 17:00:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 213EF68A166 for ; Fri, 16 Jun 2017 16:59:56 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id d17so5213844wme.3 for ; Fri, 16 Jun 2017 06:59:59 -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; bh=5+p0fRutbJeFmzTBqjdu7sMiovhZO7N6V7mwxho8op4=; b=VDvu58uXMo4dQQttWfD7FCB5JwpV/OoDCdXLYAzDTvcVPd6tkQOq5DMGciU9SSBXll lK7o+hD7yQKhT5wPidXBDdSdVMCMwB1EzKVa76IZH2lQ0uHaxvDhi9deuadBrBKjc3CQ vZC5UL7fmODW7+3/wvYVuvDqxb9csXP/0kpW7+er1qAgS6N9Tr/IAc/EEfwmPhGA4O/2 aDiobuiOjnogxNLf312q9QFjP/3PBXgn9oooaxmU8HZ8JXTdtykjflHnPauDEsbyqGH9 UUB1E4oUDhmAZel5oy/bSU3R++HW5vz7BcEterz4JOs7VUsFzMB/b7SGL4loI6DEvNHp b8QA== 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; bh=5+p0fRutbJeFmzTBqjdu7sMiovhZO7N6V7mwxho8op4=; b=JHPB9aPpOXWMCZNDqPHXFUnYDLCyFvt4VjS5gYeJXaS96zIGQD97DlbtRJuAQHcT2h cSlC319Vo3xyvS0lCSX+ksCT6F7gOHjcZAHxWuh9W4dSqGsS9XM7ZxTht0NhIktnNLSF 7YpfBDgHBO3/5cNIM8Gbp07goMjVptFwScThKcp4Q+bHV1dOSv+FCFwwBdUXG3xxZqNi 3SsKzP1GVAjDQ0Zur/p3p/W/JAHOCBKSuUUqRliQhrjcF8WNVncbt4Anc8Zr1rqLC5Hp oLJQ5vkpoSAGTz8ZxcpfqJP3s5ifnwqiNpqpqqTGUBLHIMfu4EebUpbdKoJlKK7BFGUG tsGA== X-Gm-Message-State: AKS2vOzUt2GWLhhRzKPSMnvznyDYK7n3gOqxuo5j26FG3QFwC4z5ZDuL z4NLTkxQMj5dP7ifKXo= X-Received: by 10.80.161.69 with SMTP id 63mr7570087edj.142.1497621599029; Fri, 16 Jun 2017 06:59:59 -0700 (PDT) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 4sm1080918eds.48.2017.06.16.06.59.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 06:59:58 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Fri, 16 Jun 2017 15:53:27 +0200 Message-Id: <20170616135328.14495-1-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.1 Subject: [FFmpeg-devel] [PATCH 1/2] 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;