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 ESMTPS id E39AA4D217 for ; Tue, 18 Feb 2025 13:10:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68A4F68C231; Tue, 18 Feb 2025 15:08:52 +0200 (EET) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC8F368C1BA for ; Tue, 18 Feb 2025 15:08:45 +0200 (EET) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2211cd4463cso43652055ad.2 for ; Tue, 18 Feb 2025 05:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739884124; x=1740488924; 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=zQ2u5lyN0wUBFHYSfcyBqePJZF5ZnfybBSe0JIU+z1A=; b=j6jQqKdx3C1tqnu/E3w/1JA9FhwImQxC2dcmA3W8uT9Ju9+FHkrdZ2tQPIzsQGaljA 0VVV2W7V9+MwXDZbswRbbSB/TUobmgVJ6nX9x1Tr4Xrr+3Z2SRAPNV36vO8yb0hRKyoI +5U7cpZKLlY50s2IOHnFYotksXZ0BfJ+gAgTjsVjrmDIUAtcTaD4ovgMwVIO+oqEiePv YG4fpVEFzcyiLvyJ3ftVJA31omEwy/FG9VqJiYha4KIpM6ZVZbIVMsOZj8UNaFDUIbJr qBo9D8oaJpjR5/JK7D8H6sI7/1kDsN5Za7Rwjrebg35zJGOEO5xSqXnH31BLqO+hwYX+ cCTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739884124; x=1740488924; 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=zQ2u5lyN0wUBFHYSfcyBqePJZF5ZnfybBSe0JIU+z1A=; b=b2L3iN2zYFppA5nf5eahSQgluDXeNtHBh6fGA3ZuIsXMBOnJr/PqilE/1rcS3FoZ30 xcFCRQ1P7Vws4Tp/ruUjF43pQTOfnlBWVA5Lytx8xnnG0maQFZPsrRby213vAfPVIYjP +wFmEyFc38Ml4m+WyIzkoKNsmQo/cpfdNU3QuEuQKma/CSwQeXn7vO27nFoCGpvbW+6m O3Rn6bo97G1OAgHIrBxg/aHZj69R4m9RxlF9CIg2vlKagXBUNvYNwBswwct+e8AsvhQN m5Tqz/YseHxFNspjZ6Qspq3/es5aommFJe0EQ6nDe6iKzVZ169JfOVcRSP1MZ1OZaOIf HaHQ== X-Gm-Message-State: AOJu0Yzn7VQZn0v0Eyooq2O1NhTMIZtu/QYxKA8RY1S52hyuOz2hnMha WvwqWs+sOVGJDwBBDbkZOUrHstr9X94K9jgQIIhrgrKsQsdHNYw3gKA0LFzh X-Gm-Gg: ASbGncsulICvkZsKuGmJTqACAByT35nOdj10xozV0ot9UFHSGj7fiNPiNlfB7VNPf1Z ZOuP3PkT/UU0HPDOLbZMMfvDZdsyFYAQy+dbjzANJW4nFfpJ73h8aR9JAVful91jc8GJGhWKng7 +1fd0TNw7VK6C8Qmdo89lmIvAGup4737kMraIuNU1ooeHORBsqI9xRz8RgXJ/h/nb9UwIGpbqqd L4A/LzQfhcAVzwB3L0nS2JBf7tYsgnRp2FCTPrbq2Tssp7Qv9CrkO6mUy6cizVSKACUOAR97px3 B+ijrkgx+2y4NRbbtRbDbckK+68LmQ== X-Google-Smtp-Source: AGHT+IE96foF78oqTGAF7PFAO3Pkgo+3qh4wvhTpv4uoAgZuO9aYrCEkSPkZ0cRCxXbLvZo1zl+D+A== X-Received: by 2002:a17:902:fb45:b0:21f:89e5:2704 with SMTP id d9443c01a7336-221040b1427mr169385715ad.34.1739884123633; Tue, 18 Feb 2025 05:08:43 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:a0a7:974:71c7:ca89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d556d66fsm89178635ad.180.2025.02.18.05.08.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 05:08:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 10:08:12 -0300 Message-ID: <20250218130813.74-10-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218130813.74-1-jamrial@gmail.com> References: <20250218130813.74-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/11] fftools/ffmpeg_enc: store a few more AVCodecContext fields in Encoder 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Preparation work for the following commits. Signed-off-by: James Almer --- fftools/ffmpeg.h | 4 ++++ fftools/ffmpeg_enc.c | 5 +++++ fftools/ffmpeg_mux_init.c | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6cc0da05a0..af76d81a10 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -567,6 +567,10 @@ typedef struct Encoder { AVCodecContext *enc_ctx; + uint32_t codec_tag; + int flags; + int global_quality; + // number of frames/samples sent to the encoder uint64_t frames_encoded; uint64_t samples_encoded; diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index acb0702385..32b41ea51c 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -218,6 +218,11 @@ static int enc_reopen(void *opaque, const AVFrame *frame) if (ist) dec = ist->decoder; + if (ost->enc->codec_tag) + enc_ctx->codec_tag = e->codec_tag; + enc_ctx->flags |= e->flags; + enc_ctx->global_quality = e->global_quality; + // the timebase is chosen by filtering code if (ost->type == AVMEDIA_TYPE_AUDIO || ost->type == AVMEDIA_TYPE_VIDEO) { enc_ctx->time_base = frame->time_base; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 4a973e5286..3eff514f7b 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1490,13 +1490,13 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, ost->st->codecpar->codec_tag = tag; ms->par_in->codec_tag = tag; if (ost->enc) - ost->enc->enc_ctx->codec_tag = tag; + ost->enc->codec_tag = tag; } opt_match_per_stream_dbl(ost, &o->qscale, oc, st, &qscale); if (ost->enc && qscale >= 0) { - ost->enc->enc_ctx->flags |= AV_CODEC_FLAG_QSCALE; - ost->enc->enc_ctx->global_quality = FF_QP2LAMBDA * qscale; + ost->enc->flags |= AV_CODEC_FLAG_QSCALE; + ost->enc->global_quality = FF_QP2LAMBDA * qscale; } if (ms->sch_idx >= 0) { @@ -1519,7 +1519,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, oc, st, &ost->fix_sub_duration_heartbeat); if (oc->oformat->flags & AVFMT_GLOBALHEADER && ost->enc) - ost->enc->enc_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + ost->enc->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; opt_match_per_stream_int(ost, &o->copy_initial_nonkeyframes, oc, st, &ms->copy_initial_nonkeyframes); -- 2.48.1 _______________________________________________ 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".