From patchwork Tue May 2 21:55:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3557 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp2089739vsd; Tue, 2 May 2017 14:58:03 -0700 (PDT) X-Received: by 10.28.125.195 with SMTP id y186mr3832246wmc.32.1493762283898; Tue, 02 May 2017 14:58:03 -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 57si18532993wrt.302.2017.05.02.14.58.03; Tue, 02 May 2017 14:58:03 -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 36228689931; Wed, 3 May 2017 00:56:43 +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 B08056898DC for ; Wed, 3 May 2017 00:56:36 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id o36so22261919qtb.2 for ; Tue, 02 May 2017 14:56: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=NVCvjfWScdRZDyJivZHJrgMz+EtrO6k/TUMNpAGQo1I=; b=NHO4CNWbN3Jxwyn5UIwgQMDba+SVhpY+Up9SAm9Y6pcMWRzLgKzIEauakd0WNJ9Qu1 FT57chQ2fwxCAFWplZ97rSP1mGXpW645w20/ECLx+qFuRtKwLah3q042xIPgSJ0sMIqc QKfjTA3/dJ2nLQEGVQRkUAEXEIuddMRVhsVIhLEO2S8wXSW/j90iTeb8rzus/VBUhHAF cgpCPL1tsR+j0qRRJbgcdz4VWr5ADn2IORstl5oZLo1OGzk4XJAM6tv3Dl7C8evMKTIM mwEdXT3twpgCRoe0hlm95zBNvvBywKlcHeQqyYaq3aYqSTnVoVJ6MTNLEL/2GmAAaIh5 1A1Q== 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=NVCvjfWScdRZDyJivZHJrgMz+EtrO6k/TUMNpAGQo1I=; b=AnzS5+jHbWR5fYRxw3JPRyMPcPJW4cZv699uPEaMhbfbSUOgnji+pI/ncx8Z9RF3aM m04WLIt18VEn1vHZ1sVQIPB4O3z6DHpvRtLToi8DT0e23CFSdYX+v45WqovZ9Qy4jHSS A8hSwOEbRKnmVmcqYKcFZh3fbYeaCnT9epIy5/cgqTqGRx7wBvL4Aa9mqLfa65pt4Ahm oht+H8KoGzk/xCwqGZGBSAQyN/pqPBqUQ1uMNfikboQfhtk6WvY45zMLjRPh2UKkFF1P KkZyqDP7448qKnedxauILoLafH2L0pQDkjvcIAfsXa1i3UJPG6XJ84eKk7Mda+ngY1HO Zn7A== X-Gm-Message-State: AN3rC/4OwlFJA7SjlnKdmaxK6r8fXvKWdw3PIh7e9Cy9h/BYc+jJcXyv Glh0o7B94JnXd6c6 X-Received: by 10.237.60.150 with SMTP id d22mr2795145qtf.126.1493762199675; Tue, 02 May 2017 14:56:39 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id t45sm14992046qtt.9.2017.05.02.14.56.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 May 2017 14:56:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2017 18:55:29 -0300 Message-Id: <20170502215530.8672-9-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170502215530.8672-1-jamrial@gmail.com> References: <20170502215530.8672-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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 available in hvcc style extradata. Based on a patch by Hendrik Leppkes. Signed-off-by: James Almer --- libavcodec/Makefile | 6 +++--- libavcodec/hevc_parse.c | 21 ++++++++++++++------- libavcodec/hevc_parse.h | 7 ++++--- libavcodec/hevcdec.c | 2 +- libavcodec/mediacodecdec.c | 4 +++- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f879a17635..5ebba99ffb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -80,7 +80,7 @@ OBJS-$(CONFIG_H264DSP) += h264dsp.o h264idct.o OBJS-$(CONFIG_H264PARSE) += h264_parse.o h2645_parse.o h264_ps.o OBJS-$(CONFIG_H264PRED) += h264pred.o OBJS-$(CONFIG_H264QPEL) += h264qpel.o -OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o h2645_parse.o hevc_ps.o +OBJS-$(CONFIG_HEVCPARSE) += hevc_parse.o h2645_parse.o hevc_ps.o hevc_sei.o OBJS-$(CONFIG_HPELDSP) += hpeldsp.o OBJS-$(CONFIG_HUFFMAN) += huffman.o OBJS-$(CONFIG_HUFFYUVDSP) += huffyuvdsp.o @@ -338,7 +338,7 @@ OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o vaapi_encode_h26x. OBJS-$(CONFIG_H264_VIDEOTOOLBOX_ENCODER) += videotoolboxenc.o OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o -OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o hevc_sei.o \ +OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ hevcdsp.o hevc_filter.o hevc_data.o OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o @@ -953,7 +953,7 @@ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o -OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o hevc_sei.o +OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ 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..c4ab32d8c7 100644 --- a/libavcodec/hevc_parse.h +++ b/libavcodec/hevc_parse.h @@ -24,10 +24,11 @@ #ifndef AVCODEC_HEVC_PARSE_H #define AVCODEC_HEVC_PARSE_H -#include "hevcdec.h" +#include "hevc_ps.h" +#include "hevc_sei.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; }