You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-04 22:03:09 +02:00
avformat/rtpenc: Add flag AVFMT_NODIMENSIONS.
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 <koushd@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
committed by
Michael Niedermayer
parent
5fac8d062d
commit
2657e1679e
@ -635,10 +635,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);
|
||||
@ -685,5 +693,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,
|
||||
};
|
||||
|
Reference in New Issue
Block a user