generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtpenc_aac: Set a default value for max_frames_per_packet at init

Browse Source 
This avoids having to conditionally set the default within the
packetizer function.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2015-02-25 23:34:36 +02:00
parent 12b3459979
commit 0662440b99
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtpenc.c
View File

@ -271,6 +271,8 @@ static int rtp_write_header(AVFormatContext *s1)
goto defaultcase; goto defaultcase;
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
s->num_frames = 0; s->num_frames = 0;
if (!s->max_frames_per_packet)
s->max_frames_per_packet = 5;
goto defaultcase; goto defaultcase;
default: default:
defaultcase: defaultcase:

5
libavformat/rtpenc_aac.c
View File

@ -27,8 +27,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
RTPMuxContext *s = s1->priv_data; RTPMuxContext *s = s1->priv_data;
int len, max_packet_size; int len, max_packet_size;
uint8_t *p; uint8_t *p;
const int max_frames_per_packet = s->max_frames_per_packet ? s->max_frames_per_packet : 5; const int max_au_headers_size = 2 + 2 * s->max_frames_per_packet;
const int max_au_headers_size = 2 + 2 * max_frames_per_packet;
/* skip ADTS header, if present */ /* skip ADTS header, if present */
if ((s1->streams[0]->codec->extradata_size) == 0) { if ((s1->streams[0]->codec->extradata_size) == 0) {
@ -39,7 +38,7 @@ void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size)
/* test if the packet must be sent */ /* test if the packet must be sent */
len = (s->buf_ptr - s->buf); len = (s->buf_ptr - s->buf);
if ((s->num_frames == max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) { if ((s->num_frames == s->max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) {
int au_size = s->num_frames * 2; int au_size = s->num_frames * 2;
p = s->buf + max_au_headers_size - au_size - 2; p = s->buf + max_au_headers_size - au_size - 2;