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 9D5094C417 for ; Wed, 12 Nov 2025 12:31:04 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'iJcl4QTTEDq01g9ln4qz5oaFCLIPtO0IXRm9JE91N1M=', expected b'a3+WjvGaMqtjLOvUVddGckLKfTJWuJ3L60n6QU/L/Ss=')) 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=1762950647; h=to : date : message-id : in-reply-to : references : mime-version : 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=Zn1y/xLdwCfpeZwf1gkK9i8OWuBeuBhnmMXMJZZMqjA=; b=f218aI7VckYK14zIkzpgboqFTA37GS3DFV5HTOwfIZ5gWtmvzo0C40w+1UrgKltQ7qG/Y xfxX2wgjULUMPvaNUpyRO0YuLf3w3tCGS8xZ+bYXdCiG0cEGBflTLAyEOkE6ANAR48W4Jcu suXyHMYih2ViJIZMdtLQxOJlFKrYrj1Nh/wlVD5Csf4F9ZaUMSKusP9F9G5JeRjm7wEq5nP ou+yC2B3DKSuTv3cQ9VBG3BfPKKEdo0r/4Cwm3iA/3Zo5BKqOQn6YdLeC3+hNOGpNwmOybK uHEenn0RHCQyjOMX1cke/MbuExfSqbKCdS73mKrXU7zclKZdt3MOSasmQ7Lg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 24D0068FD9B; Wed, 12 Nov 2025 14:30:47 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762950624; b=B+HWglhKaP1Vnr1XF6pNAA4vmAc9lWkkPU4UkDFmF5hyrvDkkKTDAMACimaUJx7wwNkNH AsekFNZNyL3vpodIAf7Chsj0qS4zqWPH6gscdCApXLcdfJUiYXv+Er3/iZA3KpvwjQiaDbg ymOKx+TH29Xmoy1oQ5put52m94kpjmtkGmq4uI9qRozry0edesAzaFQNDd7Fyy5C9W+ivhI NZxt3/ebK7XuNfrrm7M7FxS4Sw8F/Lt5vtI3Jf6gFWnOuDwrPUO/ojyoas9dOArkK32jf3C H/zB3OMgAL9s+JXMED/KrK2w//G0ZiVsjXMon46pAg5icWwSjpR84Lm7HHVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762950624; 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=iJcl4QTTEDq01g9ln4qz5oaFCLIPtO0IXRm9JE91N1M=; b=hck+nXdQ9mxj0ziz1u2lLTMcfFSW2b9nP56KWPwbqXmfUbuk35loV9WH+32FSWCuAiqg0 1aGN9GY4qJ3W9MJLEJIU78CaWH5zzEjDWiPAO8MNd2HVbfO9pn0npaW4sjLclgPhKKkL2Ce aQr8nq4hS4NoQ+Tv8ZvQ73L5yrnA836C1YawLOWjVQbmxq05N08Ut0rfMmaYS7VVHWQgoGy rIuddlF7DdOAA9g75LkAKdVcRf3FudJ1LQ59ZhUO7fuxSFZalS2298QJkpFQ9GkYc88/5w8 awt6vhHMTE9pRp44ZO2zGRGrlpiOMg/NGGLc+O9D3PhIcZ/aNTmfy8pqfn3Q== 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-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 19C4C68FBB1 for ; Wed, 12 Nov 2025 14:30:11 +0200 (EET) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-5957e017378so14820e87.3 for ; Wed, 12 Nov 2025 04:30:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762950610; x=1763555410; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a3+WjvGaMqtjLOvUVddGckLKfTJWuJ3L60n6QU/L/Ss=; b=MVjEikjcbgOT4Ywko+UGhXrUetnBP0TQ46Qm0lKnq65iewHv6G8zuq4BOjM4csmZTB yDOZvJZRd328rAAG0GgSEQ9IqquolEnMjjyonB6Ew7GejyHQSf9mLtUszJ1AWmijFUJr FWtnAyxKoWxk1KUIVTLy91a7Jyq9GWV2C4PPiI0hjqrOdRC70KcNj/ZchyqMuHiiDkYM VqCWdBLWrNUuIsdgk4wCaZ2J+bN+rF/00fTTLeTcdZkmG+WXw3WP+qNB1Zrcugbx7s3E q+cuV9epgTVZIjbiO37YLnFFjXR9VfNFShKWbtp7W4zRznE4zgNSpoDS474BnFK7yLH5 a9cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762950610; x=1763555410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=a3+WjvGaMqtjLOvUVddGckLKfTJWuJ3L60n6QU/L/Ss=; b=hhARsyPLlv9NQ6Edo/vN+tvETaXkwIZVlV9eBuIH0OFUzjYqXCRnqCc8uhzcSWACoH IyX024Y7ncX0dk0BpfAOBA2xv47nYpbNBQkaYz4DJmSKHPDRekUiUOr326ynuXMCsPZ+ BAGGP0piLlXLCdx0y/uF0KEb19TlVhjLKEOU1twQ8nG87NEN3Czcw0Np03zg4l3Gqxvi 0m6YMQoKuhSyTCX+j6hTdcP3VCzW/gNCxWF7vCi1JNZS6UesrtE1nf2GOf+WdfB9wJ74 mI9PWB62mJqX/1kyGj6r1+3O5pfNaEDLja64YIUOSO/s0AYcCANblI6rngtOjnUS4Ih4 5HCA== X-Gm-Message-State: AOJu0Yy1mLPOOW3fF3nAMbHdvPMOve8v/UqnmrpnsH2QlzwA7/rAC1fk vTHpFzGDiekVJCUz+RB+8KnfsT1t9hG8LyV1Lfl/RWrafvDtl5dZ9Nxk3J3gz3IZ X-Gm-Gg: ASbGncslpZO9OTd/Fhh9CX7wmZV7w0VUB9hJ4JlgRZdOVxi2cBCkW0wfoxqpM3r5Xm/ izvIf8SmVqLlzgG7zCE+Ulw07cw2Th2egT9AiPzPrWuX8MXYdoHSRnrcoOEOCRXQRaGBFTya/E8 kAtoBl4ogKL51tYXbUIMo9rgBLmhAySnZa9pbQ9XalLq+ANs7ewRfSmKTGd6YqDHMKQqFXotY/x iNwi+iu4GKwp0kjuLgD2ngdy/yB9Mz+tmEEiClBOUe9gfmqWK7Yf+4ULtBtgH3ngRzGHCEKHXYj mbgX667/+f5ax0M4NEzn7GX7DDnotccorNsZOT/5c2hU0qbMmBeUIcF/8400Uui8BcR9XPhVgCY vCL2fJa+Gqi9aw37wAHX1SkCAduxPOHrp/OgattJlD+/E6+4pVKaKGBzsh17+S7rbGdIQWDdIbE Rcw6ybPh+8cG37+YSKOOFDnVcQrDCY+7reUefC6kTXVlIc1FaJlBnK/JsQ5Tqx9U87IQ== X-Google-Smtp-Source: AGHT+IF++mO2I1/Ivtc7uEx9J3z/y++K7yiN10aPtKPFTU5l0sxwH6wCjn7Pz1yAptD9liDmd25jsg== X-Received: by 2002:a05:6512:32c7:b0:592:fe0f:d9e with SMTP id 2adb3069b0e04-59576df08a4mr880902e87.7.1762950609380; Wed, 12 Nov 2025 04:30:09 -0800 (PST) Received: from localhost.localdomain (239-87-235-80.sta.estpak.ee. [80.235.87.239]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5957d765f7bsm159452e87.19.2025.11.12.04.30.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Nov 2025 04:30:08 -0800 (PST) To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Nov 2025 14:30:07 +0200 Message-ID: <20251112123007.59640-1-v.sobolev@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: KQODG7TO5PZ75MAZ24MHYMBL3I4KGIFI X-Message-ID-Hash: KQODG7TO5PZ75MAZ24MHYMBL3I4KGIFI 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: 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