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 1EADE44B3C for ; Wed, 12 Nov 2025 12:21:10 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'Zw2EBuzoLlJ1ssztsPU/fRfPuc4Jn6ybtCSyhAUFbjU=', expected b'fhorifnZC8lXKs9gG5Y2z0cU/178qzMN7WHEJA3cI5g=')) 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=1762950059; 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=sfcMFs6Yrxqb4aVtEip0CiKAeqYleqq1ZvZeovlib7A=; b=ZuiT5l3MG5V6QW6Aa0ZiGt9KASmUlbfoSZAWQ86o5kUBm98/Joa/NDy/GPAIdU82TcDQ4 sjYQ7x7jRLAOv/OADILpSXRa8zJcvU/izAJdBT6OMrOqKBVrX158d5sMtsmlB8INqE/9Can I/GFnr4A9iN4qNOnhk04Cvp+xwB+B9Tz3ZZ5VHnLJvkCQCvlt/h+1Iflt622I1qMWOSFg9R Zxq6PuZUjM0IjcKXTAaf5H7kJXeWuSnJr5YN/g8RImorZ7ntgMZsgkhvM/g5GxLRevxmHhX hKIGNnmqX2Hu4KGkgJj8F+49mc7en4OaGMgxesDCv5jYhTq6gbwhYRbLU3yQ== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 16D1A68FD51; Wed, 12 Nov 2025 14:20:59 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762950042; b=pj5hLjTixDgVIilNZlcIXY+oDR99r3t9+qETc6ax9LkXHV8k6vHsLvMbOR+7syMa8ZiH8 rj760DYhjzga6w8+zUjjkQD+xamlJQOXjULamuXKYrgzDOojbgaDjvt3uspqvRLVlD+9VXP b15oUtZfYsuaicI+7N6C/2T0095ROns6V6de4Ihb0SPQhCHYkjAA792jG4V5NIklcWG+v28 fGmLYvOZ5K5HtZcu4fOZRXAwWoONzDp1+ZLjSyCSLfKcAwIUlDesEq84ZmLwTONxIFeAl9o 7DbVex6BV2N3QY3dMR+8f9iAf5mjLiXL7FRkh3FwgBDYkmAGfaEa5xHis03A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762950042; 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=QX9Lp5VaXePwt9TwP2K6KBwsTqzHj3245zvmyMlwzA8=; b=Fb3voIXOQk85BxEfBpZU2/yazQh+HW0HNRLMiVejp+F/HwvnA9Q5Uy5TePBijm+o3XLQ0 ntiYBtrUeb/DJvQC+QA8FilkNybCy3mvS6Yt46vF7BsbtoVwoJJUBi5FnARwQpQ8AEuvRbp vnzDHuJ90xifODt+m2t5RNojm1dZD5j5Pf1A8Qo7GI3sMiebi27jOSRY3VLR61XXZDbynDi Ldl3CcZlm9/mrCDOwVsbsPvdMX1eTwqzZik+DFRKbJ04KkgvUevTeM9cALGn1pvhnUvICor ICeAKZUIfL0lZx+QKagOo8yGUYSEN7OynsxpK6jk38mplwShlD/xkH5FoeHQ== 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-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 74BF768FC0C for ; Wed, 12 Nov 2025 14:20:30 +0200 (EET) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-59445ee9738so531160e87.3 for ; Wed, 12 Nov 2025 04:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762950029; x=1763554829; 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=fhorifnZC8lXKs9gG5Y2z0cU/178qzMN7WHEJA3cI5g=; b=Opy8nQnsIhC95jb8NbN4Wb4IRl809b+KanAkaTrXLO1KhOVLpME0gB0iQqRYytcZ32 76oeqehGqjgZEzrzDnDxmj+5ER/Iptj2lEUH5SHNapsSp86H9nojRm5Amxf9L2d2CDq7 22HN7Ew8EiCavT1+4riSeHFYrPmFT0Zdffopf8QRHtc7sJfI7o1Rq6hR0vIVKqh9fJMC YjAJH/+EB0mymD7k4edK8kKQKiSHzFa4C0EUzY2rkKDef0mMB6rSdllZAWxtcSjzIcuC r/wpqI4mTFNs0BNi7QP4XB+IQc40rvT2cp5tz3qQUTeLwJ7lEnuyNY1ojOentaAUQx0Z XzPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762950029; x=1763554829; 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=fhorifnZC8lXKs9gG5Y2z0cU/178qzMN7WHEJA3cI5g=; b=lx2SB4zsWcs4/Ul4bV1BGZgJt824irMo8ig7RsJkstaTwZCkLwzSewAtYLicQSMp4K X181rYLVQGguKjwlQ3d3vvmYN1PFavTdc14yfNAhFuAEoWi/7RhQM/yAqkVkA9g0Z9vf b03X68Q4ZLgk7EMzHr646M9jxbFGgQKIa/URju1YOz7THU5Un0ru2p4slWEGm+KOCjcN /S3jTf2h58T+INJCyWKXuwr/MZXcFBEqJvKVKw8RjhA0JUqPvUxsU7BljexaDPjoxBEl DDtRGcIBwogOpfsxRd5QSoZO09xdM7za/eyrUv1hglxRjoMiGaNHkjYKxiBfswCIgTbn D0vw== X-Gm-Message-State: AOJu0YxbbyzAMsm1AaTrSEIzJ1NumPUFfgeTRALI0f8buncm3J8KUYyU w/ft+QkvZ5uswdbhk/KAMfD2f0VhjBHUoKnkFGNzjAYCQgHQzIsxeGvNnbwXBCS2 X-Gm-Gg: ASbGnctwYGHb0elQAnnjnGBKbX2rr8QSgYCGJxnSZK8tIoDtiaK2+8wZrMW1D7OX9pT rWuu22MB5jJNlH1eVbehvlb+U7Y+Wy9bKX+H2W6V3TyP/g1tpIV1tT06sCGKfFdlSdDwkXLERN4 wjWvs1EZDNsrs/donJKJGfpuzvQ6degUW/oOj1t2roAI9BAiqvOmSCoitrmFrwBE4PMqnCpOaiR 1Cu8XqKtk4pnZtQn3YJYObu7PdmhZFJfPTnrpuuTa5GQTakAKCYIyvUzzRJT9RfqQOMp8qqUIJ+ 16oa8FL6sxAU0ifFOpeDRZU7ADgAqkw+M7e2YafbMrwWvQcfwHEqE920R9xxj0U2XwC15ZL9729 0yQqW/ldP6Sco99vO/hPqFBCOFLA1cXLpSZlfzK6JqJ9r6/0sHe6Y1QfUhmCK5DIjgRAg4moyeO QheFqSXZCascLRYiQWdlLNthQk8RBa/T5KrA9Kz4OY0jAdJwlJ X-Google-Smtp-Source: AGHT+IFRXYJOtEgZVPBQrggSCtUwY/vv0fblUW93g0tApNAuM44KD4tjb69kp9RKuA/E1jhojYZuCQ== X-Received: by 2002:a05:6512:68f:b0:594:25c9:2c6e with SMTP id 2adb3069b0e04-59576df9e4bmr755946e87.25.1762950028771; Wed, 12 Nov 2025 04:20:28 -0800 (PST) Received: from smtpclient.apple (239-87-235-80.sta.estpak.ee. [80.235.87.239]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5944a019efesm5798525e87.34.2025.11.12.04.20.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Nov 2025 04:20:28 -0800 (PST) Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.100.1.1.5\)) Message-Id: <597A0162-D7F3-4002-BADC-81494F6D7AD6@gmail.com> Date: Wed, 12 Nov 2025 14:20:17 +0200 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3864.100.1.1.5) Message-ID-Hash: P4ZBNHTGKFDVYNX3ZYNYZLKANADUPPQA X-Message-ID-Hash: P4ZBNHTGKFDVYNX3ZYNYZLKANADUPPQA X-MailFrom: SRS0=0tHk=5U=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 v2] 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 947e91d855fd876fd3b7f4982d811c0d445f0b9f Mon Sep 17 00:00:00 2001 From: Vladimir Sobolev Date: Wed, 12 Nov 2025 14:18:49 +0200 Subject: [PATCH v2] 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) - Use AV_TIME_BASE_Q timebase to support variable fps - 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. Fixes issues from review: - Use isfinite() instead of !isnan() && isfinite() - Remove redundant if(log_ctx) checks when mpjpeg != NULL - Set timebase once in read_header using AV_TIME_BASE_Q - Set timestamps directly without rescaling --- libavformat/mpjpegdec.c | 67 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index 125b17585e..ed02459afe 100644 --- a/libavformat/mpjpegdec.c +++ b/libavformat/mpjpegdec.c @@ -22,6 +22,8 @@ #include "libavutil/avstring.h" #include "libavutil/mem.h" #include "libavutil/opt.h" +#include "libavutil/parseutils.h" +#include "libavutil/intfloat.h" #include "avformat.h" #include "demux.h" @@ -34,6 +36,10 @@ 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 */ } MPJPEGDemuxContext; static void trim_right(char *p) @@ -97,7 +103,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 +125,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,7 +153,13 @@ static int mpjpeg_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = AV_CODEC_ID_MJPEG; - avpriv_set_pts_info(st, 60, 1, 25); + /* 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->has_timestamp = 0; + /* Use AV_TIME_BASE_Q timebase to support variable fps via X-Timestamp */ + avpriv_set_pts_info(st, 60, AV_TIME_BASE_Q.num, AV_TIME_BASE_Q.den); avio_seek(s->pb, pos, SEEK_SET); @@ -167,7 +180,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 +249,31 @@ 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 (isfinite(ts)) { + /* X-Timestamp is in seconds, convert to AV_TIME_BASE */ + mpjpeg->timestamp = (int64_t)(ts * AV_TIME_BASE); + mpjpeg->has_timestamp = 1; + av_log(log_ctx, AV_LOG_DEBUG, + "Parsed X-Timestamp: %s -> %"PRId64" (%.6f seconds)\n", + value, mpjpeg->timestamp, ts); + } else { + 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; + av_log(log_ctx, AV_LOG_DEBUG, + "Parsed X-Framerate: %s -> %d/%d fps\n", + value, fps.num, fps.den); + } else { + av_log(log_ctx, AV_LOG_WARNING, + "Invalid X-Framerate value : %s\n", value); + } } } @@ -311,10 +350,20 @@ 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 */ + if (mpjpeg->framerate_set && s->nb_streams > 0) { + AVStream *st = s->streams[0]; + /* Only update avg_frame_rate, timebase should remain 1/AV_TIME_BASE for variable fps */ + st->avg_frame_rate = mpjpeg->framerate; + } + if (size > 0) { /* size has been provided to us in MIME header */ ret = av_get_packet(s->pb, pkt, size); @@ -353,6 +402,14 @@ 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]; + /* Use AV_TIME_BASE_Q as timebase for timestamps */ + pkt->pts = mpjpeg->timestamp; + pkt->dts = mpjpeg->timestamp; + } + 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