From patchwork Wed Jan 8 13:10:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Gonen X-Patchwork-Id: 17251 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 6E49A44B530 for ; Wed, 8 Jan 2020 15:18:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4378B68AD3C; Wed, 8 Jan 2020 15:18:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03EC068AD1B for ; Wed, 8 Jan 2020 15:18:19 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id p17so2485391wmb.0 for ; Wed, 08 Jan 2020 05:18:19 -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=PMaqt8RPZb6MYT3DZV35zeRH5LzQhL0lJuS56xz/odw=; b=Zn6B+5YAiTbCsuJmbCxW0Emkh0JJODSWKUyTReHh4UNERsc3Uv4CT4MVHu7ElPgazG tVjDx76Z2PtobhByzJjsU28HBRyVF1iHxhY5LJvKMmgW46ekyzuKgVgJvLOCWzOykchm wugyLVyOsuXPfbRLFryf63DDRw0Sww8TstTG6A7cX/t6CYaD/QSRkMkXQ11DaFIq81mg hrfznq3RG4xCoQfIrxaFQi/U0kdKm+JkgT9vPVuCPgf3RwGrrhh5wX1QFwvSD5pZyuOY u7rb7fBh4xgwkVlTHQnfDVD3Xfrf1UsQ55F+2vq7831lGmjPABzue7juhQAuuKFk4v0O /Tlg== 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=PMaqt8RPZb6MYT3DZV35zeRH5LzQhL0lJuS56xz/odw=; b=Exxlxa4MwKYfHvpzYbiSd+r+xtbeP8CawMv71RzX/C+ox4YwHiKfdWFJn5tTg4lnLt jAtxzQ3ZRZPxGTL94NkhrqbSdlwxbchoiCujiDqrb08q1flWRwobRHcTu/fgn3RW4Bjp o7nNe3FcATiQ7Cc1Ere+G3mKs2Qu3AS3zlRV1tLigB+Sa5ILTHTPunCw913WlLjNnoc5 SkYvaZHa+bSuhLs9oD97dzlXFnRU01WedEXkRjTPGMNpH6xIJ1YgOx3VDebYtmGfXnJh 2zQyt1QFIMlH5ZqEI77c7jZsAPwLQS03a7CX28aAt/cfAeH9alMhmX4GGKO3GsmueEqq tEHg== X-Gm-Message-State: APjAAAVP7/QWwdTjd7kWEctyNwvVDzhqn5qb79QrniKxuDINO3enELlK RNZQbdRdzS3M0vZOWXkU7R5rDTYHKXM= X-Google-Smtp-Source: APXvYqyBi0WNfTWKZJI7OrFhCS8EGf24SyvijxcRIUZFieq1LQkhGIzLydyl4wk+jRfQiYRlPLgGxA== X-Received: by 2002:a1c:1bc3:: with SMTP id b186mr3808343wmb.79.1578489044516; Wed, 08 Jan 2020 05:10:44 -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 c2sm4215189wrp.46.2020.01.08.05.10.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 05:10:43 -0800 (PST) From: Eran Gonen To: FFmpeg development discussions and patches Date: Wed, 8 Jan 2020 15:10:19 +0200 Message-Id: <20200108131019.23930-1-eran.gonen@cloudinary.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Add advance vps/sps/pps id 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 | 117 +++++++++++++++++++++++++++++++-- 1 file changed, 111 insertions(+), 6 deletions(-) diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index b3a1fda144..796046ac7f 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 advance_vps_id; + int advance_sps_id; + int advance_pps_id; } H265MetadataContext; @@ -168,6 +172,10 @@ static int h265_metadata_update_vps(AVBSFContext *bsf, { H265MetadataContext *ctx = bsf->priv_data; + if(ctx->advance_vps_id > -1) { + vps->vps_video_parameter_set_id = (vps->vps_video_parameter_set_id + ctx->advance_vps_id) % HEVC_MAX_VPS_COUNT; + } + 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->advance_vps_id > -1) { + sps->sps_video_parameter_set_id = (sps->sps_video_parameter_set_id + ctx->advance_vps_id) % HEVC_MAX_VPS_COUNT; + } + if(ctx->advance_sps_id > -1) { + sps->sps_seq_parameter_set_id = (sps->sps_seq_parameter_set_id + ctx->advance_sps_id) % HEVC_MAX_SPS_COUNT; + } + 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->advance_sps_id > -1) { + pps->pps_seq_parameter_set_id = (pps->pps_seq_parameter_set_id + ctx->advance_sps_id) % HEVC_MAX_SPS_COUNT; + } + if(ctx->advance_pps_id > -1) { + pps->pps_pic_parameter_set_id = (pps->pps_pic_parameter_set_id + ctx->advance_pps_id) % HEVC_MAX_PPS_COUNT; + } + + return 0; +} + +static int h265_metadata_update_slice_header(AVBSFContext *bsf, + H265RawSliceHeader *slice) +{ + H265MetadataContext *ctx = bsf->priv_data; + + if(ctx->advance_pps_id > -1) { + slice->slice_pic_parameter_set_id = (slice->slice_pic_parameter_set_id + ctx->advance_pps_id) % HEVC_MAX_PPS_COUNT; + } + return 0; +} + static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { H265MetadataContext *ctx = bsf->priv_data; @@ -406,15 +447,42 @@ 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) { + switch (au->units[i].type) { + case 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) { + 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_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 +523,42 @@ 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) { + switch (au->units[i].type) { + case 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) { + 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_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 +642,16 @@ static const AVOption h265_metadata_options[] = { OFFSET(crop_bottom), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS }, + { "advance_vps_id", "Advance the vps id", + OFFSET(advance_vps_id), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, HEVC_MAX_VPS_COUNT, FLAGS }, + { "advance_sps_id", "Advance the sps id", + OFFSET(advance_sps_id), AV_OPT_TYPE_INT, + { .i64 = -1 }, -1, HEVC_MAX_SPS_COUNT, FLAGS }, + { "advance_pps_id", "Advance the pps id", + OFFSET(advance_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" },