From: Koushik Dutta <kou...@gmail.com>
Not all rtp formats require the video dimensions to be available
up front. H264 and HEVC will send them as stream parameters.
The flag is restrictive and prevents RTP repacketization
without parsing the codec information out of the stream.
This change checks to see if the codec parameters are available
on the rtp formats that need it.
Signed-off-by: Koushik Dutta <kou...@gmail.com>
---
libavformat/rtpenc.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 7b4ae37d13..0ea1cb2be4 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -621,10 +621,18 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket
*pkt)
rtp_send_ilbc(s1, pkt->data, size);
break;
case AV_CODEC_ID_MJPEG:
+ if (st->codecpar->width <= 0 || st->codecpar->height <= 0) {
+ av_log(s1, AV_LOG_ERROR, "dimensions not set\n");
+ return AVERROR(EINVAL);
+ }
ff_rtp_send_jpeg(s1, pkt->data, size);
break;
case AV_CODEC_ID_BITPACKED:
case AV_CODEC_ID_RAWVIDEO: {
+ if (st->codecpar->width <= 0 || st->codecpar->height <= 0) {
+ av_log(s1, AV_LOG_ERROR, "dimensions not set\n");
+ return AVERROR(EINVAL);
+ }
int interlaced = st->codecpar->field_order != AV_FIELD_PROGRESSIVE;
ff_rtp_send_raw_rfc4175(s1, pkt->data, size, interlaced, 0);
@@ -671,5 +679,5 @@ const FFOutputFormat ff_rtp_muxer = {
.write_packet = rtp_write_packet,
.write_trailer = rtp_write_trailer,
.p.priv_class = &rtp_muxer_class,
- .p.flags = AVFMT_TS_NONSTRICT,
+ .p.flags = AVFMT_NODIMENSIONS | AVFMT_TS_NONSTRICT,
};
--
2.39.5 (Apple Git-154)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
