From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 441DD48DA6 for ; Fri, 26 Jan 2024 18:13:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C67F268D182; Fri, 26 Jan 2024 20:13:12 +0200 (EET) Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7360F68D17A for ; Fri, 26 Jan 2024 20:13:05 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-556c3f0d6c5so389424a12.2 for ; Fri, 26 Jan 2024 10:13:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706292784; x=1706897584; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=CmzNhGqmF0GoQzdN+NTbVkikGAjU3v5Fexil/sCrQEI=; b=dL78uH43RtxGgEGRGrAuMZ4bY7PKjnOnOzeZva8pYx7zG9FWKKF65AVynTslRvp5Wv q1lYyX667wtF7NYhinsVhuzSz487bvCbsXd7ODRgXj9bj7u7VccRBEzWJrFJZYF3hLoL 3tb5qFsU8VKp2jqJWAIRREC//caa8IJYZWkmCRMzAVscLAGgvgxMA1tLKT7Q4XckPxfC 0NoQH2Pw3pVLwfCC7ubNjae06yQ79COhlS9SJ1gWUi2NGacr5hqJdM7Bq776ACcLBgHW QTcDbAYdNMn5gExi8VL2Cfs5tjnsAnLuUNe3Bhd7vOhCKk3KpZIBop+RiJ3z2m42KtPL 25gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706292784; x=1706897584; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=CmzNhGqmF0GoQzdN+NTbVkikGAjU3v5Fexil/sCrQEI=; b=fuBPwIzPG2JDRf/5NxqNRAxh6j84k3qseFK2b/S5v8zprJp1OuTivQ6H0jn4DggrBh ngVpxgCPjlV+rNTDYoVvNBlpHlWcn6HEIaK35lG/cr6NwuhGW7uP4a4VAivL5MqsHitl 3/w5r8egf7LgL6vqf/jbxQmBdkVs9s1GvDgrKaoyo/EQmWR/YQ8TpXL66DVBDjVGIkQm fBrn6B5vzjmo6bwh0bmiUKI/oHJOamPdP8f0Ai87fHglD0MfOlzW5C6GE/H8RjUBAEeB e7fvqdt85g/+4NLEx8XkG1Bs9/UqAbW8cJLAC6LjJR8a2snAgIIu7Qen/FeBd4zzuF/A biuA== X-Gm-Message-State: AOJu0YwWhSX5+YY9GK6MEF/cLJsg5zJo5V7VfPLPQsZWfflzP694hSPX 1sgItpsFALtafw602UogKSVr3KBOpw3v4LHvKskU4o/KbdkgzihXsCfXWohup0hED1mNnJXoOoZ JariUglOOnZnY1kSnXEndEXuqfyrUlYzlagU= X-Google-Smtp-Source: AGHT+IEqgBtXmdaTlRbpBKxn5ed/eqIDjheo5uWHTmQAJ42O5zcPzZ6TM8qJkl/kokYGmDir6UTd4CXdtdNJY6+2538= X-Received: by 2002:a17:906:ae88:b0:a31:484a:2da6 with SMTP id md8-20020a170906ae8800b00a31484a2da6mr25200ejb.11.1706292784391; Fri, 26 Jan 2024 10:13:04 -0800 (PST) MIME-Version: 1.0 From: Sebastien Cote Date: Fri, 26 Jan 2024 11:12:53 -0700 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/1] libavformat/rtpenc_jpeg.c: add support for the DRI marker X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This patch adds support for the DRI marker in the JPEG RTP payloader. --- libavformat/rtpenc_jpeg.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index e4e95931f4..60f56680e2 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -33,6 +33,7 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) uint8_t type = 2; /* initialized non-0/1 value for RTP/JPEG type check*/ uint8_t w, h; uint8_t *p; + uint16_t rst_marker_interval = 0; int off = 0; /* fragment offset of the current JPEG frame */ int len; int i; @@ -155,6 +156,22 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) dht_size = 0; continue; } + } else if (buf[i + 1] == DRI) { + uint16_t dri_size = 0; + if (i + 5 > size) { + av_log(s1, AV_LOG_ERROR, "Too short JPEG header. Aborted!\n"); + return; + } + + dri_size = AV_RB16(&buf[i + 2]); + rst_marker_interval = AV_RB16(&buf[i + 4]); + + if (i + 1 + dri_size > size) { + av_log(s1, AV_LOG_ERROR, "Too short JPEG header. Aborted!\n"); + return; + } + + i += 1 + dri_size; } else if (buf[i + 1] == SOS) { /* SOS is last marker in the header */ i += AV_RB16(&buf[i + 2]) + 2; @@ -196,10 +213,16 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) } } + if (rst_marker_interval > 0) + type += 64; + p = s->buf_ptr; while (size > 0) { int hdr_size = 8; + if (rst_marker_interval > 0) + hdr_size += 4; + if (off == 0 && nb_qtables) hdr_size += 4 + 64 * nb_qtables; @@ -214,6 +237,11 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) bytestream_put_byte(&p, w); bytestream_put_byte(&p, h); + if (rst_marker_interval > 0) { + bytestream_put_be16(&p, rst_marker_interval); + bytestream_put_be16(&p, 0xFFFF); + } + if (off == 0 && nb_qtables) { /* set quantization tables header */ bytestream_put_byte(&p, 0); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".