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 829FD4BC20 for ; Sat, 29 Nov 2025 12:10:52 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'TI7ZRjcK5uWfYsoZK/x2przeJDeQzKu786ItytbmJZ4=', expected b'TKoDa7/ERsdJlMwyKTK8w/j7J4WnMAoBknHsoEyNFbw=')) header.d=gmail.com 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=1764418237; h=mime-version : date : references : to : in-reply-to : 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=62kszRzOdrFEv3UpUsuHhIRxpk9QZNd4X5uTAHunJ0g=; b=pkO8dARRibqCqPBRaOkzFatfDw9BSL5i04zZezrYUWszQ1dJnoewfnYcVlewqiyyUurng ONRpxcuH2cycbgE9LlNJ6poC9tuwChvvEqgwnJrR5ymO/0b/LZWehbHakRCDe5X1nIjGbJm ehCn0pWRa2PGx45QM+t1j/zRorCVrTqqSJDjJyyXaRYKmDVcKFpTGtdqGtX+qXXOHqdEKlm UDsurWOdL5CcFi6gF5yzcBQRtEKUNN9ihY8Qcx1ydpcALFat9GkOI6b+6nrK7a+odGTDMMP /o3O0daW4dS3PlD4eR8u2fBWeiVer6+q/Rjr4W+S2jpX5hy2Eju0ddmjunEA== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 9F3056902AF; Sat, 29 Nov 2025 14:10:37 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1764418219; b=EnLfypgvpyu44ARjFzaL9x3K64O3bjljmDt5Vx66YEw9ePS6ezlVDG5ew72kO48P6i9Lt NMPwmFcyfAW6lj/lJsZRtoUtDkkv5iu5FI3uhA+m+1owPH7b8zLExCtH1ZiS+MRc3I0jzvQ wAMkF4sCxdVFYrKRJqc0VNKnx57GHhYhfxfAlJ49oojTCGxdvSLSnX1Z6SI0HS9+h1cpNrr wTzxPo/53WtK/P2LVvzvoImyPtkHiHWvBbuvZPTPW34nTDMgRSxO1uwoMkUfhRVGtilZ6XS UzEkIy/A3JXYn+iBNvq0V/RTj+d8Aokic+CTuzzILDT/t5+KDFBAPaXO59Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1764418219; 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=TI7ZRjcK5uWfYsoZK/x2przeJDeQzKu786ItytbmJZ4=; b=XwPWhmUKY/WwDpdj8b3MJnn0Iv+RPzIRGDumXTzrberioZEw3RyWmVvxfKRfrb1Kc7998 iINcnlCTOVa0t0sI0ff2TeasTq2D49gON+p1n0tl0lfkA2kWVixTQrfIv+tbEE8UtAV05hT kR0Vme6ITG0soKB93bWlzmSPtQBao+HdA8KyCe7wQA12DyUYEMw41XftjIJTHnUd4fHhZfm fStm2v0Lj32uUFzZKXx8mOUJ+xFbFphdaM5W1/S9GSWnAPhemyKNIOiGdN5A9LwQu5oadhg iv6XklXDcttk/y26D/z02r+nrETIpLhInq8XiYjz13Qma7xwQofJ6OgzjiSg== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=gmail.com; arc=none; dmarc=pass header.from=gmail.com policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=gmail.com; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=gmail.com policy.dmarc=quarantine Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 47F0768FD81 for ; Sat, 29 Nov 2025 14:10:06 +0200 (EET) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-37d13ddaa6aso20187541fa.1 for ; Sat, 29 Nov 2025 04:10:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764418205; x=1765023005; darn=ffmpeg.org; h=message-id:in-reply-to:to:references:date:subject:mime-version:from :from:to:cc:subject:date:message-id:reply-to; bh=TKoDa7/ERsdJlMwyKTK8w/j7J4WnMAoBknHsoEyNFbw=; b=CbPZvEO7qqzwKmVSlz9p3fZamiG39QO22a8ZEFtj9+3GhXEIkkw4wgbDdwq3KF8UMQ mSjVx8OSS9h0gS9QlLRpNqPpvgNl+KshFilhjTzomFosRKZE5ptIbezD7qIQ4GkmGuTR QGE8s7p211mar1dX25BLj1xAGQUpDLKeyG6qUElZETbShGyJtTwKVyLBJKNFi2Q1IOEG hTNYU2i0uI5uvJxi8t3rEEXdko7XF15h4S1CYkwoXV3Wki4IwkMSw2ohbg+e80cqZwzt xe6bfr3BrY1Y02jVJAnBSW14VWZtqN3wOhXsUrauRmRbFNstEpk52ji3BIyrY9RaWkLl E28A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764418205; x=1765023005; h=message-id:in-reply-to:to:references:date:subject:mime-version:from :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TKoDa7/ERsdJlMwyKTK8w/j7J4WnMAoBknHsoEyNFbw=; b=o4/pTEgkhbUN+TCAmHOzzWSwxbwPOIEMO7y1PkzwqZ9PkLunebR1AS2srCoibBQsxc cS5n3kdGSRgbQE62ki2YbDz69Cf1Ik4dOY9Q4QanF1aDIyvJIm3aYvMagiZ/7uphiUTA rc7rhC7jiK7kvm8TSh20GqDiC5Gr+ag48KIzQayxAkYhEtXWzGvLv9bn1t6hCpI93vQX FYVG37h/69L/IUz9nxPLy8nUfjC77SZENdM4rs+hnF/zczya/8/qnepTsv7RoYYwbRKm W5VmdZj8zJLpWHYuWW2K91Uj4Fnjq2/Wv2m3AR4Bm1392H7q9SukoOl7OupJA0SpRbKP z0Ew== X-Gm-Message-State: AOJu0Yznxe4xVLwTO7tWxffszkzNxFA/1QRMkMkopb90hKyLqLBl62cb 1/GQamyj4w4c6ztBBghJ1ZlLKpLAjzAhxgjPo697NpzzeL1+Y714tPNEOGtKmkaE X-Gm-Gg: ASbGnct6OVguxsnrwGf7m57X27rUyMPogwQ4/T2P+j3dDMU0jxOBIsnJVBfg7BemKul 91IppwYhjjHusDFSP7kQfc6jo6ziZ5bi1S23ESgYj2HgqQ8d/lD/fX1QOtPbcHkx2Y0eKWpGtG3 weI9rRq2RSOWdVqGeeZ0876ANCXtsVAXuoSvxttTswGDIa6DumpPxEhUxUeCutenNkhu1f+qA6r AuGFbrkPy8FAKOvE+Udsd3Vhepf/T+WCFWNpLYCqoDeh2pIHNEwxxcO9fZ/4s6UPb89ohJ5+9dE n3pA1LY2RfuSyNYEC7U5wk1te5+mB7lwGUZjelAVb/e4p1AjVMzG9ZeMFEGDdm0GdCR5Qi9pbzf j1xoJduTwTQHDcsgFJSiGqJTcOkafeJQAYKwYJH84qiyqUbl70ccS8Cqn4ainsbcPFWOW3Uo33Z l9UG7UQ8U1wfdMP0xE0/sgjEcJVSW0/S2YRIdXCCp/+uYrr5BbEpsrdDjlD3qTVlI7 X-Google-Smtp-Source: AGHT+IG35gDKW2egDHJ4kBoBtS3aVAZIq6LPffSfR5DPh4lzD1LFcbPn6Gtpj3kfDbZXRqt0canDCQ== X-Received: by 2002:a05:6512:400c:b0:57b:7c83:d33b with SMTP id 2adb3069b0e04-596a3eebe6emr10854477e87.47.1764418204414; Sat, 29 Nov 2025 04:10:04 -0800 (PST) Received: from smtpclient.apple (18-67-50-84.dyn.estpak.ee. [84.50.67.18]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-596bfa50070sm1913426e87.92.2025.11.29.04.10.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Nov 2025 04:10:02 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.200.81.1.6\)) Date: Sat, 29 Nov 2025 14:09:51 +0200 References: To: FFmpeg development discussions and patches In-Reply-To: Message-Id: <689E7F64-3828-4F97-B14D-639131F68AF6@gmail.com> X-Mailer: Apple Mail (2.3864.200.81.1.6) Message-ID-Hash: ZNFKXYIWQ6DUIJ6VCY34Y4KJPTWFDWOW X-Message-ID-Hash: ZNFKXYIWQ6DUIJ6VCY34Y4KJPTWFDWOW X-MailFrom: SRS0=JQm+=6F=gmail.com=v.sobolev@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-Content-Filtered-By: Mailman/MimeDel 3.3.10 X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] Re: [PATCH] avformat/mpjpegdec: add support for X-Timestamp and X-Framerate headers 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: Vladimir Sobolev via ffmpeg-devel Cc: Vladimir Sobolev Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: Please see updated v2: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20251112124306.68975-1-v.sobolev@gmail.com/ I've addressed all comments. Thank you. > On 9. Nov 2025, at 02:38, Vladimir Sobolev wrote: > >> From 31d73c6774c1ea6d621db57f26439e297cc23c3d Mon Sep 17 00:00:00 2001 > From: Vladimir Sobolev > Date: Sun, 9 Nov 2025 02:28:13 +0200 > Subject: [PATCH] avformat/mpjpegdec: add support for X-Timestamp and > X-Framerate headers > > Add support for parsing X-Timestamp and X-Framerate headers from > HTTP multipart MJPEG streams. These headers allow servers to provide > accurate timestamps and framerate information for each frame. > > Changes: > - Parse X-Timestamp header (in seconds) and set packet PTS/DTS > - Parse X-Framerate/X-FrameRate header and update stream framerate > - Maintain backward compatibility (defaults to 25 fps if not provided) > - Add debug logging for parsed header values > > This enables proper timestamp handling for MJPEG streams that provide > timing information in HTTP headers, improving synchronization accuracy. > --- > libavformat/mpjpegdec.c | 69 ++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 65 insertions(+), 4 deletions(-) > > diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c > index 125b17585e..c90d7a2ad4 100644 > --- a/libavformat/mpjpegdec.c > +++ b/libavformat/mpjpegdec.c > @@ -22,6 +22,9 @@ > #include "libavutil/avstring.h" > #include "libavutil/mem.h" > #include "libavutil/opt.h" > +#include "libavutil/parseutils.h" > +#include "libavutil/eval.h" > +#include "libavutil/intfloat.h" > > #include "avformat.h" > #include "demux.h" > @@ -34,6 +37,11 @@ typedef struct MPJPEGDemuxContext { > char *searchstr; > int searchstr_len; > int strict_mime_boundary; > + AVRational framerate; /* framerate from X-Framerate header */ > + int64_t timestamp; /* timestamp from X-Timestamp header */ > + int has_timestamp; /* flag indicating if timestamp was set */ > + int framerate_set; /* flag indicating if framerate was set in header */ > + int framerate_applied; /* flag indicating if framerate was applied to stream */ > } MPJPEGDemuxContext; > > static void trim_right(char *p) > @@ -97,7 +105,8 @@ static int split_tag_value(char **tag, char **value, char *line) > static int parse_multipart_header(AVIOContext *pb, > int* size, > const char* expected_boundary, > - void *log_ctx); > + void *log_ctx, > + MPJPEGDemuxContext *mpjpeg); > > static int mpjpeg_read_close(AVFormatContext *s) > { > @@ -118,7 +127,7 @@ static int mpjpeg_read_probe(const AVProbeData *p) > > ffio_init_read_context(&pb, p->buf, p->buf_size); > > - ret = (parse_multipart_header(&pb.pub, &size, "--", NULL) >= 0) ? AVPROBE_SCORE_MAX : 0; > + ret = (parse_multipart_header(&pb.pub, &size, "--", NULL, NULL) >= 0) ? AVPROBE_SCORE_MAX : 0; > > return ret; > } > @@ -146,6 +155,12 @@ static int mpjpeg_read_header(AVFormatContext *s) > st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; > st->codecpar->codec_id = AV_CODEC_ID_MJPEG; > > + /* Default framerate is 25 fps, will be updated from headers if available */ > + MPJPEGDemuxContext *mpjpeg = s->priv_data; > + mpjpeg->framerate = (AVRational){25, 1}; > + mpjpeg->framerate_set = 0; > + mpjpeg->framerate_applied = 0; > + mpjpeg->has_timestamp = 0; > avpriv_set_pts_info(st, 60, 1, 25); > > avio_seek(s->pb, pos, SEEK_SET); > @@ -167,7 +182,8 @@ static int parse_content_length(const char *value) > static int parse_multipart_header(AVIOContext *pb, > int* size, > const char* expected_boundary, > - void *log_ctx) > + void *log_ctx, > + MPJPEGDemuxContext *mpjpeg) > { > char line[128]; > int found_content_type = 0; > @@ -235,6 +251,33 @@ static int parse_multipart_header(AVIOContext *pb, > av_log(log_ctx, AV_LOG_WARNING, > "Invalid Content-Length value : %s\n", > value); > + } else if (mpjpeg && !av_strcasecmp(tag, "X-Timestamp")) { > + double ts = av_strtod(value, NULL); > + if (!isnan(ts) && isfinite(ts)) { > + /* X-Timestamp is in seconds, convert to AV_TIME_BASE */ > + mpjpeg->timestamp = (int64_t)(ts * AV_TIME_BASE); > + mpjpeg->has_timestamp = 1; > + if (log_ctx) > + av_log(log_ctx, AV_LOG_DEBUG, > + "Parsed X-Timestamp: %s -> %"PRId64" (%.6f seconds)\n", > + value, mpjpeg->timestamp, ts); > + } else if (log_ctx) { > + av_log(log_ctx, AV_LOG_WARNING, > + "Invalid X-Timestamp value : %s\n", value); > + } > + } else if (mpjpeg && (!av_strcasecmp(tag, "X-Framerate") || !av_strcasecmp(tag, "X-FrameRate"))) { > + AVRational fps = {0}; > + if (av_parse_video_rate(&fps, value) >= 0 && fps.num > 0 && fps.den > 0) { > + mpjpeg->framerate = fps; > + mpjpeg->framerate_set = 1; > + if (log_ctx) > + av_log(log_ctx, AV_LOG_DEBUG, > + "Parsed X-Framerate: %s -> %d/%d fps\n", > + value, fps.num, fps.den); > + } else if (log_ctx) { > + av_log(log_ctx, AV_LOG_WARNING, > + "Invalid X-Framerate value : %s\n", value); > + } > } > } > > @@ -311,10 +354,21 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) > mpjpeg->searchstr_len = strlen(mpjpeg->searchstr); > } > > - ret = parse_multipart_header(s->pb, &size, mpjpeg->boundary, s); > + /* Reset timestamp flag for each packet */ > + mpjpeg->has_timestamp = 0; > + > + ret = parse_multipart_header(s->pb, &size, mpjpeg->boundary, s, mpjpeg); > if (ret < 0) > return ret; > > + /* Update framerate if it was set in header and hasn't been applied yet */ > + if (mpjpeg->framerate_set && !mpjpeg->framerate_applied && s->nb_streams > 0) { > + AVStream *st = s->streams[0]; > + st->avg_frame_rate = mpjpeg->framerate; > + avpriv_set_pts_info(st, 60, mpjpeg->framerate.den, mpjpeg->framerate.num); > + mpjpeg->framerate_applied = 1; > + } > + > if (size > 0) { > /* size has been provided to us in MIME header */ > ret = av_get_packet(s->pb, pkt, size); > @@ -353,6 +407,13 @@ static int mpjpeg_read_packet(AVFormatContext *s, AVPacket *pkt) > } > } > > + /* Set timestamp from X-Timestamp header if available */ > + if (ret >= 0 && mpjpeg->has_timestamp && s->nb_streams > 0) { > + AVStream *st = s->streams[0]; > + pkt->pts = av_rescale_q(mpjpeg->timestamp, AV_TIME_BASE_Q, st->time_base); > + pkt->dts = pkt->pts; > + } > + > return ret; > } > _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org