From: rayjay via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: rayjay <526528945@qq.com>
Subject: [FFmpeg-devel] [PATCH] libavformat/rtpenc_jpeg.c: Added support for DRI frames in MJPEG RTP packetization
Date: Mon, 19 Feb 2024 16:31:16 +0800
Message-ID: <tencent_341E4718EA0658EADC9E2855D699B342C209@qq.com> (raw)
Signed-off-by: rayjay <526528945@qq.com>
---
libavformat/rtpenc_jpeg.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c
index e4e95931f4..721c02ff76 100644
--- a/libavformat/rtpenc_jpeg.c
+++ b/libavformat/rtpenc_jpeg.c
@@ -37,6 +37,7 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
int len;
int i;
int default_huffman_tables = 0;
+ uint16_t restart_interval = 0;
s->buf_ptr = s->buf;
s->timestamp = s->cur_timestamp;
@@ -164,6 +165,9 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
return;
}
break;
+ } else if (buf[i + 1] == DRI) {
+ type |= 0x40;
+ restart_interval = AV_RB16(&buf[i + 4]);
}
}
@@ -203,6 +207,9 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
if (off == 0 && nb_qtables)
hdr_size += 4 + 64 * nb_qtables;
+ if (type & 0x40)
+ hdr_size += 4;
+
/* payload max in one packet */
len = FFMIN(size, s->max_payload_size - hdr_size);
@@ -214,6 +221,13 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size)
bytestream_put_byte(&p, w);
bytestream_put_byte(&p, h);
+ /* set dri */
+ if (type & 0x40) {
+ bytestream_put_be16(&p, restart_interval);
+ bytestream_put_byte(&p, 0xff);
+ bytestream_put_byte(&p, 0xff);
+ }
+
if (off == 0 && nb_qtables) {
/* set quantization tables header */
bytestream_put_byte(&p, 0);
--
2.40.0.windows.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".
reply other threads:[~2024-02-19 8:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_341E4718EA0658EADC9E2855D699B342C209@qq.com \
--to=ffmpeg-devel@ffmpeg.org \
--cc=526528945@qq.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git