From patchwork Mon May 1 22:40:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3535 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1600676vsd; Mon, 1 May 2017 15:40:49 -0700 (PDT) X-Received: by 10.223.168.120 with SMTP id l111mr16055969wrc.137.1493678449158; Mon, 01 May 2017 15:40:49 -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 b7si17289643wrd.314.2017.05.01.15.40.48; Mon, 01 May 2017 15:40:49 -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 1DF0968922E; Tue, 2 May 2017 01:40:43 +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 E15886891D5 for ; Tue, 2 May 2017 01:40:36 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id o85so18991329qkh.0 for ; Mon, 01 May 2017 15:40:40 -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=+KxBDWStdcvryzHdG63T2XQggCalSvpwVgFBAwB/15E=; b=My8OwPkGskG0y+Vu+QqjIQPR0nYBxB/tgW4QjTdIDmDjSvRNV+nr6Rx27hKh/tcBJi nx6apZKdmGTTDVhbhhE2Ec1i+b7/cZJdKy4gT+j/yQGtT3wtcSqoSU5YmdmENNOebC5Q KV4D0N1vjMMvCRToUtiH7T5XTuRIVipCTsP/m8zdrlDMJcoCEUCxD5zUq7bsEU5h9QsU f9f6J/1O5NWhDsZ/1q15FUDldYMV9uAI794t37r4v7f4XPFpnXUJWQ2hcCGnc8eXvqb5 8Mgm5sUNguHKjkT8qXwQ8cCbhDuQfZLv19fe/1N6EBKX8+s08OQQmCZkbP/wJcq2nui5 i3yg== 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=+KxBDWStdcvryzHdG63T2XQggCalSvpwVgFBAwB/15E=; b=E6Yu2GaUDeVod76s5fqcvj0ODFRjOZGuEnJQCLIGEoqP3mnC97vvhfsHguyeJr6Pcj nlzS1xWKKb4nyEsEjwdqMPvlArKdAeLR42ZXvla9yF8X/dVkhMIwIni4mIWqQl16Ejcu J3mOaGbzEt1ZJ5h9NfwjbBnPhEczl5FF41BVmOQS+q4JesXWO5gRQkvGOcm3IauVBAqC 8gYS1+xntHahhCPjto5HiBdq04aADwX3NkFlKwni/aF0KYUp8bTbNuOKMwMaG+3Yeprn Eo8w7+o/M/8WUwhTObYDZHLyj44TL5rF9cOCDQwU5bKPkTA2b94pmN5TzITfDPpqUmiJ s7sA== X-Gm-Message-State: AN3rC/65hzTSlzvQ054d5cNqeH8J2HDDgsm2TvF71w0eobi6qCnhlGnO yNwNQ8i6C5sw1xGa X-Received: by 10.55.53.65 with SMTP id c62mr16412187qka.105.1493678439014; Mon, 01 May 2017 15:40:39 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id l7sm12269540qtf.24.2017.05.01.15.40.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 May 2017 15:40:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 May 2017 19:40:22 -0300 Message-Id: <20170501224022.8872-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170430203410.7128-1-jamrial@gmail.com> References: <20170430203410.7128-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 8/9] hevc_parse: decode SEI message NALUs in extradata 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" They may be present in hvcc style extradata. Based on a patch by Hendrik Leppkes. Signed-off-by: James Almer --- libavcodec/hevc_parse.c | 21 ++++++++++++++------- libavcodec/hevc_parse.h | 4 ++-- libavcodec/hevcdec.c | 2 +- libavcodec/mediacodecdec.c | 4 +++- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/libavcodec/hevc_parse.c b/libavcodec/hevc_parse.c index ee4cd54d3e..1122a60af3 100644 --- a/libavcodec/hevc_parse.c +++ b/libavcodec/hevc_parse.c @@ -22,8 +22,8 @@ #include "hevc_parse.h" 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, - int apply_defdispwin, void *logctx) + HEVCSEIContext *sei, int is_nalff, int nal_length_size, + int err_recognition, int apply_defdispwin, void *logctx) { int i; int ret = 0; @@ -54,6 +54,12 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets if (ret < 0) goto done; break; + case HEVC_NAL_SEI_PREFIX: + case HEVC_NAL_SEI_SUFFIX: + ret = ff_hevc_decode_nal_sei(&nal->gb, logctx, sei, ps, nal->type); + if (ret < 0) + goto done; + break; default: av_log(logctx, AV_LOG_VERBOSE, "Ignoring NAL type %d in extradata\n", nal->type); break; @@ -69,8 +75,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, - int apply_defdispwin, void *logctx) + HEVCSEIContext *sei, int *is_nalff, int *nal_length_size, + int err_recognition, int apply_defdispwin, void *logctx) { int ret = 0; GetByteContext gb; @@ -108,8 +114,9 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, return AVERROR_INVALIDDATA; } - ret = hevc_decode_nal_units(gb.buffer, nalsize, ps, *is_nalff, *nal_length_size, - err_recognition, apply_defdispwin, logctx); + ret = hevc_decode_nal_units(gb.buffer, nalsize, ps, sei, *is_nalff, + *nal_length_size, err_recognition, apply_defdispwin, + logctx); if (ret < 0) { av_log(logctx, AV_LOG_ERROR, "Decoding nal unit %d %d from hvcC failed\n", @@ -125,7 +132,7 @@ int ff_hevc_decode_extradata(const uint8_t *data, int size, HEVCParamSets *ps, *nal_length_size = nal_len_size; } else { *is_nalff = 0; - ret = hevc_decode_nal_units(data, size, ps, *is_nalff, *nal_length_size, + ret = hevc_decode_nal_units(data, size, ps, sei, *is_nalff, *nal_length_size, err_recognition, apply_defdispwin, logctx); if (ret < 0) return ret; diff --git a/libavcodec/hevc_parse.h b/libavcodec/hevc_parse.h index 8aa46a290a..43c358f160 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, - int apply_defdispwin, void *logctx); + HEVCSEIContext *sei, int *is_nalff, int *nal_length_size, + int err_recognition, int apply_defdispwin, void *logctx); #endif /* AVCODEC_HEVC_PARSE_H */ diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 8f235b0be1..ee001fd9f2 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3005,7 +3005,7 @@ static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int length) { int ret, i; - ret = ff_hevc_decode_extradata(buf, length, &s->ps, &s->is_nalff, + ret = ff_hevc_decode_extradata(buf, length, &s->ps, &s->sei, &s->is_nalff, &s->nal_length_size, s->avctx->err_recognition, s->apply_defdispwin, s->avctx); if (ret < 0) diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 6fd0db2fa5..ccfcb4b9ce 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -185,6 +185,7 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) int ret; HEVCParamSets ps; + HEVCSEIContext sei; const HEVCVPS *vps = NULL; const HEVCPPS *pps = NULL; @@ -200,9 +201,10 @@ static int hevc_set_extradata(AVCodecContext *avctx, FFAMediaFormat *format) int pps_data_size = 0; memset(&ps, 0, sizeof(ps)); + memset(&sei, 0, sizeof(sei)); ret = ff_hevc_decode_extradata(avctx->extradata, avctx->extradata_size, - &ps, &is_nalff, &nal_length_size, 0, 1, avctx); + &ps, &sei, &is_nalff, &nal_length_size, 0, 1, avctx); if (ret < 0) { goto done; }