From patchwork Wed Oct 3 00:18:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10542 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp3546702uaq; Tue, 2 Oct 2018 17:18:41 -0700 (PDT) X-Google-Smtp-Source: ACcGV61SB+5HLxYjeVKB3U5THaYTE3KR2hN875nCno+65cdKdQY88GQQwCLLP4AESWRIQLYM8MAt X-Received: by 2002:a1c:3383:: with SMTP id z125-v6mr3263747wmz.56.1538525921323; Tue, 02 Oct 2018 17:18:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538525921; cv=none; d=google.com; s=arc-20160816; b=vkDi9GCZqkhuvZziGXM42EOANv8uOAUauMXdqsD+P/zM4rdi+KnvjczJJUeFr1iOJ4 e5GGdDiu4Gpv0wIgmwM6WPqrFSr2ODsMjp87ZKTez3tBdbTyEnofwyCw51wRqEtZS2lS IDkY6G2DBA/NDHzWSGGmzdn3vZoOgdAMRQ9AhZd/2gftMFicualKTvTC38oy5Lgl3uE1 SOZHxZGIlIOf/VfXAils7WK8JsEhgxNuPbkzD9rAKsI8MNQVXSMtAkBuaitwHYGoth37 9kDulaNs+KpxgnS7ZCc82qNkoEEjCh8xa4mDTIFvKA35pNl4VRUu6k4mADJPf+VcKQsw OlPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=/qOFhIgsjfUkIHopvHMkWCftYz7e6vSYekyxrNhNHWU=; b=z9N32xy3nMixtKV3XN/X3/zNYi7bgTBZm6xgJ/M+7ar5WTsamq7/4dmhYNVL0/NY7E XTiIVVaZ79L/5kLr61HiczhfYMWhLP4lehN+0IQjOXhZNh07UcXZc/7NrN2oy6/95TtE vuTAu5R8gNk0GV8PfPX0BsKDqX3k3vC1AP5hdAyUfC5LHKFNMaW87UHsVUHe04g2IcCl Z3DDKXAJJR7zxJgWYYcak718zaxG9IfHITjbSOHMExEg8VAOjpwRINFwSMxsIB1g/F8M uXJFKPU886aCae5xVU9y2xAMryAInIa84TVv3kl6qjvVWPApVuOUYJEhCrao2pXU+lE5 S5zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=i7j4Njqt; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j191-v6si7068355wmd.131.2018.10.02.17.18.40; Tue, 02 Oct 2018 17:18:41 -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 header.s=20161025 header.b=i7j4Njqt; 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=QUARANTINE 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 7C327689EAB; Wed, 3 Oct 2018 03:18:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3E7B689F9F for ; Wed, 3 Oct 2018 03:18:12 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id n6-v6so4115390qtl.4 for ; Tue, 02 Oct 2018 17:18:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=0SY+V6UC3Ot/7fYmRbXVi1Od1R7AZ5MltSBFJM8VRuQ=; b=i7j4NjqtEeCTD+byjwWNVqO+5c5w+sp2EsigL7Q9vE5ST4bXaQDWdp2u4oa6q+0FYp qCWCPnFwtxHu/CYlvB5HthE76DbJudFMY2jbxD73OmBtLbHmFsbT/1+yzZ3clW8HrcmA kZN2sIw1Cj5upG2fYyfnFiKM9JB1XI53ckqHI9fQnL8fotkd5AyYTVtWPBj3GDht/QO0 DfvnnjvvhDc84t3LiZzQN48lNtRYqvfoHLA4CnrnpmBT4jUoWXitPPelXj28g0QRDMey rHXk1h/6TPQbuHTmHb9yApwKaVOq/77HWbyfq/41pZaUU/4f8xxU/qjx9jzfivhEpSFy lLRA== 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:mime-version :content-transfer-encoding; bh=0SY+V6UC3Ot/7fYmRbXVi1Od1R7AZ5MltSBFJM8VRuQ=; b=mKRMuEZRdYFXUHhJ7v0PwHht2Rbnlz1dkc8JlYzoAzYMNwmLcJl2V80eabERzMzL7S 7nhdxHcejwZpb6qWaqzdNSSDERtxKRzdCn+1iww4xAB9B62mx5MG9l8hHoht6HYC+vSr SEK9teHbVWh6zDWoiCuWHn7IUEt5jSEifjGnrUC2WMKZCZJVGPtcYXHUP+c+YeMFQS2L AewKHuGxhGzWF04Ks7Z1oNUOWeEzVXekUyruTT1quCFkolL13YYRI5zkxbCUPY6T7R6f 5zEPUY0xCwSG6/wf3NxuqpT+3wVtlynz+mz1UuUrXK6n9sAL9O3vDPWaPBocSWhAzugI YaEg== X-Gm-Message-State: ABuFfoiyFbrAKaU4J4z2g0BqdLkTYRbIOGFfDTG/JN+ZzYmCLV9d/VvG DtgRZvvwXsODZ/0m11kG6b9THrPE X-Received: by 2002:ac8:540d:: with SMTP id b13-v6mr14306061qtq.242.1538525910959; Tue, 02 Oct 2018 17:18:30 -0700 (PDT) Received: from localhost.localdomain ([179.38.230.94]) by smtp.gmail.com with ESMTPSA id p21-v6sm2445469qtj.18.2018.10.02.17.18.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 17:18:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Oct 2018 21:18:04 -0300 Message-Id: <20181003001805.9312-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/av1_metadata: add an option to insert and remove Temporal Delimiter OBUs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/av1_metadata_bsf.c | 37 ++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index ed2f018fb6..20c3a39da7 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -23,12 +23,20 @@ #include "cbs.h" #include "cbs_av1.h" +enum { + PASS, + INSERT, + REMOVE, +}; + typedef struct AV1MetadataContext { const AVClass *class; CodedBitstreamContext *cbc; CodedBitstreamFragment access_unit; + int td; + int color_primaries; int transfer_characteristics; int matrix_coefficients; @@ -115,7 +123,7 @@ static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out) AV1MetadataContext *ctx = bsf->priv_data; AVPacket *in = NULL; CodedBitstreamFragment *frag = &ctx->access_unit; - AV1RawOBU *obu; + AV1RawOBU td, *obu; int err, i; err = ff_bsf_get_packet(bsf, &in); @@ -137,6 +145,23 @@ static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out) } } + // If a Temporal Delimiter is present, it must be the first OBU. + if (frag->units[0].type == AV1_OBU_TEMPORAL_DELIMITER) { + if (ctx->td == REMOVE) + ff_cbs_delete_unit(ctx->cbc, frag, 0); + } else if (ctx->td == INSERT) { + td = (AV1RawOBU) { + .header.obu_type = AV1_OBU_TEMPORAL_DELIMITER, + }; + + err = ff_cbs_insert_unit_content(ctx->cbc, frag, 0, AV1_OBU_TEMPORAL_DELIMITER, + &td, NULL); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to insert Temporal Delimiter.\n"); + goto fail; + } + } + err = ff_cbs_write_packet(ctx->cbc, out, frag); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); @@ -207,6 +232,16 @@ static void av1_metadata_close(AVBSFContext *bsf) #define OFFSET(x) offsetof(AV1MetadataContext, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) static const AVOption av1_metadata_options[] = { + { "td", "Temporal Delimiter OBU", + OFFSET(td), AV_OPT_TYPE_INT, + { .i64 = PASS }, PASS, REMOVE, FLAGS, "td" }, + { "pass", NULL, 0, AV_OPT_TYPE_CONST, + { .i64 = PASS }, .flags = FLAGS, .unit = "td" }, + { "insert", NULL, 0, AV_OPT_TYPE_CONST, + { .i64 = INSERT }, .flags = FLAGS, .unit = "td" }, + { "remove", NULL, 0, AV_OPT_TYPE_CONST, + { .i64 = REMOVE }, .flags = FLAGS, .unit = "td" }, + { "color_primaries", "Set color primaries (section 6.4.2)", OFFSET(color_primaries), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, FLAGS },