From patchwork Mon Oct 29 10:26:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10837 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F10BA44DA10 for ; Mon, 29 Oct 2018 12:26:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63FD168A47D; Mon, 29 Oct 2018 12:26:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 760F768A47D for ; Mon, 29 Oct 2018 12:26:06 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id o14-v6so3663267pgv.7 for ; Mon, 29 Oct 2018 03:26: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=ToIfGLpWkPnYUeeacil5dpus9mwQG7iw2lpDRlswHEE=; b=r0OtStMhHEptMEqNF0C1WkrGb/FyDVvFXIJjDsTiehtmURKjbuDCjRaVFKfOCxvX3n YICZQ3rCoIXMw9E4UgCC7xJfEAcWxW8WBOGX8B0xXVIXARfXOgSVVafxbKRXltX7f2f6 0HdkXl3cirigfhO3Vw2p6MhRsBZ2OUDQN4A10lalNMGft+iMAvBPaxK15AZqn7EoFve4 18eCtbJQxfEnueUADRXIX+Xrz9LBeKQTK9LwF9sb/xYpAUwPzmax2vP8cNAJlY7D9Dv9 01rJmWvhJoz3O5UR6tkOdL0P12gFmJXk/X4eb5omaGqphwuyduLt9XEqk+L+BtI1Zupt daBw== 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=ToIfGLpWkPnYUeeacil5dpus9mwQG7iw2lpDRlswHEE=; b=rIgNDcMeFJoptwvDNUQltg8gPKvdJ3p4yra9g4dy4KncgJdryCU4wXSrB1SJhopey+ vxt7XRCBLJ6qE9QeeYWkIS+uALRLIlbgvREqG7/oRbzQOybLF2PzQl+nOGZsJOwwV+sV l7IdVbkvope4boDcNdEKLWNWJL8bJFBZsk+1Vl0Iy57CHWwo330UXnwkycI+PDj/udS8 7mCFgBCUAWuLm/YKFO272mFh3B6iOmm/02Htz+ec5NSydX2xeyGG7LJ9jqDAPzVcUL2R PM1awEHlJlVItE6OnTsEqaR4Sp9+C29Hcwd5n5+UO3bRJCq3sQTQwoQG91SkCZBrT6mL dBlA== X-Gm-Message-State: AGRZ1gIWC9ztfnMXyiFVOPbjT9yJ54yG5Q58pRZE5/wX6KBSWZ9hg52M Ls3MTqYEZLRO/oU99k4YuiX5IVEN X-Google-Smtp-Source: AJdET5fQXSsYUSPtyTZi14E6oL50iH5aYRbRYyZaBuEddh3vSLG9uBsLQw62u5aTNQFN0r9EAnz+xg== X-Received: by 2002:a63:e645:: with SMTP id p5-v6mr12654987pgj.218.1540808795186; Mon, 29 Oct 2018 03:26:35 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id a15-v6sm13043301pfa.124.2018.10.29.03.26.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 03:26:34 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Oct 2018 18:26:25 +0800 Message-Id: <1540808785-13289-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] lavc/mjpegdec: fix VA-API MJPEG decoding uninitialized huffman table 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: Jun Zhao , dlin2 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Now VA-API HWAccel MJPEG decoding uninitialized huffman table, it's will lead to the decoding error like"Failed to sync surface 0x5: 23 (internal decoding error)." in iHD open source driver. Signed-off-by: dlin2 Signed-off-by: Jun Zhao --- libavcodec/mjpegdec.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b0cb3ff..89effb6 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -75,6 +75,25 @@ static int build_vlc(VLC *vlc, const uint8_t *bits_table, static int build_basic_mjpeg_vlc(MJpegDecodeContext *s) { int ret; + int i; + + /* initialize default huffman tables */ + for (i = 0; i < 16; i++) + s->raw_huffman_lengths[0][0][i] = avpriv_mjpeg_bits_dc_luminance[i + 1]; + for (i = 0; i < 12; i++) + s->raw_huffman_values[0][0][i] = avpriv_mjpeg_val_dc[i]; + for (i = 0; i < 16; i++) + s->raw_huffman_lengths[0][1][i] = avpriv_mjpeg_bits_dc_chrominance[i + 1]; + for (i = 0; i < 12; i++) + s->raw_huffman_values[0][1][i] = avpriv_mjpeg_val_dc[i]; + for (i = 0; i < 16; i++) + s->raw_huffman_lengths[1][0][i] = avpriv_mjpeg_bits_ac_luminance[i + 1]; + for (i = 0; i < 162; i++) + s->raw_huffman_values[1][0][i] = avpriv_mjpeg_val_ac_luminance[i]; + for (i = 0; i < 16; i++) + s->raw_huffman_lengths[1][1][i] = avpriv_mjpeg_bits_ac_chrominance[i + 1]; + for (i = 0; i < 162; i++) + s->raw_huffman_values[1][1][i] = avpriv_mjpeg_val_ac_chrominance[i]; if ((ret = build_vlc(&s->vlcs[0][0], avpriv_mjpeg_bits_dc_luminance, avpriv_mjpeg_val_dc, 12, 0, 0)) < 0)