From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EEAC3485E6 for ; Mon, 11 Dec 2023 12:46:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C70168D1B5; Mon, 11 Dec 2023 14:46:49 +0200 (EET) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F71168D158 for ; Mon, 11 Dec 2023 14:46:42 +0200 (EET) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5c21e185df5so3707697a12.1 for ; Mon, 11 Dec 2023 04:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702298800; x=1702903600; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=MbhEzPy0tc9KDft9Zy4+lJ1YH5F/feqaGGiZi8Ektzo=; b=OT6Y2LqGIeVYmsGq7dwlnwW5i2akPOn8FBf/wVRjF2cOXmfKfxAi8VXjBsdjxaz4Iv oSAXhXkpVI+zOD1GTW/xTXCAFP8zCnEqLiTEV15Hk6ahVDF6rTzfpk+WQsfW7AKmc5KY yHn6Pga7H1lxBSSm8zwzOXWSZQIWm4IvhbeHeCafZSGdlbPtmzOtVOIof3gRr5Y84jj0 iAiWJaZmBgk7R1lX+4wuw2XZDlIXk0W8OCFxeRjZ4CfwN8k3nIj+t96MVoCyEsBGCPvs yYhXQ9djgKEeDXr5vukll+4kd7znKeJ23lipi0nEWrbiOzopWmBJTt5e4OJNBS1eDC9O UrpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702298800; x=1702903600; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MbhEzPy0tc9KDft9Zy4+lJ1YH5F/feqaGGiZi8Ektzo=; b=u1tOfqzjeNC5seMX/0djlBEXT66ksMVWfgBsrRbVdMN3R4Vzy14l4xmWXL3g7p4i7L mzLZLMsyzX8YoU/OYUjTicGdPlkcR0eamnb6VN6ir1m8OA7dIyVCKjBet99y/WZIEMhJ obs30aNn6llrRlRVBQFKtrYc+DZel16pNWORVwiupRCSnakYpEusxvOriekgKBtLS78g Ug4OX+1Gju7lKzM/zz7su9s8SQoRUY2QSzItsjW1wV/a4cWT4fSYJR8W2Uj/L/bonW0/ 97kgGZLQWjUhOd45aCw7jK75xhxC1Ht+zMyrOIHKa+v0MqLAt426HRusJ+/tS9Umkgko Mkhw== X-Gm-Message-State: AOJu0YwfXtQdlxvrqzWYWIhOco8OG3/UEsQ0wOyzMLyJtF/48YnaodmA E3QghIgqqJue+6ZjPJhnjKcnNHgT3Nk= X-Google-Smtp-Source: AGHT+IHEnhHr9jLI9SG9lu0HuIV6hdQc5s2Hvi79xpnAtQfThbFRGAx9HYA+gCk7nZC4EAf3LbOmWg== X-Received: by 2002:a17:90a:be06:b0:286:bb92:196c with SMTP id a6-20020a17090abe0600b00286bb92196cmr3294945pjs.18.1702298799743; Mon, 11 Dec 2023 04:46:39 -0800 (PST) Received: from [192.168.0.15] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id sf3-20020a17090b51c300b0028a42f9d3ebsm5756205pjb.53.2023.12.11.04.46.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 Dec 2023 04:46:39 -0800 (PST) Message-ID: Date: Mon, 11 Dec 2023 09:46:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20231205224402.14540-1-jamrial@gmail.com> <20231205224402.14540-4-jamrial@gmail.com> <170229528332.8914.3392013065667453741@lain.khirnov.net> Content-Language: en-US From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: <170229528332.8914.3392013065667453741@lain.khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 3/8] ffmpeg: add support for muxing AVStreamGroups 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 12/11/2023 8:48 AM, Anton Khirnov wrote: > Quoting James Almer (2023-12-05 23:43:57) >> Starting with IAMF support. >> >> Signed-off-by: James Almer >> --- >> fftools/ffmpeg.h | 2 + >> fftools/ffmpeg_mux_init.c | 335 ++++++++++++++++++++++++++++++++++++++ >> fftools/ffmpeg_opt.c | 2 + >> 3 files changed, 339 insertions(+) > > Missing documentation. Will do. > >> +static int of_add_groups(Muxer *mux, const OptionsContext *o) >> +{ >> + AVFormatContext *oc = mux->fc; >> + int ret; >> + >> + /* process manually set groups */ >> + for (int i = 0; i < o->nb_stream_groups; i++) { >> + AVDictionary *dict = NULL, *tmp = NULL; >> + const AVDictionaryEntry *e; >> + AVStreamGroup *stg = NULL; >> + int type; >> + const char *token; >> + char *str, *ptr = NULL; >> + const AVOption opts[] = { >> + { "type", "Set group type", offsetof(AVStreamGroup, type), AV_OPT_TYPE_INT, >> + { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "type" }, >> + { "iamf_audio_element", NULL, 0, AV_OPT_TYPE_CONST, >> + { .i64 = AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT }, .unit = "type" }, >> + { "iamf_mix_presentation", NULL, 0, AV_OPT_TYPE_CONST, >> + { .i64 = AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION }, .unit = "type" }, >> + { NULL }, >> + }; >> + const AVClass class = { >> + .class_name = "StreamGroupType", >> + .item_name = av_default_item_name, >> + .option = opts, >> + .version = LIBAVUTIL_VERSION_INT, >> + }; >> + const AVClass *pclass = &class; >> + >> + str = av_strdup(o->stream_groups[i].u.str); >> + if (!str) >> + goto end; >> + >> + token = av_strtok(str, ",", &ptr); >> + if (token) { > > Too many indentation levels, move this whole block into a separate > function. > >> + ret = av_dict_parse_string(&dict, token, "=", ":", AV_DICT_MULTIKEY); >> + if (ret < 0) { >> + av_log(mux, AV_LOG_ERROR, "Error parsing group specification %s\n", token); >> + goto end; >> + } >> + >> + // "type" is not a user settable option in AVStreamGroup > > This comment confuses me. AVStreamGroup.type is not setteable through AVOptions, but it of course needs to be supported by the CLI. So i catch it and remove it from the dict that will be used for avformat_stream_group_create(). I can change the comment to "'type' is not a user settable AVOption". > >> + e = av_dict_get(dict, "type", NULL, 0); >> + if (!e) { >> + av_log(mux, AV_LOG_ERROR, "No type define for Steam Group %d\n", i); > > 1) Steam > 2) defined? Or maybe specified. Will change to specified. > 3) Print the string, not the index. > >> + ret = AVERROR(EINVAL); >> + goto end; >> + } >> + >> + ret = av_opt_eval_int(&pclass, opts, e->value, &type); >> + if (ret < 0 || type == AV_STREAM_GROUP_PARAMS_NONE) { >> + av_log(mux, AV_LOG_ERROR, "Invalid group type \"%s\"\n", e->value); >> + goto end; >> + } >> + >> + av_dict_copy(&tmp, dict, 0); >> + stg = avformat_stream_group_create(oc, type, &tmp); >> + if (!stg) { >> + ret = AVERROR(ENOMEM); >> + goto end; >> + } >> + av_dict_set(&tmp, "type", NULL, 0); >> + >> + e = NULL; >> + while (e = av_dict_get(dict, "st", e, 0)) { >> + unsigned int idx = strtol(e->value, NULL, 0); >> + if (idx >= oc->nb_streams) { >> + av_log(mux, AV_LOG_ERROR, "Invalid stream index %d\n", idx); >> + ret = AVERROR(EINVAL); >> + goto end; >> + } > > This block seems confused about signedness of e->value. You mean change %d to %u? > >> + avformat_stream_group_add_stream(stg, oc->streams[idx]); > > Unchecked return value. > > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".