From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 8C0214C7F1 for ; Wed, 17 Sep 2025 00:47:46 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Nk6Hj49X5PV4LwwSCRtUhf3gyRZmGUuhN7jrbM7j+H0=', expected b'l2LDoDbUotJKjkEHuhzBU75m/+C+iuou2nelGmf64Z8=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758070049; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=Nk6Hj49X5PV4LwwSCRtUhf3gyRZmGUuhN7jrbM7j+H0=; b=H0NhnwyOqB0tvOT03QcXP5kE+58i24iWACJHHT0Y3GVGdfi/88g3qsIh3XQUQk1GL8KoY TBCX7yOwPui2wTbYxhhKuaV5pyPLA/hHV1fiE5+Gy58+bKjruuphUB0KPCZ0f/a8KBcb0MO vJCO/bQbh6IMiCz3toKo6VQHue0ASmhHjy4zs92f/sHiV90/SJoDfhmNBsgceXdEFQB8VRB hAHJ34m4Aw7jEn7eV2FiJwmNCpWNk19KWJvMPwcum/MeLFWiDFsz5BJh0jysxnMwnDq/dN+ 7SGPPuFgUTzvdWocoQ9riDTDei73xcq0XdZCEeR6UA888maKQidodfJlycMQ== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A57DB68E8E8; Wed, 17 Sep 2025 03:47:29 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1758070047; b=lUkQn7fJihrXpkw+LWgTDgbY5cu1dIJP/0wyRoX1PpYQpO5TVks3f8sUzdk/ve1nCn6Ll nAVgVM9XC36xpEQ29l70RfkxDFiGMbwP1oMvkmJOvXYTU9Vua2XPywuYai2aQzZ36KQa+Ji ZJeZvyoREsfh690qBr61iphFNSmbhjJ2juHNbO0z5vrI/HQpEBNT4TTu0rvNgCrGxof4Uey FSqh2X47Pvi1arg1Q9H6Ch0We/SA8Gf/F2F8S20U/e9zWVTBHM5dj5dEkUJEk0t3/W/fFH1 H+aMkk1DHnx8eJAo2k/+HOcUWc+/mESfGca9bGkQwD0M0GhC7b2Ze1RuZt8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1758070047; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=Q4oxeK+vlkQPzgOD/Gmg4m6QqB+zp3BXRAGZJxi9ZiY=; b=t1w+uJBwTlW0TuJohedc2d35oi3+uiDnmldGPr+GdlMRluis2rsOa3EaRArJ9dJmaHYYW 4eH0a0zmPbBDTkYBooZ5D3SnAk0SsGSFz6BTuJrdke8iopP/5c80HCzTZgZrZPj015PRTO6 ft1bimwrtKHNUvMGh1SIoMJYHVrEE7DkTmiYah/3uUg9/nDhqq66WWH0Y0b3XOrKcFF33sN fklM3Rmp0elIMDNdpEzkQND1dBfMlAXKdB8KGYty32jMnidfpDywu+qsWDfXzfGVKeUP/73 gN90GJcpQs4L9YgnDSe+XadrHHUAk06uWm22YoGNEJdcKdTEDK4/2FOZdshQ== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758070034; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=l2LDoDbUotJKjkEHuhzBU75m/+C+iuou2nelGmf64Z8=; b=2ZrozrcKQhRTQmAijn5v0Kf0MurEKH0HghVCV1eWKixms1WPxWNY/jpxkdqqSut/nKc7u ggWkdjbrNWMuonq9EF+6+Wd+hRP8JK0TiTFfknpZKI7yP0RvWea41iQZ4xDQOmH2ISP569G c5C6eFw3cNJ0teDZJdiYACeMGFUjOjsjmUDClivI190/8VcLbwIKXbqoctUvCxiYrbTSTLo 5GgOL9GuIHRviy5qLqp19NZGDzg+a2Y0Wc/99MGOCyl4mFCQcRcrrBAoDS2Ix5zqN8nrAm8 8xKpZPIT7i1otEaWtmF9B8vHNi7PhltptkYqmKKMdWYJLKgL0rLChygK04BA== Received: from ed19c606a818 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id F294268E8C2 for ; Wed, 17 Sep 2025 03:47:13 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Sep 2025 00:47:13 -0000 Message-ID: <175807003420.25.9498237660700720522@463a07221176> Message-ID-Hash: W7OVDMUXUY3N4U3W33FLRY5S37RFQ6VR X-Message-ID-Hash: W7OVDMUXUY3N4U3W33FLRY5S37RFQ6VR X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/movenc: clear subsample information on fragment flush (PR #20538) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: James Almer via ffmpeg-devel Cc: James Almer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20538 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20538 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20538.patch Don't keep around information from a previous traf atom. Fixes issue #20492. >>From 9c18a8d1802726c7d59c5d067890b7f2f8c728f4 Mon Sep 17 00:00:00 2001 From: James Almer Date: Tue, 16 Sep 2025 21:45:00 -0300 Subject: [PATCH] avformat/movenc: clear subsample information on fragment flush Don't keep around information from a previous traf atom. Fixes issue #20492. Signed-off-by: James Almer --- libavformat/movenc.c | 3 +++ libavformat/movenccenc.c | 6 ++++++ libavformat/movenccenc.h | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bfe76a2034..067d38b14b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6592,6 +6592,9 @@ static int mov_flush_fragment(AVFormatContext *s, int force) mov_write_moof_tag(s->pb, mov, moof_tracks, mdat_size); mov->fragments++; + if (track->cenc.aes_ctr) + ff_mov_cenc_flush(&track->cenc); + avio_wb32(s->pb, mdat_size + 8); ffio_wfourcc(s->pb, "mdat"); mdat_start = avio_tell(s->pb); diff --git a/libavformat/movenccenc.c b/libavformat/movenccenc.c index 32094ebd7b..e5ae11a9c9 100644 --- a/libavformat/movenccenc.c +++ b/libavformat/movenccenc.c @@ -629,6 +629,12 @@ int ff_mov_cenc_init(MOVMuxCencContext* ctx, uint8_t* encryption_key, return 0; } +void ff_mov_cenc_flush(MOVMuxCencContext* ctx) +{ + ctx->auxiliary_info_entries = 0; + ctx->auxiliary_info_size = 0; +} + void ff_mov_cenc_free(MOVMuxCencContext* ctx) { av_aes_ctr_free(ctx->aes_ctr); diff --git a/libavformat/movenccenc.h b/libavformat/movenccenc.h index 77a0716c81..f03e2fe6aa 100644 --- a/libavformat/movenccenc.h +++ b/libavformat/movenccenc.h @@ -91,6 +91,12 @@ int ff_mov_cenc_avc_write_nal_units(AVFormatContext *s, MOVMuxCencContext* ctx, int ff_mov_cenc_av1_write_obus(AVFormatContext *s, MOVMuxCencContext* ctx, AVIOContext *pb, const AVPacket *pkt); + +/** + * Clear subsample data. To be called for fragmented output. + */ +void ff_mov_cenc_flush(MOVMuxCencContext* ctx); + /** * Write the cenc atoms that should reside inside stbl */ -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org