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 E30B84D0E8 for ; Sun, 9 Nov 2025 00:26:23 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'iFH8rGExxjoSmWNhuxdKrCdNj1LaBibX+mMgobghhH4=', expected b'eiFiORGDtmkxCe/oqX7ullmjHXxb6+B6kcqWT6jkrUs=')) 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=1762647974; h=mime-version : message-id : date : to : 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=ckn3f82F9OnLU4kbfzHMy3SxTl6Ox5aAFBPl/SYHkDQ=; b=A4jshEjWeZoMDnCsBhg8VssoB/M3iK0Pxh/z6ZCG1sMqs7Z4Jv0SiA2yTp6YEuYTAyetg 9QeOE/C1XZ+QemAJQbvHEvCMeJjqDqVenxQJNytr6CPJ2osAz50hflYZfB3GUss0loQ/KzM TsWWqzegHNUkr42ryTulwb8S0t1bNvNVXDrcpoKZK8wkFYbFVCoBQf9mZUDpc74faxT/9d1 utLWP6A/jHje8Kze/JprFXHwdDXopB+A1n+Y//poYa+jTlbm7IF9w4u2/Q9AGrzTl9c4cOE 2alIQm61+tsrEqCDf6KW97dwvJtMFH/WTRQfj/zXMYZaXARAMBPNW7V7QpCg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 485BC68FB43; Sun, 9 Nov 2025 02:26:14 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762647952; b=F0YB9GM/rv9qka8C66jdRhGDcdaC+HXar31FK3brvtCWXGwJVxVWxACzJI3j9E0CYswSF YzFwewpFB+n8s27/sPviK7SotiLXO6+YZMyK/ibbyOyooKGcbFpCqnteQrHRIoTiRKNB72A TD0feW3MWky/PGnNaOx+yD86iYwYhopQURtO2ShTtV23NRFng0cB0XZ847PMYDRuvuuR3kV 8/q8nQCERyWcfQH/0YnB31n9aF3fOCPqoDKR+2lZ1GdUHBGxuDEyKHyTIcWZVkNg/iYnBI8 vYZli23Y2rpqRsY8B3sb/6O6w7lQquXtcK1JQnL5fszU5vSgUPMBAgpsYlGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762647952; 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=fV0DuFiu52ckgX8QDS3xwAtOw2tECM6aRlGBNI5EdEY=; b=NNVV+mGyLpG3cp5ATT09jVkdqVhfNpWgvoYjm4IxnJ4deaN9hTE4ppT91FCiAJMYV7GcD fbt2kqViCqkBPaF6wnCahjftHM1NvLZgeF1W3CvPu+2rj2TUHxk+coRSlUQZygQJqh5YPrz 3rZ7NW+IDvlHmV2QgXQhGDmspKPjRLtCBQE9wXfnFkmXNE8wErpYgo9j6qaE6ARB3AUxCQ0 2k8QrD3cU8HKlpDw3dvGG4TtOlFnzzqucZDTLMPnRp/oIhUYE4B/tfXMQlRkbiljxYWhtZD 23NxW2Hp2WX03iDTliBgOBeBb/JcBgQZlmoTtDIGXcdXdc3P3juXZjSVjXNw== 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-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 198846802D1 for ; Sun, 9 Nov 2025 02:25:38 +0200 (EET) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-5942bac322dso1725510e87.0 for ; Sat, 08 Nov 2025 16:25:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762647936; x=1763252736; darn=ffmpeg.org; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=eiFiORGDtmkxCe/oqX7ullmjHXxb6+B6kcqWT6jkrUs=; b=ieFcHByfdMqSAYABrzJKxe8bIvYm5sFzBp380CBANHN3SbX17yWtd861tP7uXZ/SGZ +RrhAjYddYh5FXDcnhjr5MFG2tFvW6fy4IqJOdbpXEGffY77mTaWwWKv6gAeEmAqNYew s8rdG9QYp+e4W8ndtp7ntdM8rQ8np9juHgrZ0eYOG8X7YdmmN0fI75NHxBgLGrhMgClS ZKPDER7MRBsO8ka+YddIIY/F6AdfzZT1MY325nCAc2QDv7Btrm8ChKMfMK0TO5TD628N PsyoVFFUVaerj/yolyTVrCfvXWUKLkbRTaSB24KirCpLxOkSTIILP1x85WLIp6XXgxSa 5RWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762647936; x=1763252736; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eiFiORGDtmkxCe/oqX7ullmjHXxb6+B6kcqWT6jkrUs=; b=fi8g/KmWAJi0pbNVJl2mU8Oe1rGMCWPd93tkfb+ONYFstMuEu8sNz0H9GmqRYgMNry py+FZoxmjwS0PaLt3NE+9pbLQLpp8LYaPWFlkssJtgZy1paeqN/ORKKsgpshOVQ7yG3b kqf11XgVKNF6Tu0lsk5ndbetHOgqi48iDC7mHaozyQzCmLNbkuKugzCHImQd/ku8wdZi CGdKZU/o+juBwfjKUMZpyunbsWwlQVEI87Sml4KOnos8du136CJw10CWazWB5tLrOUzj bUvPFZVEFFkNStqYy4z0bCZ7tjmqpWsHyqPrEwYAn9CqFspVpuTJ0tUES6hzt+9WPAyj U4ow== X-Gm-Message-State: AOJu0YzUapibYSNvxGti9NUDpjSbar9CggAkihcHwsMzYqbPuHdfZjDC 7nA38SIz5TKqRkLFZp0mtegN9gdJO15gm6RavnmIflYvQ+FTbshGv5lrnWpOVOCRaWo= X-Gm-Gg: ASbGncvqw9LE+EV0MkFD0OAzcgtEi28lWMkJxGK+vvL+UYDPijEALBgYQl4QfeteAkS F/GfeE5OOpFuvWJx+FQs5v67VrBtL4WoNt2hyL92+vggOTdDH639/sSe1llmC38aUHoaHNOh3vg sTpZM4GIfhZ+QRs0AekeV23msAPYDxtBK4ej82DfZ33yLWyBUf/LA9Z9fRMxVq/9RNQcPR+4Jt2 G2Xqq+C0Kf9uFrCWQsqbaP5frhzxb19bgHtOrqU3rU4BPaqJcHeTiYgR1oKYlO0RzhzciROcdwV Bt7GfhAjG2KdWLb63n8C2ohiHOr7N7W4qWOy5LwbHSpbfO6k3f2hwRNVTWKXLOliFpyLBiwVMJP Pgy5z1xT1imd5/p7j+POG3DUjbQPV5FntDPBCSpa/yhBPnnYYp66YHGLKhj+dkb3MiqVCGJaZWf lLh86SnyECU63I5DhKYG5z5r9Ozmagq1tNUeKBfUPSQlU= X-Google-Smtp-Source: AGHT+IHTpFWeYppF4VQq/1lQDLDTg9KPs+ig+UkinIQe2lMf3lq7lKoQ0+C97XzKIeNz10rB/AY+ZA== X-Received: by 2002:a05:6512:1395:b0:594:2efe:ead5 with SMTP id 2adb3069b0e04-5945f207623mr1058899e87.53.1762647936305; Sat, 08 Nov 2025 16:25:36 -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-5944a0b779fsm2555767e87.56.2025.11.08.16.25.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Nov 2025 16:25:35 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Message-Id: Date: Sun, 9 Nov 2025 02:25:25 +0200 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3864.100.1.1.5) Message-ID-Hash: Z2B6RKRVK3DMKKM3UR3W36OZOFXFEISE X-Message-ID-Hash: Z2B6RKRVK3DMKKM3UR3W36OZOFXFEISE X-MailFrom: SRS0=dknr=5R=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-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [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: >>From a9c2970ea4c06f2503ce0089291c8d0bc1b3da4f Mon Sep 17 00:00:00 2001 From: 350d <350d@example.com> Date: Sun, 9 Nov 2025 02:06:23 +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; } -- 2.50.1 (Apple Git-155) _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org