From patchwork Fri Mar 22 20:28:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 47330 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1014:b0:1a3:ac71:9534 with SMTP id nk20csp163437pzb; Fri, 22 Mar 2024 13:30:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4ouxj8QNQW9zRKJcCMcQRTOSNCCSMu8uDNofdHXsmBfF0brbfrsAKE7OBsY2gWemwRu9RHEDSTl4eIDMsNX4VHMriDpooHy3Jvw== X-Google-Smtp-Source: AGHT+IFk4I9cHlIZDWm+Fmi7/yTZcuOpDhB5DzSfxcFWj7STB6MhLuSNCiJZKRoLzH+J9zj8FnjA X-Received: by 2002:a17:906:34d3:b0:a46:f018:3f1d with SMTP id h19-20020a17090634d300b00a46f0183f1dmr506131ejb.73.1711139401030; Fri, 22 Mar 2024 13:30:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711139401; cv=none; d=google.com; s=arc-20160816; b=LRAv4Ma1EGgnvpaj8Q7d0GdFWc1a7tZlKmNvccLOqP2x5hRZCPwE9caOwSh1odG3n0 pKHI+D/e9z0LUHnIAQvuf64KyMOCz0QzQ5a8S/C+5DeJD2E9CEydgWgX0ZSNfXlmcK3k ZROAvGtTxH0VwS0j4iGmLZ4ievrDgQWO2TuDoUmmBYkLENFHN1wJHaEXckUqvXEdL/Gd ujYw870yb4NB6v31f505n+IYQteKqPGJGSIcAy0YWcJxUJfF+JapbO6vIipiemHjmKpr BFE+g7sJb3Q7/zrV6DhLI6Z3Px91UHXnErTPNXozUdCMQbTvWI3GLNSeyEo70+Nph+as etWw== 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:dkim-signature:delivered-to; bh=y69v1CrRTuWwDUW7XQzBKjYZTTbkpKKzqhmMM4LaiwY=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=W0+WBkJiTS0LHmU/GfHd5mJ/JzsNPjEyXFM5sfhIrZZsp3qk1KohirzSpCORkYD9xh esPrXE9o4aJrQ0A3mEcxWDY7sW6z0qtu7euubf9jfKXsK2swZrj4cBDn80L6SyQjNsGd h5HckszdPb4VDmGqhZuSSfGilFhhg7CVyLSK4NTPtJl+yHKQrwW6GotK0ZPvTPEfB5dX eXM4VLv82vKkvm5LEWRffUB87ix0AVnk6zmccEtdYDT9yYOXP5+oTIc3EsimI6T/xwjv IQsOCXy+0+cEMyM9R32/+NoN4J/rtHwfDdTDu2dbZQa6zQ54J87Hly8YOCJZzNKGLCHk RnDA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=d+1moNbp; 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 d16-20020a170906c21000b00a46a90e7afesi160479ejz.96.2024.03.22.13.30.00; Fri, 22 Mar 2024 13:30:01 -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=@khirnov.net header.s=mail header.b=d+1moNbp; 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 A967E68D5D5; Fri, 22 Mar 2024 22:29:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD56F68D4BA for ; Fri, 22 Mar 2024 22:29:01 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=d+1moNbp; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id DF0F14D56 for ; Fri, 22 Mar 2024 21:28:56 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 4bI8zh3GzUoe for ; Fri, 22 Mar 2024 21:28:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1711139334; bh=YsDYxbdd+ZonA5uiv5TZknOkEiZ07VYN1ynYm0BZkgQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=d+1moNbpQ5v5oc5ga0ltnL1bUP2QVtOAIBgTpMcT90QB6jgGXdb4GkC7We6Qb5cZg dIOmUHF3Qge9D/QNqniBhkZJpbcE0xkyIw7CASj9SOAA63VsSVZsiA/XhcTtIL9Gxs l8D8Ib3FHYBK9djRktvk+PTeH2B1yyK9aZlGM39Xz0NgdEws+SWwZIjBevz4xAvVDh tUXzqtmb3lw9GYWN12tM4gnFcPqSbuXyCe7pZMOBw7M+YkpndjFxX9t+wsqMrTkGUY qp9MlURS74zXv9N7oJqTbB6QdKCfdSetDCI1WpcHeyvqrrBryW0vlqEY7KW4gyJ+cN QT8JDQWszZX3w== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 8314A4D68 for ; Fri, 22 Mar 2024 21:28:54 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9DB763A0FB8 for ; Fri, 22 Mar 2024 21:28:45 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 21:28:40 +0100 Message-ID: <20240322202841.31730-11-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322202841.31730-1-anton@khirnov.net> References: <20240322202841.31730-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/12] fftools/ffmpeg_enc: stop copying demuxer side data to the muxer 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: 08oQgmzsNKKp All side data should be propagated through the trancoding pipeline. --- fftools/ffmpeg_enc.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index f01be1c22f..138044da24 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -360,29 +360,6 @@ int enc_open(void *opaque, const AVFrame *frame) return ret; } - /* - * Add global input side data. For now this is naive, and copies it - * from the input stream's global side data. All side data should - * really be funneled over AVFrame and libavfilter, then added back to - * packet side data, and then potentially using the first packet for - * global side data. - */ - if (ist) { - for (int i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) { - AVPacketSideData *sd_src = &ist->st->codecpar->coded_side_data[i]; - if (sd_src->type != AV_PKT_DATA_CPB_PROPERTIES) { - AVPacketSideData *sd_dst = av_packet_side_data_new(&ost->par_in->coded_side_data, - &ost->par_in->nb_coded_side_data, - sd_src->type, sd_src->size, 0); - if (!sd_dst) - return AVERROR(ENOMEM); - memcpy(sd_dst->data, sd_src->data, sd_src->size); - if (ist->autorotate && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) - av_display_rotation_set((int32_t *)sd_dst->data, 0); - } - } - } - // copy timebase while removing common factors if (ost->st->time_base.num <= 0 || ost->st->time_base.den <= 0) ost->st->time_base = av_add_q(ost->enc_ctx->time_base, (AVRational){0, 1});