highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtpenc: Move max_packet_size to a context variable

Browse Source 
This is in preparation for exposing this via an avoption.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2012-02-23 11:54:13 +02:00
parent 7337484ed2
commit f553462041
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/rtpenc.c
View File

@@ -82,7 +82,7 @@ static int is_supported(enum CodecID id)
static int rtp_write_header(AVFormatContext *s1) static int rtp_write_header(AVFormatContext *s1)
{ {
RTPMuxContext *s = s1->priv_data; RTPMuxContext *s = s1->priv_data;
int max_packet_size, n; int n;
AVStream *st; AVStream *st;
if (s1->nb_streams != 1) { if (s1->nb_streams != 1) {
@@ -109,16 +109,16 @@ static int rtp_write_header(AVFormatContext *s1)
s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 + s->first_rtcp_ntp_time = (s1->start_time_realtime / 1000) * 1000 +
NTP_OFFSET_US; NTP_OFFSET_US;
max_packet_size = s1->pb->max_packet_size; s->max_packet_size = s1->pb->max_packet_size;
if (max_packet_size <= 12) { if (s->max_packet_size <= 12) {
av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", max_packet_size); av_log(s1, AV_LOG_ERROR, "Max packet size %d too low\n", s->max_packet_size);
return AVERROR(EIO); return AVERROR(EIO);
} }
s->buf = av_malloc(max_packet_size); s->buf = av_malloc(s->max_packet_size);
if (s->buf == NULL) { if (s->buf == NULL) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
s->max_payload_size = max_packet_size - 12; s->max_payload_size = s->max_packet_size - 12;
s->max_frames_per_packet = 0; s->max_frames_per_packet = 0;
if (s1->max_delay) { if (s1->max_delay) {

1
libavformat/rtpenc.h
View File

@@ -34,6 +34,7 @@ struct RTPMuxContext {
uint32_t timestamp; uint32_t timestamp;
uint32_t base_timestamp; uint32_t base_timestamp;
uint32_t cur_timestamp; uint32_t cur_timestamp;
int max_packet_size;
int max_payload_size; int max_payload_size;
int num_frames; int num_frames;