From patchwork Thu Jun 15 19:50:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ronald S. Bultje" X-Patchwork-Id: 3994 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp955745vsw; Thu, 15 Jun 2017 12:50:46 -0700 (PDT) X-Received: by 10.223.160.88 with SMTP id l24mr5050331wrl.31.1497556246849; Thu, 15 Jun 2017 12:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497556246; cv=none; d=google.com; s=arc-20160816; b=WM+KTuekeU39TSGd5wyrWpP1P6QTiXzj/XGVTk4ceqU1EExrgDhjrqGRv+QDGoAIig UqQBljPRWbpRVo8KMt0BhodkZq/PtHkwiKJsdCA6bmP3SIDNN2xfsuz1lqkhn1QSjGWV Iz8h3pRE2U56ubJLmkUp5jkYZUgWjaFFOt0XajtyfkVX+a5xhUO5mDVcpr5TfpuwasdY dKdo8rWWGHB1kPSlUG1y0cW4oXcXSRcWeMuzwSLOdcffQyyEa7wmTkmq3mYkwWHuWi8n EY/TAkGZRgGLr+Jf75hWqQhQudQOJhDbaDe/l4dqRHnFZxs3XCBWD5SSj/48JfIEmLuI 1ehw== 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:cc: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=l+nNZZj8mze7fBUvdhqjTHqDCbTmG8BUTyobpDjd3kw=; b=lDEMuoZyHbnbWQpBd02DBDKyL0cDlctZdnGEpHYQt9GzC1yy9f+KoqqUMrkZgcrR5P hBsMkBWOT2AykuXIwaLOwbIcFDYMZ83XZXgBqsm4TaJaodBbobDIRTBCzKbcRNdbvHep mddMj4qsuzPmJMvJQ9mrNcC2pHhPONz3MdU4clvcJqMQBwF+9vHbWMb1gynXJlMSLzXt neP3WHx3dRzECS6YHU00patoLWBQIkErCoaTplPIEFRQnx/ld98kNdbXSn74fQhUQqhb mjzk+7op4hWZoxM9szV4QoxsyPeQi0y5Ijf2BYZFqA026ZiW0yAyfLNFQoG/fK6fKoNk F1Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=GmmTmuJg; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11si889713wmf.177.2017.06.15.12.50.46; Thu, 15 Jun 2017 12:50:46 -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 header.b=GmmTmuJg; 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 7FC3F68A3AF; Thu, 15 Jun 2017 22:50:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B42868A34C for ; Thu, 15 Jun 2017 22:50:34 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id w1so5375467qtg.0 for ; Thu, 15 Jun 2017 12:50:37 -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=zkW73l8n7NoSRLoJ+BvWNBnFIb2we1nmZoVbqfzMI4c=; b=GmmTmuJgHD86xDL+VFtDVY54C1VWOndh3VdCyugg39vqsszbfLD3am6hFL0LKh7GXW yA/Qe1lT8pKjpOtBYngCdhXQ6kkrR2BWqFw1pGPDoGlB4F2wKRvipehbn1Mn7NfJzlmn /ThB2X9tmDk8pEYVGcS6wFqtnSCJ7V9e5eY3zJFi95Sr6ZdbvPWOaL/KmBMy5Kx571LR 97zuyRw4E4kvLYTjJXGJeKA50TFBg4/pYoUdPA99eSyF0Q0Zot/q8uFk6MDPMVAyvtHZ R7r+X5u6X8tFBfwW3fhwWiZaKRHOOGYcJZBnQFJNsAcTQ5p36oAv+RPM0C/Zv24FWQ0u uX6w== 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=zkW73l8n7NoSRLoJ+BvWNBnFIb2we1nmZoVbqfzMI4c=; b=RCz8hYMtmnbw5Vrg00z/SGO2K8o+t9vYa04CWNRk8VfnAzmghNWwL29dh4/l0LG1NQ neCsvaZ/g7zW/BraAWOagE/HJL7aL0rXA5tk4gT8U7nJ3MVnMKoSK41hUXFsPDfd8wZF JCko7pLk9YF3EiOruGrwMkxNstqPrgW8pTt1J6KJQpBmf9hSjiRodkCvyQbiT06/Sf+/ 7+FSfBKQgTuviz7+JSnHRlXtKgglotxrCzvFFOUsqvPb23+qOfeMnG9gf1++ptjxm5mT +bruTMQ8PZdc7IKLX+kIR81f3yzva4pz2BFj8IC/maVJSTFhi+uCCutdOX9+VfQOR5au t84w== X-Gm-Message-State: AKS2vOzqVVeA4xOLKE0FDg233ji7lnjIdqgQ3kzHjBEOKcVnS5GJ/sPp 4a87eSdPf5jfC//NDu0= X-Received: by 10.55.138.71 with SMTP id m68mr8220877qkd.192.1497556236102; Thu, 15 Jun 2017 12:50:36 -0700 (PDT) Received: from localhost.localdomain ([65.206.95.146]) by smtp.gmail.com with ESMTPSA id m29sm94796qta.66.2017.06.15.12.50.35 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 15 Jun 2017 12:50:35 -0700 (PDT) From: "Ronald S. Bultje" To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2017 15:50:31 -0400 Message-Id: <1497556233-65009-1-git-send-email-rsbultje@gmail.com> X-Mailer: git-send-email 2.8.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/h264_cabac: Fix CABAC+8x8dct in 4:4:4 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: "Ronald S . Bultje" , Anton Mitrofanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Anton Mitrofanov Use the correct ctxIdxInc calculation for coded_block_flag. Keep old behavior for old versions of x264 for backward compatibility. Signed-off-by: Ronald S. Bultje --- libavcodec/h264_cabac.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 11ff3a0..28aacc5 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -2347,21 +2347,40 @@ decode_intra_mb: if (CHROMA444(h) && IS_8x8DCT(mb_type)){ int i; uint8_t *nnz_cache = sl->non_zero_count_cache; - for (i = 0; i < 2; i++){ - if (sl->left_type[LEFT(i)] && !IS_8x8DCT(sl->left_type[LEFT(i)])) { - nnz_cache[3+8* 1 + 2*8*i]= - nnz_cache[3+8* 2 + 2*8*i]= - nnz_cache[3+8* 6 + 2*8*i]= - nnz_cache[3+8* 7 + 2*8*i]= - nnz_cache[3+8*11 + 2*8*i]= - nnz_cache[3+8*12 + 2*8*i]= IS_INTRA(mb_type) ? 64 : 0; + if (h->sei.unregistered.x264_build < 151U) { + for (i = 0; i < 2; i++){ + if (sl->left_type[LEFT(i)] && !IS_8x8DCT(sl->left_type[LEFT(i)])) { + nnz_cache[3+8* 1 + 2*8*i]= + nnz_cache[3+8* 2 + 2*8*i]= + nnz_cache[3+8* 6 + 2*8*i]= + nnz_cache[3+8* 7 + 2*8*i]= + nnz_cache[3+8*11 + 2*8*i]= + nnz_cache[3+8*12 + 2*8*i]= IS_INTRA(mb_type) ? 64 : 0; + } + } + if (sl->top_type && !IS_8x8DCT(sl->top_type)){ + uint32_t top_empty = !IS_INTRA(mb_type) ? 0 : 0x40404040; + AV_WN32A(&nnz_cache[4+8* 0], top_empty); + AV_WN32A(&nnz_cache[4+8* 5], top_empty); + AV_WN32A(&nnz_cache[4+8*10], top_empty); + } + } else { + for (i = 0; i < 2; i++){ + if (sl->left_type[LEFT(i)] && !IS_8x8DCT(sl->left_type[LEFT(i)])) { + nnz_cache[3+8* 1 + 2*8*i]= + nnz_cache[3+8* 2 + 2*8*i]= + nnz_cache[3+8* 6 + 2*8*i]= + nnz_cache[3+8* 7 + 2*8*i]= + nnz_cache[3+8*11 + 2*8*i]= + nnz_cache[3+8*12 + 2*8*i]= !IS_INTRA_PCM(sl->left_type[LEFT(i)]) ? 0 : 64; + } + } + if (sl->top_type && !IS_8x8DCT(sl->top_type)){ + uint32_t top_empty = !IS_INTRA_PCM(sl->top_type) ? 0 : 0x40404040; + AV_WN32A(&nnz_cache[4+8* 0], top_empty); + AV_WN32A(&nnz_cache[4+8* 5], top_empty); + AV_WN32A(&nnz_cache[4+8*10], top_empty); } - } - if (sl->top_type && !IS_8x8DCT(sl->top_type)){ - uint32_t top_empty = !IS_INTRA(mb_type) ? 0 : 0x40404040; - AV_WN32A(&nnz_cache[4+8* 0], top_empty); - AV_WN32A(&nnz_cache[4+8* 5], top_empty); - AV_WN32A(&nnz_cache[4+8*10], top_empty); } } h->cur_pic.mb_type[mb_xy] = mb_type;