From patchwork Wed Sep 6 17:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43598 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b17:b0:149:dfde:5c0a with SMTP id l23csp87081pzh; Wed, 6 Sep 2023 10:45:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzgnrCi2Q+KjMpFW7U3A+XJZT9kPQbgWP8UvC088pOOZU3GLtCbKfw1wwwe+2x9wY4bGt/ X-Received: by 2002:aa7:c990:0:b0:523:2847:fb5a with SMTP id c16-20020aa7c990000000b005232847fb5amr2428740edt.40.1694022339747; Wed, 06 Sep 2023 10:45:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694022339; cv=none; d=google.com; s=arc-20160816; b=LmvA3fLIqtYPzvxB4ZeFdjRQWHwyKN6Rg5tRw+QTrhc3HlHFzbPrOaWczO/QabWif2 EvlyKzvgDAdGBE6unr5jdRSNSfhCMrWOzGnUYojE1WYsZbHMpc8dAzapDZ4259o4MW28 vgHab/WdKTNCuDAHdWfSqADJNhhG7F5bHq4/H9G9qg8qBpcC66B5ChFrhAUQWPUnsJ9z fF6lwhIr3owFyAdLa4ioR4O+iL21hbGbGlI4AgOxhHPCibCSqf6LDlupTBpxo+vuRRbo dnlZToYhy+hbS5k3YemmIrNnBNkVDf7+McIXuvX0N3yvs7YlURHaI0v9Ksw+gY0gbbHO 92ng== 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=M6jjMlkzUUadgNevXPCxZ77J0C8/jysaqCF/eig7buE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ZpR+9BHwZwXuoVh5bVC8G5qpPLFb5B7sFPbl3mAhMKlA0wyv4vgey8cOJcLrkJD4IF JQd2NOe/JlYgSixKPFntha0jtbu1h27dLtJDdAYdgqVeD6ORPUOjoz2uGe30RTKAGJN+ 7/9U0gksdoEVgQ/rw197eipSBJYc7WIJxsOkfWT1DQFacPAEFDVUmeWQBeMPXHm8vFMB Evv+2YJsjzt320N/d8yL2/ExuYkkDqqdN+JSGRt51+q7MA4joywhFZIs6yYWwcVBXc2n eYN+zqYkAW41q9EzVXOue18kS6BgqBKJXaZ/DKF4tgZX0F3Ia9pqd/nE4WmWzedmoTwY 4k7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=McYhXOA3; 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 o26-20020aa7c51a000000b00522d742bc4dsi9448841edq.334.2023.09.06.10.45.33; Wed, 06 Sep 2023 10:45:39 -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=20221208 header.b=McYhXOA3; 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 4043668C7F5; Wed, 6 Sep 2023 20:44:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A606468C7F5 for ; Wed, 6 Sep 2023 20:44:50 +0300 (EEST) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6bd8639e7e5so106384a34.1 for ; Wed, 06 Sep 2023 10:44:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694022289; x=1694627089; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=nekLWYudG8/I1mlHhc1fc/xXxapcrLL/+McCYcUjOu4=; b=McYhXOA3DtUHw/mUBYIFvln0HXXTxRVoRI9Nke2IOsNxkoM84D1X73H34yL/bNyL4N pxQnIG5REjTfiZ08SbwGcemjwguC98C731eCX/JRYSzagJU65uoHaEFIbpTeymgncFP3 FHCDJ3mYSl2jYHGNkAWFf97Brn+mNW7Mb1g1/bMOHOPwN/xbjwlCoRgbIRz/FxlIvn2r PSBsNN4OkCLWqiDpbovGvMnE2tuBmKzMPMnvSMpKLhK/aZ/GMjQJZRRsC4jSkN26a1mg 3ytteJOlVFRQWqGATqE1sIZQ38pXLkKqARhfitHxeRYtStzAWxn1Un8i30wfRSRJ6oux TnlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694022289; x=1694627089; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nekLWYudG8/I1mlHhc1fc/xXxapcrLL/+McCYcUjOu4=; b=AKQN1DniAyAvx3EWhLqxtXe8e4bebh5HB33ci6VGYnTVafU2TpqMdbH+8cQh1CzaC7 Fz5gZH6NVsRr2SKuwOqwxLcQ7JoYNkf5jaeO9Dg7MumPOsnPtCPZY0ecZW0hCbxKm/q3 MMmjP2ahm573Qc6rM6gulM44doyfgzBEA+LADBf/ZHh+diuVyFARuAk+XfIYyuT7w11L dcuTzcOk60SJtpQzgLlUM4SEkDLPaJ5Ml9XWJTHMx2HjK10SvVzcDU0eHNu7lYefhnSr ZU2QcwE0jjlu1En+ZfYuEeJFv+vEdbm6sJvnRWaOF90BG4PW4/vNHgJ9af7XyH56TwCO /WIg== X-Gm-Message-State: AOJu0YwPnpRBe+844m2cSpN2MI+MdJb18tMAizhwTwz4xLuX0VImKmym LmzpEVl0synImZh7eC4cihl4whSajOY= X-Received: by 2002:a05:6830:4799:b0:6b9:72be:671f with SMTP id df25-20020a056830479900b006b972be671fmr17081377otb.16.1694022288837; Wed, 06 Sep 2023 10:44:48 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v5-20020a0568301bc500b006b99f66444bsm6561309ota.71.2023.09.06.10.44.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 10:44:48 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2023 14:44:24 -0300 Message-ID: <20230906174431.45558-5-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230906174431.45558-1-jamrial@gmail.com> References: <20230906174431.45558-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] fftools/ffmpeg: stop using AVStream.side_data 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: +WBL27ISKusY Signed-off-by: James Almer --- fftools/ffmpeg_demux.c | 11 +++++++---- fftools/ffmpeg_enc.c | 31 +++++++++---------------------- fftools/ffmpeg_filter.c | 5 ++++- fftools/ffmpeg_mux_init.c | 19 ++++++++++--------- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 48edbd7f6b..6cf6d2e971 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -482,8 +482,8 @@ static int input_packet_process(Demuxer *d, DemuxMsg *msg, AVPacket *src) /* add the stream-global side data to the first packet */ if (ds->nb_packets == 1) { - for (int i = 0; i < ist->st->nb_side_data; i++) { - AVPacketSideData *src_sd = &ist->st->side_data[i]; + for (int i = 0; i < ist->st->codecpar->side_data.nb_sd; i++) { + AVPacketSideData *src_sd = ist->st->codecpar->side_data.sd[i]; uint8_t *dst_data; if (src_sd->type == AV_PKT_DATA_DISPLAYMATRIX) @@ -979,6 +979,7 @@ static int add_display_matrix_to_stream(const OptionsContext *o, AVFormatContext *ctx, InputStream *ist) { AVStream *st = ist->st; + AVPacketSideData *sd; double rotation = DBL_MAX; int hflip = -1, vflip = -1; int hflip_set = 0, vflip_set = 0, rotation_set = 0; @@ -995,12 +996,14 @@ static int add_display_matrix_to_stream(const OptionsContext *o, if (!rotation_set && !hflip_set && !vflip_set) return 0; - buf = (int32_t *)av_stream_new_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); - if (!buf) { + sd = av_packet_side_data_set_new(&st->codecpar->side_data, AV_PKT_DATA_DISPLAYMATRIX, + sizeof(int32_t) * 9, 0); + if (!sd) { av_log(ist, AV_LOG_FATAL, "Failed to generate a display matrix!\n"); return AVERROR(ENOMEM); } + buf = (int32_t *)sd->data; av_display_rotation_set(buf, rotation_set ? -(rotation) : -0.0f); diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index f28884e50c..503a2c033b 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -460,20 +460,6 @@ int enc_open(OutputStream *ost, AVFrame *frame) return ret; } - if (ost->enc_ctx->nb_coded_side_data) { - int i; - - for (i = 0; i < ost->enc_ctx->nb_coded_side_data; i++) { - const AVPacketSideData *sd_src = &ost->enc_ctx->coded_side_data[i]; - uint8_t *dst_data; - - dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size); - if (!dst_data) - return AVERROR(ENOMEM); - memcpy(dst_data, sd_src->data, sd_src->size); - } - } - /* * 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 @@ -483,15 +469,16 @@ int enc_open(OutputStream *ost, AVFrame *frame) */ if (ist) { int i; - for (i = 0; i < ist->st->nb_side_data; i++) { - AVPacketSideData *sd = &ist->st->side_data[i]; - if (sd->type != AV_PKT_DATA_CPB_PROPERTIES) { - uint8_t *dst = av_stream_new_side_data(ost->st, sd->type, sd->size); - if (!dst) + for (i = 0; i < ist->st->codecpar->side_data.nb_sd; i++) { + AVPacketSideData *sd_src = ist->st->codecpar->side_data.sd[i]; + if (sd_src->type != AV_PKT_DATA_CPB_PROPERTIES) { + AVPacketSideData *sd_dst = av_packet_side_data_set_new(&ost->par_in->side_data, + sd_src->type, sd_src->size, 0); + if (!sd_dst) return AVERROR(ENOMEM); - memcpy(dst, sd->data, sd->size); - if (ist->autorotate && sd->type == AV_PKT_DATA_DISPLAYMATRIX) - av_display_rotation_set((int32_t *)dst, 0); + 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); } } } diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 9bf870b615..4be415c4f8 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1383,11 +1383,14 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, // TODO: insert hwaccel enabled filters like transpose_vaapi into the graph if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { + AVPacketSideData *sd = NULL; int32_t *displaymatrix = ifp->displaymatrix; double theta; if (!ifp->displaymatrix_present) - displaymatrix = (int32_t *)av_stream_get_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, NULL); + sd = av_packet_side_data_set_get(&ist->st->codecpar->side_data, AV_PKT_DATA_DISPLAYMATRIX); + if (sd) + displaymatrix = (int32_t *)sd->data; theta = get_rotation(displaymatrix); if (fabs(theta - 90) < 1.0) { diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index cf4cd2d5b7..46bc90b1c2 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1041,24 +1041,25 @@ static int streamcopy_init(const Muxer *mux, OutputStream *ost) } } - for (int i = 0; i < ist->st->nb_side_data; i++) { - const AVPacketSideData *sd_src = &ist->st->side_data[i]; - uint8_t *dst_data; + for (int i = 0; i < ist->st->codecpar->side_data.nb_sd; i++) { + const AVPacketSideData *sd_src = ist->st->codecpar->side_data.sd[i]; + AVPacketSideData *sd_dst; - dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size); - if (!dst_data) { + sd_dst = av_packet_side_data_set_new(&ost->st->codecpar->side_data, sd_src->type, sd_src->size, 0); + if (!sd_dst) { ret = AVERROR(ENOMEM); goto fail; } - memcpy(dst_data, sd_src->data, sd_src->size); + memcpy(sd_dst->data, sd_src->data, sd_src->size); } #if FFMPEG_ROTATION_METADATA if (ost->rotate_overridden) { - uint8_t *sd = av_stream_new_side_data(ost->st, AV_PKT_DATA_DISPLAYMATRIX, - sizeof(int32_t) * 9); + AVPacketSideData *sd = av_packet_side_data_set_new(&ost->st->codecpar->side_data, + AV_PKT_DATA_DISPLAYMATRIX, + sizeof(int32_t) * 9, 0); if (sd) - av_display_rotation_set((int32_t *)sd, -ost->rotate_override_value); + av_display_rotation_set((int32_t *)sd->data, -ost->rotate_override_value); } #endif