From patchwork Wed Jan 8 15:20:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Gonen X-Patchwork-Id: 17254 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 80E6544BB10 for ; Wed, 8 Jan 2020 17:20:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5EDDE68ACBC; Wed, 8 Jan 2020 17:20:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A056B688391 for ; Wed, 8 Jan 2020 17:20:17 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id z7so3723765wrl.13 for ; Wed, 08 Jan 2020 07:20:17 -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=LfG6UI+0Zx5fmimly1jGi3gXme/Pwi7IRZH0qKofy04=; b=enTi8MCJgM8buu395eJa1hBX0YYz2DFp/SGdc+AsSdjxf8ZJsEiHJ1HoBil6b9McGI 4zY0UqCWoZxtGpGEszRB/GXvX5S7FveI3Oas6ZrX4G/YULPYxP5onM22OHxRxFd3Nuo9 rF/mRTHMo1JKZGMT1VqzBH06DNmKcRvwL+W1rr2kt/QgHtqiCM7tXd3x40hWVx5NLMlW S4U3c8xKVbZfLwTXYdW+MQLpu84tGzG+NCOSQq6aZxeY4ypy3LVXMd/4ft2A6Ip+y5bw u/TiTQS3WqgxdF0tR9aLQ3PKsskapscRRrwhiM6Uh0Cg7fs37YIjYSGFYK/eDHio3XaV CRAQ== 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=LfG6UI+0Zx5fmimly1jGi3gXme/Pwi7IRZH0qKofy04=; b=eDGQA6CoGbEoIbCEUDqtgEEuQgMiXiGGwDIO2G6OpYs8wJtdUYD+JEnVEFI0lUrM3H Bhse2biMZ0v7wMKkkFdvX/rrlLpKoKDht5OmvG+tg8Ip//zX1QCmI9OM/tsNCjOOLiZG JFQ5fz1OTR+442v23OiHUnLBq0D8OE/fkskj+bJVC0WOtiU7BynBf1LTgLtBm9U0hSpp G1P3xZd/87Ss1uoVZ4+01qonCdvIM+jbY7xH5R7yJ9//ySqVMgoPMRU2UipH9UQIlki1 oKuXj8gOjsSaoQqFi5F/jiFiWmuwS/ZfRuLhLmRrWAe0GBTTBGnaMLXl6Meb8PKZmJPy Tnnw== X-Gm-Message-State: APjAAAW284se5HgBt43pbnmcaUnva3mg9+pftQQQYoe2wUAPmBp8qLa/ HZVAPEp+SbAuHCu7ak6ajIsGKATl0AA= X-Google-Smtp-Source: APXvYqzVhMIKbfGYpp3KDW9TAGhJNxTlidChnq9wmUCnAwSaL4Ndu6AX/KOMGEvzL30ZASWPYXy1xQ== X-Received: by 2002:adf:f7c4:: with SMTP id a4mr5007825wrq.332.1578496816843; Wed, 08 Jan 2020 07:20:16 -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 i11sm4678871wrs.10.2020.01.08.07.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jan 2020 07:20:16 -0800 (PST) From: Eran Gonen To: FFmpeg development discussions and patches Date: Wed, 8 Jan 2020 17:20:07 +0200 Message-Id: <20200108152007.25827-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 offset 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" --- doc/bitstream_filters.texi | 5 ++ libavcodec/h265_metadata_bsf.c | 106 +++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 6 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8fe5b3ad75..abd20e19d5 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -357,6 +357,11 @@ Set poc_proportional_to_timing_flag in VPS and VUI and use this value to set num_ticks_poc_diff_one_minus1 (see H.265 sections 7.4.3.1 and E.3.1). Ignored if @option{tick_rate} is not also set. +@item vps_id_offset +@item sps_id_offset +@item pps_id_offset +Replace the original VPS/SPS/PPS idenfier by increasing its value by the offset. + @item crop_left @item crop_right @item crop_top diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index b3a1fda144..7aeb1bffd1 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_offset; + int sps_id_offset; + int pps_id_offset; } H265MetadataContext; @@ -168,6 +172,8 @@ static int h265_metadata_update_vps(AVBSFContext *bsf, { H265MetadataContext *ctx = bsf->priv_data; + vps->vps_video_parameter_set_id = (vps->vps_video_parameter_set_id + ctx->vps_id_offset) % HEVC_MAX_VPS_COUNT; + if (ctx->tick_rate.num && ctx->tick_rate.den) { int num, den; @@ -200,6 +206,9 @@ static int h265_metadata_update_sps(AVBSFContext *bsf, int need_vui = 0; int crop_unit_x, crop_unit_y; + sps->sps_video_parameter_set_id = (sps->sps_video_parameter_set_id + ctx->vps_id_offset) % HEVC_MAX_VPS_COUNT; + sps->sps_seq_parameter_set_id = (sps->sps_seq_parameter_set_id + ctx->sps_id_offset) % 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 +345,27 @@ 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; + + pps->pps_seq_parameter_set_id = (pps->pps_seq_parameter_set_id + ctx->sps_id_offset) % HEVC_MAX_SPS_COUNT; + pps->pps_pic_parameter_set_id = (pps->pps_pic_parameter_set_id + ctx->pps_id_offset) % HEVC_MAX_PPS_COUNT; + + return 0; +} + +static int h265_metadata_update_slice_header(AVBSFContext *bsf, + H265RawSliceHeader *slice) +{ + H265MetadataContext *ctx = bsf->priv_data; + + slice->slice_pic_parameter_set_id = (slice->slice_pic_parameter_set_id + ctx->pps_id_offset) % HEVC_MAX_PPS_COUNT; + + return 0; +} + static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { H265MetadataContext *ctx = bsf->priv_data; @@ -406,15 +436,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 +512,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 +631,16 @@ static const AVOption h265_metadata_options[] = { OFFSET(crop_bottom), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, HEVC_MAX_HEIGHT, FLAGS }, + { "vps_id_offset", "Increase the vps id by this offset", + OFFSET(vps_id_offset), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, HEVC_MAX_VPS_COUNT, FLAGS }, + { "sps_id_offset", "Increase the sps id by this offset", + OFFSET(sps_id_offset), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, HEVC_MAX_SPS_COUNT, FLAGS }, + { "pps_id_offset", "Increase the pps id by this offset", + OFFSET(pps_id_offset), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, 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" },