From patchwork Tue Nov 8 22:03:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 1351 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1934300vsb; Tue, 8 Nov 2016 14:19:15 -0800 (PST) X-Received: by 10.194.74.102 with SMTP id s6mr12297762wjv.9.1478643555498; Tue, 08 Nov 2016 14:19:15 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ge9si37860910wjd.123.2016.11.08.14.19.14; Tue, 08 Nov 2016 14:19:15 -0800 (PST) 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 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 56FFD689CCD; Wed, 9 Nov 2016 00:19:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60655689BF4 for ; Wed, 9 Nov 2016 00:19:02 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id m48so7932250qta.2 for ; Tue, 08 Nov 2016 14:19:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=zzgHHMqdRA60wb3DuofZUGtqVEuIMmb1WMuKDqiw4KU=; b=LlFWIHWeGLVtPuQjeh+PcRs6jfIFO9CmWvG7+KwH35vghgqpdIzs7aqiZrvPnpvo5M kCry1Fd68tlxlpzcfdMrKbgEMtcXqYkUftQv/Qoa4xgk+iIXh/ccMh1nofr87Z/pBxdH 45y0pXP3qCRseYdaJGWE8rlabZjijr3ntGUd8dCPtcu/sV8vvQKoGQDfxuMQFAB8LCiC aaySxGIAJE5r2g6hOXq0LyEGTZsr03O8d32BTIj8iARs1qNNwqQV6uksEOCJDRg5Elcg fuRkB+uLhWzsj8H7z486RQG/xuqrRLR2fY/jGYkc2uEpAzT41JfE6nScEtDlwEJjRTQA uk0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=zzgHHMqdRA60wb3DuofZUGtqVEuIMmb1WMuKDqiw4KU=; b=arU3K58BKYq+bD2Yq9M6hho5yUShV9681NlfiFtBA2qYl8Ph2wT2FHPuMY7fulMiO2 Z1eaOlQ7J/35DrHudHs/I94SQJ53M0/tt51YY17tIhERGd7PsEQY5ZqwA0Zhgztqtag2 xan7zRWebMswigPbgtLHTH84VHyhNeMRJ6xrk9EaVNlsGDsdo99NOkI0iJV9N8tW8cfd LXJO+oCwSLA5QsNnb43ttHTQnwR/KUmPzNyMc641cVjuNxvO0UsBu9r4V6j7Rr50bNQk QNgv55LQEFEc+Q2fgnUhT/nno7wAxkdxB0t0IWI7ZRaeDP5rn133e/Wza+pYmU0mnQhL hLvQ== X-Gm-Message-State: ABUngvf3gz627jcxM5aHBDpO+toMVcV13+HOGX5BHLbKmWzxjhdNufrYbxH7z3uQyBMcZA== X-Received: by 10.237.37.72 with SMTP id w8mr14845738qtc.80.1478642611759; Tue, 08 Nov 2016 14:03:31 -0800 (PST) Received: from vimacbookpro.vimeows.com (nyv-exweb.iac.com. [216.112.252.10]) by smtp.gmail.com with ESMTPSA id w12sm20517394qka.4.2016.11.08.14.03.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 08 Nov 2016 14:03:30 -0800 (PST) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2016 17:03:27 -0500 Message-Id: <20161108220328.7397-2-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161108220328.7397-1-vittorio.giovara@gmail.com> References: <20161107234405.GF4602@nb4> <20161108220328.7397-1-vittorio.giovara@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] hevc: Support extradata changes 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: Vittorio Giovara --- Applied review. Please CC. Vittorio libavcodec/hevc.c | 10 ++++++++++ libavformat/mov.c | 4 ---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 02fd606..4417f79 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -3049,6 +3049,8 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, AVPacket *avpkt) { int ret; + int new_extradata_size; + uint8_t *new_extradata; HEVCContext *s = avctx->priv_data; if (!avpkt->size) { @@ -3060,6 +3062,14 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, return 0; } + new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, + &new_extradata_size); + if (new_extradata && new_extradata_size > 0) { + ret = hevc_decode_extradata(s, new_extradata, new_extradata_size); + if (ret < 0) + return ret; + } + s->ref = NULL; ret = decode_nal_units(s, avpkt->data, avpkt->size); if (ret < 0) diff --git a/libavformat/mov.c b/libavformat/mov.c index 2fc09b1..a2a688b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2231,10 +2231,6 @@ static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb, avio_skip(pb, size); return 1; } - if ( codec_tag == AV_RL32("hvc1") || - codec_tag == AV_RL32("hev1") - ) - av_log(c->fc, AV_LOG_WARNING, "Concatenated H.264 or H.265 might not play correctly.\n"); return 0; }