From patchwork Tue Apr 4 09:58:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 3282 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp110767vss; Tue, 4 Apr 2017 02:58:56 -0700 (PDT) X-Received: by 10.28.10.209 with SMTP id 200mr14149835wmk.126.1491299936515; Tue, 04 Apr 2017 02:58:56 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 28si23823790wrw.17.2017.04.04.02.58.54; Tue, 04 Apr 2017 02:58:56 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AAC3D68828E; Tue, 4 Apr 2017 12:58:49 +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 AB8E56806CF for ; Tue, 4 Apr 2017 12:58:43 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id u18so40708018wrc.0 for ; Tue, 04 Apr 2017 02:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hy6X9cX6i9R84ERS54KQyL/crUjKuczlTMWjK4R9iaU=; b=iuAXn3XfoCCMvbe2w1qyHPQGFGIUpLpUIW/5kLNwX8qRQL9ZmAwFDOrVX8uSm9K4EX U2M8D4TjK/1Mrwhbot3ZnJAv0DjlBDi/gVAlT1fGKmpmKvZkBwFAQvQZK8/WXZs8NF+7 yVbBZJSY4o+zqa7C42B6Ew3sIZG5w+OcOJAdDOf8vrOqgPpxAuaUVGaphSrlsTmbEEYL cObb00Fmq8LdFfFSabXg6b66SqfjAbV//VRFKneHiJG+T7n4HvPUhbfag5MZW/SRwfEp XUoJWusd/ZoE4GIbM00BuWT3XCWOw+9IoS+O890nJPk3m1f3my/P9hEkKS9OWtH17vuK j4lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hy6X9cX6i9R84ERS54KQyL/crUjKuczlTMWjK4R9iaU=; b=qJRdiYSx7oMowcE5l8+ZVgGG5rtXYGuzyiDtD4SZtpI2RJVUDJFu6GBMFjX+5hFGHn Kt3doAlOGZ0ux7PkPxsZW5AO3KIKYpDbLyUgIAF0o7g6NowS4bGXPe/7CnSEptcIHxKd Ga5zjmoFh4eey3Hv8FVTN+SH8bIWttXlghp1sK4D2gytfq5rLaUVQDbEC0jTZcBeeMba DCfJwpd1wYCpZ8aQC9a4FMh+JZ0bBDP+K7WhXAfux1SUnz8qI6CI1I/zZF0BIlLd4BK2 Nb+HaTdfIbna9Z/gNXjBNcQRLVMZHqbBgSvWM6v15q2OHZ6EsMoJXQmAlek4njSD8tEp FbEQ== X-Gm-Message-State: AFeK/H3kkLthIXwmdYxNrPS1v0oxfVIjAGCDGmjz2s8zISpEVFn5cn+Z 00avWu6PeFsc8g== X-Received: by 10.28.7.13 with SMTP id 13mr13724967wmh.16.1491299925420; Tue, 04 Apr 2017 02:58:45 -0700 (PDT) Received: from moonbase.lan (host86-136-239-66.range86-136.btcentralplus.com. [86.136.239.66]) by smtp.gmail.com with ESMTPSA id 94sm21639359wrp.34.2017.04.04.02.58.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 02:58:44 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Apr 2017 10:58:37 +0100 Message-Id: <20170404095837.13142-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.12.2.715.g7642488e1d Subject: [FFmpeg-devel] [PATCH] mpegvideo_enc: disable optimized huffman coding with AMV or slice threads 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Doesn't work yet with slice threading and won't work with AMV. --- libavcodec/mpegvideo_enc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 71a858fc72..db241c82f0 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -399,6 +399,9 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } + if (avctx->codec_id == AV_CODEC_ID_AMV || (avctx->active_thread_type & FF_THREAD_SLICE)) + s->huffman = 0; + if (s->intra_dc_precision > (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 3 : 0)) { av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n"); return AVERROR(EINVAL);