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 4B1864D0F4 for ; Sun, 9 Nov 2025 00:39:56 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'tIpYtNV9+4UyLh1fBIKbBCtBA7rUyle0fA8JjWY9lg4=', expected b'fBFrbHRn2VKtlLm7Mf0rKDIoYRLLcY21QWZJt+OmsXQ=')) 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=1762648783; 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=nxjYrGt60DBPRMMd5/7kycjIPdZMJJLxvtRMRexPg3E=; b=bSqbELhzKLeH+XL9U4dSUHJWrotEVWB5j71MOwTdVyRNte60RCzyyrWHAfEB0qYLMNfdX teG3L8TCbWSEuoo+XMziYFqyT9/zJ7cYgYtf5+0excq83mqAhvVs01rNVfP5vvh0ZIcVICh z1mCThZrGKlRaKbdfOwhqMYSpcUh49e5mCjv+bHnD0GVaPlhmjKwuikmobxSrsZS2v3+t0m RMUvWHUVI9qS1jQd1mjtpE9qP3roIwZF78OqRpQSUkZR+YWES0BPqJhVKptDz3IeXxxMVlz LkOimVy5LwZ/e7TtFoLYzmjZ5o/aGin2o+G/jrVVhWTssz4tMjZILpfky05Q== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C2B4468FB35; Sun, 9 Nov 2025 02:39:43 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762648764; b=Ks6EQvYsN3NsNVll65VDAcBfoCIq27ncTZpXuHA2JKd+ivct8KrfHAb3VO+O2e9/582yM dkqYAbHIM/Q9n1d6xeViUyvOsbderFJ3UjlcAQ6Rk/cOrm9PhOp9k4RpGcDoPgFhu8k4DiG Mb915DqVeRVAhTgtUv/xc7YshLyCJOZtiYWSDgs6dx/xZ+/c5VTdUpDXXkmlkLiWVeYm2qS i58bcMO3rbfZiWReccoE+uZgstyYvoBvRdcs5euqBO2IY+BqJH90lO/VehLZrdxVqgmu2T5 ptD6kU+PTqo89XBYTzwqdnzakjMkEizDO8FADiYlMdU69iTNKJvIy0LtgtiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762648764; 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=BZYNmX3Ag/wBRKjn4RV/CqBLfOUSc4bCyUF51IcjWeg=; b=D+A2O46YN3KYDoGGC1LVZHlpwtFk/bH5YHdC4j4sL5+gtaDlzD+h3tKnN/x6RTqrQzUAx C8e7+NG5Fr8EOBToZgtaAbmbIw93klOSNJ5S73Nfr6wD801D0BiMy4V6XbMw6qtSUin5+Td w8BGW4gwJZikmwDL6WvUOWiVk4sBYx1JkZH/g0g6AI/kLONwo2XD2j7VAwe7GAdAjIWTSef vXJ2mBG4pRGfXAG+dBOCOzeXX4wR//QU3u4dTX6pOo3oNxSBk4L1deYp8Cm+FBV64OanlfM A4FbxRwljA58YMvaxS3z+g/D9NVEllY/intQiPjtbwGGG8AtnVhGEH7Kwhig== 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-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 071086802D1 for ; Sun, 9 Nov 2025 02:39:09 +0200 (EET) Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-592ff1d80feso2091923e87.2 for ; Sat, 08 Nov 2025 16:39:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762648749; x=1763253549; 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=fBFrbHRn2VKtlLm7Mf0rKDIoYRLLcY21QWZJt+OmsXQ=; b=T2k6pX6pmOjE2uZ7TVp/kCTaULVQQEhDtGPwSYK3gF1Wk53la4twkAx+TN3ge6kplB ESUd7rgJJQAGXyy/QjTzozFYCAoiNwff1s5rXoIAInLBiG9JDE+C76Grm1HuEu7z+HI8 69wr6tivM+V+/gUM/misw+scGWzxgTAgihohu5tCXwenc0Wx6nSq37rNsCQzIF73qFsF yhh0RcF93T/lIzCiI2TisfhDXRyN+0ifZycr+buJLAJ1nlWMeBCWDokrgtvMkRypqsZl H65dnM7kZWOmo1/RWp3BINjD/S9YUqe/s9j8t/aMffRGqZhj7bTYs62om/s6M1gzpMOc m4Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762648749; x=1763253549; 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=fBFrbHRn2VKtlLm7Mf0rKDIoYRLLcY21QWZJt+OmsXQ=; b=nOkubQGqNnZvVu6r/ER7M/qugRWgbDxWY4UTO2hy9RCnMBoyEkcwFlJalSSPE8Lb1W Hr0UBepS0zDpHG4y4dyC7coDjMmLTUIj4hQoStbQtZD5qR6TVunI0BujMWuOlN6VQgdK tH8NtjmyKwftWiNoIHjTLgAFTHfZaBt27ixzD/1hjONFrYjtr6SAQ3rBOGHi6BC/fQqT HtDpsxtwd4lbi5Ltjnu9kt/NXpNplc3JwE6QvNSzz2nhnH3yGbktx7wj94zon7ibns7o /veP1jfzrdxOB6T9PZ9dAsB5P0/2e2CaArUW8r1EBTb+7yRwppPMYVobW1+g4pICWUOt pU9Q== X-Gm-Message-State: AOJu0YwlrdvjE7NRRkOn7zOEPQ6t8uDbXQNqI8wMrZebH9E4PrStCbnA Vwk6ee45GR3qYuloAuli65cNw3JMsELEmcXYJEaANvysb9/IVUzmksoLcDBMN3qtZ9g= X-Gm-Gg: ASbGncuMFUuhm9gv7btsjP2PMzHNuY/2hspUI7sslH1aKrDwEeir6rqfx3M84xGdWch 0lowWAOo9X53A5IPhnxCnXF6o1NyWxAugHxtgvYmNYk9u7OyQ2WoV7Oz4yzLllUebbPMfTXmt3c /aLHuFFcRhZ2Z5Da9vp4swYbCwqX/RNWb86gkwRyqmsQ5FM95QjsLSzczzKFxETZfmlmsKRCYjd Rh6fAxmi2dd98OZao/vQFoURG10H6t/dNaTdQQYD/YbqIMSgAnySAx2LKRt96ELhCOEeEOYwoz8 o+2U+rdNhdLcoy9h2LunvKxbIGMnddXJ3uPVjPCHW7Gcz3p3ICXCf9wvKx6TLni1w7Kuu6EzC7t emYfBlYBTFV06wlb9k7LOdcKjNZ/yH7t1Y6F5h9Wxm5uBC76tU6bAgWMqqvSzrcJSJfULNwbYEA Cu9dRZoxxdnmaN0R/312r9osQwr8yDWwV6/03SxL+NNsK51KF3g/+Y/w== X-Google-Smtp-Source: AGHT+IHt1zZIZYLtcwMf6tiLtoNzPSMjIE7yix5zTx8j8bguU0xfSu1Ci4A1AJ1vJk7agWSk2PmbaA== X-Received: by 2002:a05:6512:1093:b0:579:f0fc:46f7 with SMTP id 2adb3069b0e04-5945f21a4d0mr1113460e87.56.1762648748427; Sat, 08 Nov 2025 16:39:08 -0800 (PST) Received: from smtpclient.apple (18-67-50-84.dyn.estpak.ee. [84.50.67.18]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-37a5f0583dbsm23612131fa.10.2025.11.08.16.39.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Nov 2025 16:39:07 -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:38:56 +0200 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3864.100.1.1.5) Message-ID-Hash: JN4YZKJF5TO44WWYSGSQTORXDRM3G3OS X-Message-ID-Hash: JN4YZKJF5TO44WWYSGSQTORXDRM3G3OS 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 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; } -- 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