From patchwork Tue Aug 31 18:07:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 29927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp5155888iov; Tue, 31 Aug 2021 11:09:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywHPtLCOla6MQoLPyc2EHPGiSiKvAbNctZKInOH3wgM4N9QZ4JKKiCjpmZCY37sEGPMjNM X-Received: by 2002:a17:907:384:: with SMTP id ss4mr31851443ejb.478.1630433390586; Tue, 31 Aug 2021 11:09:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630433390; cv=none; d=google.com; s=arc-20160816; b=zqw9qebhhyD2VuETTHWgudlwmJeu3CJS9Lzek12EdYIMnTrR3LceJCtkvhHJAE3uT2 wS/I1NMj1UlWYIQuH3PL5iAQu/vQnFxTdYcngbTmrNHBOCIaRUnTanaMytHMvJ5lP23O BB4SkzxZMovLCtgjUye6+uJryZAAC/8UpZge1FjurxOE/obAHeQI+EmlL9dJhv1nrAOi Q6WZV8cGtGpvdhhC1Smj1ldwQaHX7s27gwU9Qum6/ZcEkZzYHhkSEDBkPf1xLbhlF1Qu CPb9RdVEM7hxypTuBSiFF1gJltOOMGO2cwCwVlUBYdFllyr2X1ZK8ZJNiq8zOmgYNI2d QvNQ== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=7OR3aqYu9kFI3KLfUvYCCwjjhjy6JmKgmLvDT4TAhnQ=; b=YnzJwrtVZqDczZYVgXN6HcCmc8ZmqAnGoLdVxra2YE+nOUKInb5kWGDm1ABjizLopH FKOn28GREg90zwfIWeUfz1IOGu18hFGUAm++8hBD1/PNPsjmTeiir6oIEKgzLtGkAoSo Hka6Mo3FbjK/wYDZlluCgBZxLgORwhRaauUA6F+d5KEsj5eQgcIBUFRRDegTpTQ4nKQw T/sixp4FUEhBwANayQ/5UbJRFhRg2ZQGmgMRILeiB3HV1896FyFsv4U0eB/coGkPSlFH T03eMf2LAPvfO1WVM1kV1hPj7bhQ65WAZvUvJP8LRDo0EPFxh0Q1Ekc5BUXIyMyEwZzX wYxg== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hd10si11395735ejc.687.2021.08.31.11.09.50; Tue, 31 Aug 2021 11:09:50 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59BF668A58D; Tue, 31 Aug 2021 21:08:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CF0868A43A for ; Tue, 31 Aug 2021 21:07:46 +0300 (EEST) X-ENS-nef-client: 129.199.129.80 ( name = phare.normalesup.org ) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef.ens.fr (8.14.4/1.01.28121999) with ESMTP id 17VI7jij030786 for ; Tue, 31 Aug 2021 20:07:46 +0200 Received: by phare.normalesup.org (Postfix, from userid 1001) id A2EAFEB5BF; Tue, 31 Aug 2021 20:07:45 +0200 (CEST) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 20:07:38 +0200 Message-Id: <20210831180739.873390-11-george@nsup.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210831180739.873390-1-george@nsup.org> References: <20210831180739.873390-1-george@nsup.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef.ens.fr [129.199.96.32]); Tue, 31 Aug 2021 20:07:46 +0200 (CEST) Subject: [FFmpeg-devel] [PATCH 11/12] lavf/concatdec: add stream_extradata directive X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: nWRr5ooVSmAz Signed-off-by: Nicolas George --- doc/demuxers.texi | 3 +++ libavformat/concatdec.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 0c347e3f47..06ab152cc7 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -184,6 +184,9 @@ Can be present multiple times. @item @code{stream_codec @var{value}} Codec for the stream. +@item @code{stream_extradata @var{hex_string}} +Extradata for the string, encoded in hexadecimal. + @item @code{cahpter @var{id} @var{start} @var{end}} Add a chapter. @var{id} is an unique identifier, possibly small and consecutive. diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 0dd39a149e..ded0ba6031 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -432,6 +432,7 @@ typedef enum ParseDirective { DIR_EXSID, DIR_STMETA, DIR_STCODEC, + DIR_STEDATA, DIR_CHAPTER, } ParseDirective; @@ -448,6 +449,7 @@ static const ParseSyntax syntax[] = { [DIR_EXSID ] = { "exact_stream_id", "i", NEEDS_STREAM }, [DIR_STMETA ] = { "stream_meta", "ks", NEEDS_STREAM }, [DIR_STCODEC ] = { "stream_codec", "k", NEEDS_STREAM }, + [DIR_STEDATA ] = { "stream_extradata", "k", NEEDS_STREAM }, [DIR_CHAPTER ] = { "chapter", "idd", 0 }, }; @@ -612,6 +614,15 @@ static int concat_parse_script(AVFormatContext *avf) break; } + case DIR_STEDATA: { + int size = ff_hex_to_data(NULL, arg_kw[0]); + ret = ff_alloc_extradata(stream->codecpar, size); + if (ret < 0) + FAIL(ret); + ff_hex_to_data(stream->codecpar->extradata, arg_kw[0]); + break; + } + case DIR_CHAPTER: chapter = avpriv_new_chapter(avf, arg_int[0], AV_TIME_BASE_Q, arg_int[1], arg_int[2], NULL);