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 CC3A24C444 for ; Wed, 12 Nov 2025 12:43:57 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'IULYqHze8cShkAZzr6gILlXzsoSGUhQ87flQr0+IGB0=', expected b'v+5fmGwCAY7MPYyVZLudOC7LuPv1B6JR/f81SEAWyAo=')) 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=1762951422; 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=fS+QdtumH0x3fAipWBGpLvQk/f4PYAubk4mt2YMhzww=; b=yrZV1/WOphYHWszXDE40OunNzAB2FA6OVrbtCWfZNutRX7QRTgZnogs368KJv+em+SXNL OPY3F4ZfhlAFuvE1IL5yDt6lrpZXjBt+17bIb0+/mQmGq71b6zEzXRMISyaTnznVT0KM11r ew9rjuu6T1g1flQJS6u0XPFJFyu5OI7l3v4CbMCzsZ54DihPfia6UcKhYh6GsdvGWAsmCPI 4c7nEmWaoO+o8ucBwo7BUKwDjMIE8X1DuViqUrl1awvJ9KUb9UQt364xT8lECrbK+BWUASH Fet9u6egfffB22dn5jbj9WCMitwnJ3p9kg4+Dpd6CPLWuKOsneM6csOYcaxg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id CF8D568FD4F; Wed, 12 Nov 2025 14:43:42 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762951402; b=H0wvwJwIeWcbfy+1yvEkoM+DtGdG/8DBBPyrLC/sS3bAZVW1bB5I110ojQBiw1gsEXBO/ UIqyRciy6zpOOXafoj8alK1GUj67Rii6xczkC4xZZEsybZIV8ZwqVXI/OTQaRUbUqJCNfJ/ T4JwNb/2kTW/b9L/aqSBrxT15JEVqSxIrrzM3KKZ9KhIDXA5tbhbMZ8j0gXMoriXrYCrZqf nDiAabyZSfTT+P1SkqiR8UxKo9gYMzxwhuys5ka4QySeFCVaMgM2oVQ4GGsj8yjZRZwr+tJ Q81DUYaVDUTTORb+UVRUVxWcjh39dq1EqvwlTioOycfXAPvYjb/f5spLNOyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762951402; 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=IULYqHze8cShkAZzr6gILlXzsoSGUhQ87flQr0+IGB0=; b=Z6Ql2ofFK2YFYhtnXPLcBSkrv9WK2IDn1B2b5prMHxfSI+ubsgG/2c86YOFkokOOx9G43 aYXNTg4GMr9CtU/OUdrsSsnpfPw4h17Tt58eVBKqSDqLA9gyrEvZyJZW6ICe7+V/ICslndc m0yNrd0zxZxaRfDDzl6VExErLHcKOLBx+t3KnctTYnXLtacUSQyFdeozXEPKcOcmXYFsP5A hacb8b9vXXKAhTM6FelVoZKwXPUNdRVh9LbO1JkjqOIakgbrJyLFtPUFimS+CsOCKycWuDh CENwLhOm+ZmHKtV9cwnuapALqNdZe4HPFrRVbOAM1AgULTgRjD9GL8UicHHw== 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-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id C763268FD37 for ; Wed, 12 Nov 2025 14:43:09 +0200 (EET) Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-37b95f87d4eso4483211fa.1 for ; Wed, 12 Nov 2025 04:43:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762951388; x=1763556188; 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=v+5fmGwCAY7MPYyVZLudOC7LuPv1B6JR/f81SEAWyAo=; b=J15NTGEmcP2fybuy1gONyPPDA8rQ/NdInomgs7ro2kuxaj4BefNjc2Pw7JWMmDTZZH +r5Ckg3hs9iFG0qY3ZD8jxYXWAhPaLSX1qvCsCwMuQPC0YEo6EqpHVZGMsmAapW5gmnK qBwWOMBCc9ODwZhjag/6ZWWmVTgV2RtbqEiHVrQh+GtYCsF8jMP0OxLVgxEOIHMb90c1 +pmOIFIlQ3p1/GZRm6rLzc3H4VZWUcJ0h6d2slwgxtKoV3N6joYArc8SmeXfcx9wLLcr b+muMXsoc80YxmbtVrsR/ag7lzZj0iAnOFZU+iYmvzuTYwVdgnXdT1rveoIEAw+yAHhi fNdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762951388; x=1763556188; 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=v+5fmGwCAY7MPYyVZLudOC7LuPv1B6JR/f81SEAWyAo=; b=un77lCpNgBCnk+4svQRQt+EHNw/ZDUd83L2L63HIUjySGBJBErwuxLompau4kM5Iwz IpPdBI8tb4Fxi2LdOs7VyHvm5zbnTs5WbXV70T4faZ3jMEUNpN9Iqd4KRxo5YFdbjHDA TnuQApp39u0jRkHYRoMxhHprFTivwOsfWciB9pSs0qNX/fghew/ohfJKzDyj4bfI8cE0 Lc+++G9dJS2+UTLg95io/l2SPDc5mgPWkPc96p2C5EVG/iQm+T5euHD7uAvQwRV30zHM 4sdeP9EgE8J0FZv5hn36O8katY3IMNWEHh9i5tFq5G3iEr8Bcim3kGnlzaTEvHGShyHP ZFzg== X-Gm-Message-State: AOJu0YzSuHcGAL/eNeIAeFmElb6coBwSneyTF6yWgH29cV7atwF3xra3 YmaRGwJ1TxZHjcXanaNi7i7/YXIbElbM8MlE9iQusxMi9kUMBsuMBduG3IQIrUrX X-Gm-Gg: ASbGncvhSC4kksaluprd9+eH3FgiHLU1ksx1Q5g+tODzpjmDpuiFiOAsvJcMUuwKppQ 9XeHNXHgWfn0YChbnXL+1seX5Vgc7kEMCwxTNxFWngchPvlCDOw0VX1Ra5GF8i8m67McWEsMyNy amreOUJpAsIaGY8e9Xzlv/fI6Nj07F4ktPOBut7Fl5oYnd9XvXPanScGKDPc35Rg12y52Ck5hOM SuuWAA3uyNlw4hkadt7MrFXH/ZEn68aFcn/hyEG1gOc+E3Lex0sU4RuRB+tE+my8lS9ziZb2YUo aXvY+7oe8M6cPIC//q/IO1S3Nx4dxJ75oRTxpeNZ6nTm5HOtitxeM3x5RP7Qj8MMFERzLzATWtn ja9FQEqBxlasw/E0bnoqaOlR/pR+RP4gv/yQJ1Km1AEQytpoWZzt8m8o+sKnbatZWJiNcUbYdPk VStfUK7cs56TjV7ODTIjKrFtPDKjUS/6/KE3IbA7qdInFtLrJUy7m1lWg= X-Google-Smtp-Source: AGHT+IG8KGYR4ebxco3efH3lYpu2fVfKX7aZI/kvTngQSalTT8ceQOumNoLJMggbtJ1kh4i0EjQI/w== X-Received: by 2002:a05:6512:3a8f:b0:594:51bd:8fcd with SMTP id 2adb3069b0e04-59576dfa90fmr979271e87.16.1762951388013; Wed, 12 Nov 2025 04:43:08 -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-5944a019edbsm5802424e87.29.2025.11.12.04.43.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 12 Nov 2025 04:43:07 -0800 (PST) To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Nov 2025 14:43:06 +0200 Message-ID: <20251112124306.68975-1-v.sobolev@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: EIP7CAFD4GNWDND5UG6FV3YUVKH26CU4 X-Message-ID-Hash: EIP7CAFD4GNWDND5UG6FV3YUVKH26CU4 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 - Add missing libavutil/eval.h include for av_strtod - Remove unused variable --- libavformat/mpjpegdec.c | 67 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/libavformat/mpjpegdec.c b/libavformat/mpjpegdec.c index 125b17585e..15dd59ed86 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/intfloat.h" +#include "libavutil/eval.h" #include "avformat.h" #include "demux.h" @@ -34,6 +37,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 +104,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 +126,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 +154,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 +181,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 +250,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 +351,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 +403,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) { + /* 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