From patchwork Wed Jun 19 13:06:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 50014 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9187:0:b0:482:c625:d099 with SMTP id s7csp223124vqg; Wed, 19 Jun 2024 06:06:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+lFSTXEHHpO9/3fcO4upci0BRGvpL0dzYcr9MBMIVkcgKqGetDzhN7vlNkmzaHDQtFBFbvMR3qFy6qSmv8QgzMyKzvtyNgx7HCA== X-Google-Smtp-Source: AGHT+IH9ZSe8mVTTlmUZQCbOHal3+PFkaZ6ceuJk2wiwtQJgSyFgflBI0k9r8Ipvcf8W4iJSktIq X-Received: by 2002:a50:9f85:0:b0:57c:a8e5:35f0 with SMTP id 4fb4d7f45d1cf-57d069af5famr1594734a12.2.1718802414748; Wed, 19 Jun 2024 06:06:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718802414; cv=none; d=google.com; s=arc-20160816; b=tqI3R/OQZrb3HUsTyLZmwAyMyJqf3TIdTy25eRi80BiQVTnSvpHh0bzP3ogHxpS5Km bMF2EjbHR+PlnYOFtWgLQ/dq3OcEmzOJUcQ4NAaMHxuwAvp8xgeBnIOAyz1UbuaP4pag aHIlxEfJAQBwqpcHeI5Rc4mUQ1d9LpkekAapwXGmF5whWyrWqyAhNutOYeGMp7cQ32aV n5ih/bBuZWt0ZuV8VQKWBVJciG3aaNa3oveZLqlSTtZ9eTcs91ZsCiX71zlvDZUBJw81 dX/DHJXJ0P6Pt7Cawl8ebe7cv0uB9fDnwSqUO2ozS0lhd1MsVQbYBy6a+BnoE1FVlB4h FWWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ulNyTDXDRKrjZftPI9nutva0QBg+cNJ6Gauxu05DsX8=; fh=DxpTGDysqCqB1/sB3PSe+ytgwobPQvP+3mpmjv+XfVw=; b=C7R9opuQ01OVxYwFIIwGOKKmtO1XOMhORWcqmv2WjF8gKRRxBnK+RYFwtpjKPjU5Nu q48CNoFVbGHViPLP31ySO0rfnopcjmpvDh2XYYpp1HYa3EMKQ6UyFPQMmjmaVPC5MLn2 gcK9aymQtLQAiUVgbYGzU8pJZHRractNLvxcmhx0DGevJGM5dqfwsWWb2oehLo28NQaP om2fpkokQkp/V9ZuLWeyq56dMQZ99guPCQrYU2U0vQwLhx49ZFyBO6DN05kqzZzCJT76 pf4FakR491rp4ahYRRwmDhJny+IHyONiMCLpY3t4J5/DxVTirqGe8dPthlTIN2+pXzH3 DfKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b="0/Su5EjU"; 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 4fb4d7f45d1cf-57cb80e4fa3si6106441a12.262.2024.06.19.06.06.53; Wed, 19 Jun 2024 06:06:54 -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=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b="0/Su5EjU"; 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 50E4A68D6CC; Wed, 19 Jun 2024 16:06:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FAF168D5E0 for ; Wed, 19 Jun 2024 16:06:43 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-52cc671f170so761283e87.1 for ; Wed, 19 Jun 2024 06:06:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1718802402; x=1719407202; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=I+75MX5UTH/ARZuUR8ceJtlBW/QcwLCoU0g7s9goO5U=; b=0/Su5EjUgtm1+oWnJrvK9PrIG1e4X0jKmEkfeGtm2t4FfW/DVeHmahPWR0rDBeXIa4 3khltmtdOv0K0bGSWSV3vIeIm/+FBUEt/Paa9gQhLlhRikQT89DX+IIcaHN6bQgXS8sQ 6ubFsm8jTqdvwd0z2yga1lzX7nkqst4x/pSypHwyYiL06LksRpNB9t3xIbYpsum90pgr j0Wrid/IcH0viQgRLwWej5u0q7s1BsxY1daW53XcoS+9v+ubHctlEdV5rl31LiaPlkyD 3uU8bm4VUlbWEPSGhBvIl/nH8VngHRKNDHKZkQSR9kvpm3hNPxe9KJ3dEfUy2NCUhjFj qUaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718802402; x=1719407202; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=I+75MX5UTH/ARZuUR8ceJtlBW/QcwLCoU0g7s9goO5U=; b=k1Gu9b6IMezgb9oTsDUPDyQmFE5GPtXYluGFlivGjudnjcQknwNGcTX9/78ieGUybR QAbahiwW5JGGCadQC71gvrUk8pvmDRyRHI6iIAzdjunooX9/vg2Z1qWsimyo9Ijn+/YF J/lACzrt7RsHKSeK0oaLrp1Siqo5RWmrwxMP4sgWgRu0J4pmkm8NXr5w/a0oTXxirIbk /rtQap2nsDZC0GETaloIzRJzE2cjM2Av6vvIfJCnSqENCDN4DLvVvhqMz7ChafewvYKc Z0ifnn7LLUymwsitMP74GlwTIAMTRvMdZ/UIaspUEIZzRtw86T2fpRIwEaJ/Jm3J0LPj wtGw== X-Gm-Message-State: AOJu0Yz9IZRrAc9bCtsMmZ0XPvoR7RjxpHZSS437TzuseCDgEnIKa/6L YCuczcPDuUHky5oAjoxWBXMoQxb+iPdtzM/jCyxEaaA17iN/h0AGrByRrZVvrUNQR2q/mhRUWIB QzA== X-Received: by 2002:ac2:5bc9:0:b0:52c:a04b:8a54 with SMTP id 2adb3069b0e04-52cca1ea2ebmr806760e87.22.1718802400220; Wed, 19 Jun 2024 06:06:40 -0700 (PDT) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ccdbc84casm71265e87.69.2024.06.19.06.06.39 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 19 Jun 2024 06:06:39 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 19 Jun 2024 16:06:39 +0300 Message-Id: <20240619130639.22693-1-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] movenc: Add an option for resilient, hybrid fragmented/non-fragmented muxing 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 Cc: dennis@obsproject.com, timo@rothenpieler.org, ffmpeg@gyani.pro Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1gOZInDsM+dM This allows ending up with a normal, non-fragmented file when the file is finished, while keeping the file readable if writing is aborted abruptly at any point. (Normally when writing a mov/mp4 file, the unfinished file is completely useless unless it is finished properly.) This results in a file where the mdat atom contains (and hides) all the moof atoms that were part of the fragmented file structure initially. --- v3: Renamed the option to hybrid_fragmented. --- doc/muxers.texi | 11 ++++++ libavformat/movenc.c | 62 +++++++++++++++++++++++++++++++--- libavformat/movenc.h | 4 ++- libavformat/version.h | 4 +-- tests/fate/lavf-container.mak | 3 +- tests/ref/lavf/mov_hybrid_frag | 3 ++ 6 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 tests/ref/lavf/mov_hybrid_frag diff --git a/doc/muxers.texi b/doc/muxers.texi index 6340c8e54d..ce93ba1488 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -569,6 +569,17 @@ experimental, may be renamed or changed, do not use from scripts. @item write_gama write deprecated gama atom + +@item hybrid_fragmented +For recoverability - write the output file as a fragmented file. +This allows the intermediate file to be read while being written +(in particular, if the writing process is aborted uncleanly). When +writing is finished, the file is converted to a regular, non-fragmented +file, which is more compatible and allows easier and quicker seeking. + +If writing is aborted, the intermediate file can manually be +remuxed to get a regular, non-fragmented file of what had been +written into the unfinished file. @end table @item movie_timescale @var{scale} diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d1517870fc..83a409f109 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -110,6 +110,7 @@ static const AVOption options[] = { { "use_metadata_tags", "Use mdta atom for metadata.", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_USE_MDTA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, .unit = "movflags" }, { "write_colr", "Write colr atom even if the color info is unspecified (Experimental, may be renamed or changed, do not use from scripts)", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_COLR}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, .unit = "movflags" }, { "write_gama", "Write deprecated gama atom", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_WRITE_GAMA}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, .unit = "movflags" }, + { "hybrid_fragmented", "For recoverability, write a fragmented file that is converted to non-fragmented at the end.", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_HYBRID_FRAGMENTED}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, .unit = "movflags" }, { "min_frag_duration", "Minimum fragment duration", offsetof(MOVMuxContext, min_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "mov_gamma", "gamma value for gama atom", offsetof(MOVMuxContext, gamma), AV_OPT_TYPE_FLOAT, {.dbl = 0.0 }, 0.0, 10, AV_OPT_FLAG_ENCODING_PARAM}, { "movie_timescale", "set movie timescale", offsetof(MOVMuxContext, movie_timescale), AV_OPT_TYPE_INT, {.i64 = MOV_TIMESCALE}, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, @@ -5993,10 +5994,30 @@ static int mov_write_squashed_packets(AVFormatContext *s) return 0; } -static int mov_finish_fragment(MOVTrack *track) +static int mov_finish_fragment(MOVMuxContext *mov, MOVTrack *track, + int64_t ref_pos) { + int i; if (!track->entry) return 0; + if (mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) { + for (i = 0; i < track->entry; i++) + track->cluster[i].pos += ref_pos + track->data_offset; + if (track->cluster_written == 0 && !(mov->flags & FF_MOV_FLAG_EMPTY_MOOV)) { + // First flush. If this was a case of not using empty moov, reset chunking. + for (i = 0; i < track->entry; i++) { + track->cluster[i].chunkNum = 0; + track->cluster[i].samples_in_chunk = track->cluster[i].entries; + } + } + if (av_reallocp_array(&track->cluster_written, + track->entry_written + track->entry, + sizeof(*track->cluster))) + return AVERROR(ENOMEM); + memcpy(&track->cluster_written[track->entry_written], + track->cluster, track->entry * sizeof(*track->cluster)); + track->entry_written += track->entry; + } track->entry = 0; track->entries_flushed = 0; track->end_reliable = 0; @@ -6007,7 +6028,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) { MOVMuxContext *mov = s->priv_data; int i, first_track = -1; - int64_t mdat_size = 0; + int64_t mdat_size = 0, mdat_start = 0; int ret; int has_video = 0, starts_with_key = 0, first_video_track = 1; @@ -6113,7 +6134,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force) mov->moov_written = 1; mov->mdat_size = 0; for (i = 0; i < mov->nb_tracks; i++) - mov_finish_fragment(&mov->tracks[i]); + mov_finish_fragment(mov, &mov->tracks[i], 0); avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT); return 0; } @@ -6182,9 +6203,10 @@ static int mov_flush_fragment(AVFormatContext *s, int force) avio_wb32(s->pb, mdat_size + 8); ffio_wfourcc(s->pb, "mdat"); + mdat_start = avio_tell(s->pb); } - mov_finish_fragment(&mov->tracks[i]); + mov_finish_fragment(mov, &mov->tracks[i], mdat_start); if (!mov->frag_interleave) { if (!track->mdat_buf) continue; @@ -7169,6 +7191,7 @@ static void mov_free(AVFormatContext *s) else if (track->tag == MKTAG('t','m','c','d') && mov->nb_meta_tmcd) av_freep(&track->par); av_freep(&track->cluster); + av_freep(&track->cluster_written); av_freep(&track->frag_info); av_packet_free(&track->cover_image); @@ -7363,6 +7386,9 @@ static int mov_init(AVFormatContext *s) mov->flags |= FF_MOV_FLAG_FRAGMENT; /* Set other implicit flags immediately */ + if (mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) + mov->flags |= FF_MOV_FLAG_FRAGMENT; + if (mov->mode == MODE_ISM) mov->flags |= FF_MOV_FLAG_EMPTY_MOOV | FF_MOV_FLAG_SEPARATE_MOOF | FF_MOV_FLAG_FRAGMENT | FF_MOV_FLAG_NEGATIVE_CTS_OFFSETS; @@ -7887,6 +7913,11 @@ static int mov_write_header(AVFormatContext *s) FF_MOV_FLAG_FRAG_EVERY_FRAME)) && !mov->max_fragment_duration && !mov->max_fragment_size) mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME; + if (mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) { + avio_wb32(pb, 8); // placeholder for extended size field (64 bit) + ffio_wfourcc(pb, mov->mode == MODE_MOV ? "wide" : "free"); + mov->mdat_pos = avio_tell(pb); + } } else if (mov->mode != MODE_AVIF) { if (mov->flags & FF_MOV_FLAG_FASTSTART) mov->reserved_header_pos = avio_tell(pb); @@ -8090,13 +8121,34 @@ static int mov_write_trailer(AVFormatContext *s) } } - if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) { + if (!(mov->flags & FF_MOV_FLAG_FRAGMENT) || + mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) { + if (mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) { + mov_flush_fragment(s, 1); + mov->mdat_size = avio_tell(pb) - mov->mdat_pos - 8; + for (i = 0; i < mov->nb_tracks; i++) { + MOVTrack *track = &mov->tracks[i]; + track->data_offset = 0; + av_free(track->cluster); + track->cluster = track->cluster_written; + track->entry = track->entry_written; + track->cluster_written = NULL; + track->entry_written = 0; + track->chunkCount = 0; // Force build_chunks to rebuild the list of chunks + } + // Clear the empty_moov flag, as we do want the moov to include + // all the samples at this point. + mov->flags &= ~FF_MOV_FLAG_EMPTY_MOOV; + } + moov_pos = avio_tell(pb); /* Write size of mdat tag */ if (mov->mdat_size + 8 <= UINT32_MAX) { avio_seek(pb, mov->mdat_pos, SEEK_SET); avio_wb32(pb, mov->mdat_size + 8); + if (mov->flags & FF_MOV_FLAG_HYBRID_FRAGMENTED) + ffio_wfourcc(pb, "mdat"); // overwrite the original moov into a mdat } else { /* overwrite 'wide' placeholder atom */ avio_seek(pb, mov->mdat_pos - 8, SEEK_SET); diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 08d580594d..d73f7f314d 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -85,7 +85,7 @@ typedef struct MOVFragmentInfo { typedef struct MOVTrack { int mode; - int entry; + int entry, entry_written; unsigned timescale; uint64_t time; int64_t track_duration; @@ -114,6 +114,7 @@ typedef struct MOVTrack { int vos_len; uint8_t *vos_data; MOVIentry *cluster; + MOVIentry *cluster_written; unsigned cluster_capacity; int audio_vbr; int height; ///< active picture (w/o VBI) height for D-10/IMX @@ -282,6 +283,7 @@ typedef struct MOVMuxContext { #define FF_MOV_FLAG_SKIP_SIDX (1 << 21) #define FF_MOV_FLAG_CMAF (1 << 22) #define FF_MOV_FLAG_PREFER_ICC (1 << 23) +#define FF_MOV_FLAG_HYBRID_FRAGMENTED (1 << 24) int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); diff --git a/libavformat/version.h b/libavformat/version.h index 4687cd857c..af7d0a1024 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,8 +31,8 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 3 -#define LIBAVFORMAT_VERSION_MICRO 104 +#define LIBAVFORMAT_VERSION_MINOR 4 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 62d298599c..fbd95070d0 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -5,7 +5,7 @@ FATE_LAVF_CONTAINER-$(call ENCDEC, FLV, FLV) + FATE_LAVF_CONTAINER-$(call ENCDEC, RAWVIDEO, FILMSTRIP) += flm FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf gxf_pal gxf_ntsc FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv mkv_attachment -FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov mov_rtphint ismv +FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov mov_rtphint mov_hybrid_frag ismv FATE_LAVF_CONTAINER-$(call ENCDEC, MPEG4, MOV) += mp4 FATE_LAVF_CONTAINER-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg FATE_LAVF_CONTAINER-$(call ENCDEC , FFV1, MXF) += mxf_ffv1 @@ -51,6 +51,7 @@ fate-lavf-mkv: CMD = lavf_container "" "-c:a mp2 -c:v mpeg4 -ar 44100 -threads 1 fate-lavf-mkv_attachment: CMD = lavf_container_attach "-c:a mp2 -c:v mpeg4 -threads 1 -f matroska" fate-lavf-mov: CMD = lavf_container_timecode "-movflags +faststart -c:a pcm_alaw -c:v mpeg4 -threads 1" fate-lavf-mov_rtphint: CMD = lavf_container "" "-movflags +rtphint -c:a pcm_alaw -c:v mpeg4 -threads 1 -f mov" +fate-lavf-mov_hybrid_frag: CMD = lavf_container "" "-movflags +hybrid_fragmented -c:a pcm_alaw -c:v mpeg4 -threads 1 -f mov" fate-lavf-mp4: CMD = lavf_container_timecode "-c:v mpeg4 -an -threads 1" fate-lavf-mpg: CMD = lavf_container_timecode "-ar 44100 -threads 1" fate-lavf-mxf: CMD = lavf_container_timecode "-af aresample=48000:tsf=s16p -bf 2 -threads 1" diff --git a/tests/ref/lavf/mov_hybrid_frag b/tests/ref/lavf/mov_hybrid_frag new file mode 100644 index 0000000000..cd449712b9 --- /dev/null +++ b/tests/ref/lavf/mov_hybrid_frag @@ -0,0 +1,3 @@ +4871796f41234350f1b050317d0288a3 *tests/data/lavf/lavf.mov_hybrid_frag +358508 tests/data/lavf/lavf.mov_hybrid_frag +tests/data/lavf/lavf.mov_hybrid_frag CRC=0xbb2b949b