From patchwork Tue Jan 7 08:51:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Gonen X-Patchwork-Id: 17230 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 BDA324490F7 for ; Tue, 7 Jan 2020 10:58:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9708268A2C6; Tue, 7 Jan 2020 10:58:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 82E87688254 for ; Tue, 7 Jan 2020 10:58:52 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id q10so14017770wrm.11 for ; Tue, 07 Jan 2020 00:58:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudinary.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2Oe/5twUPhNu6B9IUya66aK2RnkYKhKbiZWSf54OTtk=; b=W5AMEZa0S9Empb62swlHHT9YwX/9h8UhmLvA++ENryUnNXZPnAoU6cVw2wJn/olLB7 AWplhLCBGXY1fW7HrtBLS0LzFn44haHKSqMqbNrruLjj1Pn5tfaYUAGFs7O34z3HD1H+ En4g5Q1FhvSF8vVx+BUcKDVsFHDUhfRXNT+hheWWvkuo9MPSuAAuOKmzy2p248LibNeG Ms1FDWz1I75tpiSl1SJUrJ2OZ1KHBnWJzVKcn2FBwcvzuGfSUpizsthy3jcPM/1a3JnI E5oGSepB916dnMBnMN5FaRGfGTnJbBoQ+TRN7cakvJU5kM56tjt+LiecePWP0knGJv5h jeaQ== 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:mime-version :content-transfer-encoding; bh=2Oe/5twUPhNu6B9IUya66aK2RnkYKhKbiZWSf54OTtk=; b=X+kB4Z4XXNgBs8PnzUY6icEJKrIkhBycIA6YHwxg1oSR3fKJC3Cs+DhIaHzmLl3JQ4 pPLZ9yT+3KLbwCg9TLuTfHJTdei6axyqMA1lqsU/OyDm/KngIWo7FvMCuzBblQvQdrCo htiwRmFQWo4s8kWm+yB3yMZdcXgtOVMh3f6EQVVbbxmi+ygNGuTqjUyIYHw+Adt8NgGk VoEokEMULIXev9yA8d3y7HOGu6cFk9RI9IhrddL8XxKQv8tqT2MGIaOgt5pCphh1enO7 25Mo2YX25QR2HADEyvoKIrUYVN1xGuWBJ9vUPbo0asN2a2oEdY2NlzjvDkE3uzwdy0sM hmJw== X-Gm-Message-State: APjAAAVxdIFLhrh9FSWYoqGNLN+CCjWu+waZSs/cXryqs8IJWhTwTSUV 7rx6+XzskyC9EiZ5k2UP6uPLNMKM+O4= X-Google-Smtp-Source: APXvYqzctUDi1g20RoqJtpVxXXDyDNr5DqWNMwagbd/OriuTXWAbpwltsh0261F6Bu4uNfX6GzBEfA== X-Received: by 2002:adf:ff8a:: with SMTP id j10mr41389349wrr.312.1578387127442; Tue, 07 Jan 2020 00:52:07 -0800 (PST) Received: from localhost.localdomain (bzq-82-81-224-162.cablep.bezeqint.net. [82.81.224.162]) by smtp.gmail.com with ESMTPSA id v62sm26077806wmg.3.2020.01.07.00.52.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jan 2020 00:52:06 -0800 (PST) From: Eran Gonen To: FFmpeg development discussions and patches Date: Tue, 7 Jan 2020 10:51:55 +0200 Message-Id: <20200107085155.6846-1-eran.gonen@cloudinary.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Add vps/sps/pps id set to hevc_metadata bsf 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: Eran Gonen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/h265_metadata_bsf.c | 147 +++++++++++++++++++++++++++++---- 1 file changed, 129 insertions(+), 18 deletions(-) diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index b3a1fda144..66ea369e0b 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -68,6 +68,10 @@ typedef struct H265MetadataContext { int level; int level_guess; int level_warned; + + int vps_id; + int sps_id; + int pps_id; } H265MetadataContext; @@ -168,6 +172,10 @@ static int h265_metadata_update_vps(AVBSFContext *bsf, { H265MetadataContext *ctx = bsf->priv_data; + if(ctx->vps_id > -1) { + vps->vps_video_parameter_set_id = ctx->vps_id; + } + if (ctx->tick_rate.num && ctx->tick_rate.den) { int num, den; @@ -200,6 +208,13 @@ static int h265_metadata_update_sps(AVBSFContext *bsf, int need_vui = 0; int crop_unit_x, crop_unit_y; + if(ctx->vps_id > -1) { + sps->sps_video_parameter_set_id = ctx->vps_id; + } + if(ctx->sps_id > -1) { + sps->sps_seq_parameter_set_id = ctx->sps_id; + } + if (ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) { // Table E-1. static const AVRational sar_idc[] = { @@ -336,6 +351,32 @@ static int h265_metadata_update_sps(AVBSFContext *bsf, return 0; } +static int h265_metadata_update_pps(AVBSFContext *bsf, + H265RawPPS *pps) +{ + H265MetadataContext *ctx = bsf->priv_data; + + if(ctx->sps_id > -1) { + pps->pps_seq_parameter_set_id = ctx->sps_id; + } + if(ctx->pps_id > -1) { + pps->pps_pic_parameter_set_id = ctx->pps_id; + } + + return 0; +} + +static int h265_metadata_update_slice_header(AVBSFContext *bsf, + H265RawSliceHeader *slice) +{ + H265MetadataContext *ctx = bsf->priv_data; + + if(ctx->pps_id > -1) { + slice->slice_pic_parameter_set_id = ctx->pps_id; + } + return 0; +} + static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { H265MetadataContext *ctx = bsf->priv_data; @@ -406,15 +447,45 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) h265_metadata_guess_level(bsf, au); for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type == HEVC_NAL_VPS) { - err = h265_metadata_update_vps(bsf, au->units[i].content); - if (err < 0) - goto fail; - } - if (au->units[i].type == HEVC_NAL_SPS) { - err = h265_metadata_update_sps(bsf, au->units[i].content); - if (err < 0) - goto fail; + switch (au->units[i].type) { + case HEVC_NAL_VPS: + err = h265_metadata_update_vps(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; + case HEVC_NAL_SPS: + err = h265_metadata_update_sps(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; + case HEVC_NAL_PPS: + err = h265_metadata_update_pps(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; + case HEVC_NAL_SEI_PREFIX: + case HEVC_NAL_SEI_SUFFIX: + break; + case HEVC_NAL_TRAIL_N: + case HEVC_NAL_TRAIL_R: + case HEVC_NAL_TSA_N: + case HEVC_NAL_TSA_R: + case HEVC_NAL_STSA_N: + case HEVC_NAL_STSA_R: + case HEVC_NAL_BLA_W_LP: + case HEVC_NAL_BLA_W_RADL: + case HEVC_NAL_BLA_N_LP: + case HEVC_NAL_IDR_W_RADL: + case HEVC_NAL_IDR_N_LP: + case HEVC_NAL_CRA_NUT: + case HEVC_NAL_RADL_N: + case HEVC_NAL_RADL_R: + case HEVC_NAL_RASL_N: + case HEVC_NAL_RASL_R: + err = h265_metadata_update_slice_header(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; } } @@ -455,15 +526,45 @@ static int h265_metadata_init(AVBSFContext *bsf) h265_metadata_guess_level(bsf, au); for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type == HEVC_NAL_VPS) { - err = h265_metadata_update_vps(bsf, au->units[i].content); - if (err < 0) - goto fail; - } - if (au->units[i].type == HEVC_NAL_SPS) { - err = h265_metadata_update_sps(bsf, au->units[i].content); - if (err < 0) - goto fail; + switch (au->units[i].type) { + case HEVC_NAL_VPS: + err = h265_metadata_update_vps(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; + case HEVC_NAL_SPS: + err = h265_metadata_update_sps(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; + case HEVC_NAL_PPS: + err = h265_metadata_update_pps(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; + case HEVC_NAL_SEI_PREFIX: + case HEVC_NAL_SEI_SUFFIX: + break; + case HEVC_NAL_TRAIL_N: + case HEVC_NAL_TRAIL_R: + case HEVC_NAL_TSA_N: + case HEVC_NAL_TSA_R: + case HEVC_NAL_STSA_N: + case HEVC_NAL_STSA_R: + case HEVC_NAL_BLA_W_LP: + case HEVC_NAL_BLA_W_RADL: + case HEVC_NAL_BLA_N_LP: + case HEVC_NAL_IDR_W_RADL: + case HEVC_NAL_IDR_N_LP: + case HEVC_NAL_CRA_NUT: + case HEVC_NAL_RADL_N: + case HEVC_NAL_RADL_R: + case HEVC_NAL_RASL_N: + case HEVC_NAL_RASL_R: + err = h265_metadata_update_slice_header(bsf, au->units[i].content); + if (err < 0) + goto fail; + break; } } @@ -547,6 +648,16 @@ static const AVOption h265_metadata_options[] = { OFFSET(crop_bottom), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS }, + { "vps_id", "Set vps id", + OFFSET(vps_id), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, HEVC_MAX_VPS_COUNT, FLAGS }, + { "sps_id", "Set sps id", + OFFSET(sps_id), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, HEVC_MAX_SPS_COUNT, FLAGS }, + { "pps_id", "Set pps id", + OFFSET(pps_id), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, HEVC_MAX_PPS_COUNT, FLAGS }, + { "level", "Set level (tables A.6 and A.7)", OFFSET(level), AV_OPT_TYPE_INT, { .i64 = LEVEL_UNSET }, LEVEL_UNSET, 0xff, FLAGS, "level" },