From patchwork Mon Apr 3 01:45:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3258 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp2984611vss; Sun, 2 Apr 2017 18:46:29 -0700 (PDT) X-Received: by 10.28.226.4 with SMTP id z4mr7161459wmg.135.1491183989927; Sun, 02 Apr 2017 18:46:29 -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 d7si17846461wra.184.2017.04.02.18.46.29; Sun, 02 Apr 2017 18:46:29 -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 AD18D6882F1; Mon, 3 Apr 2017 04:46:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46286680604 for ; Mon, 3 Apr 2017 04:46:09 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id k139so6095566qke.2 for ; Sun, 02 Apr 2017 18:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=vAN+ihvayOeoa8RrPgSwRIQFbSH1ZjPlHgWknHiU/Hc=; b=jrfUhlyBu2QW4aaOrFOVU3t73xef0ZYFyoEgH5Mp5h0ib1Deymgsm+HrFtElErl/LF ms1/EpEOHAGO2c4rnlGu1vadK6TKPCbG2TyDf8lyU1X0pCHIjQwPV8jltkUXYCgZTbhP E6rF55YPIDF6LN5qvaHOj/q7l5euL6pDYSjKm6JxmskALvsbEFGpk2IUrj7rL3pgmvJE WhVtIRpY2je0OrmOKF5cxwAoPcydT7SQpAD1DT/OfOWuHZzaygpaup7EtHT+QW/PQCW1 JccO+f0QzWRETfWUZMzwTBKi/bGUCwNaCKxlz4ZBcwtrTsYmm/4Whvtl7oX/y1qFe2m5 AvMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=vAN+ihvayOeoa8RrPgSwRIQFbSH1ZjPlHgWknHiU/Hc=; b=c+6zF8NmeX5UlXVScBUHn2iSbpENjmh3pHp5A0sYlIm2iyNxCKSgEwXWGB1q4NsRg5 dn7NHoRW+cXTWoDF3FR8ew3/6xK0JViOJ+g4KChWVxzfaKruIc4dZT9/cJW8HdQHOOoN iy83wrF6iquFzWes57i0gY+Yu3nXRV7xB7m9mPo+m/iZgiFz4aqG+3CmKE3U4Qe2fIBk X1nwq337C2VSyAKFi+/fdSe9FxC2SEsEROVH7FyjL+xFanjLBD3KR8deg8AfDr8y8RWo Mdorm6Vzk69Iym7AlDMJpOJo1SgntxpsWekeN+aUjrBYDgy/99yuRNkeNU3X/sP27b8k 9TYw== X-Gm-Message-State: AFeK/H01oS8QSUSZC9uPJS4Gf7+C2kVaFZTObsvioUNrUzjdMZaEPmAO+07/qrALdlSohg== X-Received: by 10.55.46.198 with SMTP id u189mr13000593qkh.88.1491183969587; Sun, 02 Apr 2017 18:46:09 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id n19sm8645200qtn.35.2017.04.02.18.46.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Apr 2017 18:46:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2017 22:45:42 -0300 Message-Id: <20170403014545.3704-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170403014545.3704-1-jamrial@gmail.com> References: <20170403014545.3704-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/hevc_parse: allow setting apply_defdispwin when decoding SPS NAL units 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" Signed-off-by: James Almer --- libavcodec/hevc_parse.c | 12 ++++++------ libavcodec/hevc_parse.h | 4 ++-- libavcodec/mediacodecdec.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index 028ca5afe5..3b817c4f4d 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -23,7 +23,7 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets *ps, int is_nalff, int nal_length_size, int err_recognition, - void *logctx) + int apply_defdispwin, void *logctx) { int i; int ret = 0; @@ -45,7 +45,7 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets goto done; break; case HEVC_NAL_SPS: - ret = ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, 1); + ret = ff_hevc_decode_nal_sps(&nal->gb, logctx, ps, apply_defdispwin); if (ret < 0) goto done; break; @@ -86,8 +86,8 @@ done: } int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, - int *is_nalff, int *nal_length_size, - int err_recognition, void *logctx) + int *is_nalff, int *nal_length_size, int err_recognition, + int apply_defdispwin, void *logctx) { int ret = 0; GetByteContext gb; @@ -126,7 +126,7 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, } ret = hevc_decode_nal_units(gb.buffer, nalsize, ps, *is_nalff, *nal_length_size, - err_recognition, logctx); + err_recognition, apply_defdispwin, logctx); if (ret < 0) { av_log(logctx, AV_LOG_ERROR, "Decoding nal unit %d %d from hvcC failed\n", @@ -143,7 +143,7 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, } else { *is_nalff = 0; ret = hevc_decode_nal_units(data, size, ps, *is_nalff, *nal_length_size, - err_recognition, logctx); + err_recognition, apply_defdispwin, logctx); if (ret < 0) return ret; } diff --git a/libavcodec/hevc_parse.h b/libavcodec/hevc_parse.h index 39bd23e6ea..8aa46a290a 100644 --- a/libavcodec/hevc_parse.h +++ b/libavcodec/hevc_parse.h @@ -27,7 +27,7 @@ #include "hevcdec.h" int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, - int *is_nalff, int *nal_length_size, - int err_recognition, void *logctx); + int *is_nalff, int *nal_length_size, int err_recognition, + int apply_defdispwin, void *logctx); #endif /* AVCODEC_HEVC_PARSE_H */ diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 79a51ec684..7f7c07720b 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -202,7 +202,7 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) memset(&ps, 0, sizeof(ps)); ret = ff_hevc_decode_extradata(avctx->extradata, avctx->extradata_size, - &ps, &is_nalff, &nal_length_size, 0, avctx); + &ps, &is_nalff, &nal_length_size, 0, 1, avctx); if (ret < 0) { goto done; }