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

Merge commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2'

Browse Source 
* commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2':
  rtpenc: Always do the default initialization regardless of codecs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-01 01:23:32 +01:00
parent 9e09931fb6 f8c01257f9
commit a2c4c30b5f
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/rtpenc.c
View File

@@ -179,11 +179,17 @@ static int rtp_write_header(AVFormatContext *s1)
} }
} }
avpriv_set_pts_info(st, 32, 1, 90000); if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
avpriv_set_pts_info(st, 32, 1, st->codec->sample_rate);
} else {
avpriv_set_pts_info(st, 32, 1, 90000);
}
s->buf_ptr = s->buf;
switch(st->codec->codec_id) { switch(st->codec->codec_id) {
case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP2:
case AV_CODEC_ID_MP3: case AV_CODEC_ID_MP3:
s->buf_ptr = s->buf + 4; s->buf_ptr = s->buf + 4;
avpriv_set_pts_info(st, 32, 1, 90000);
break; break;
case AV_CODEC_ID_MPEG1VIDEO: case AV_CODEC_ID_MPEG1VIDEO:
case AV_CODEC_ID_MPEG2VIDEO: case AV_CODEC_ID_MPEG2VIDEO:
@@ -227,7 +233,7 @@ static int rtp_write_header(AVFormatContext *s1)
s->max_frames_per_packet = 15; s->max_frames_per_packet = 15;
s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15); s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15);
s->num_frames = 0; s->num_frames = 0;
goto defaultcase; break;
case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_ADPCM_G722:
/* Due to a historical error, the clock rate for G722 in RTP is /* Due to a historical error, the clock rate for G722 in RTP is
* 8000, even if the sample rate is 16000. See RFC 3551. */ * 8000, even if the sample rate is 16000. See RFC 3551. */
@@ -252,7 +258,7 @@ static int rtp_write_header(AVFormatContext *s1)
s->max_frames_per_packet = 1; s->max_frames_per_packet = 1;
s->max_frames_per_packet = FFMIN(s->max_frames_per_packet, s->max_frames_per_packet = FFMIN(s->max_frames_per_packet,
s->max_payload_size / st->codec->block_align); s->max_payload_size / st->codec->block_align);
goto defaultcase; break;
case AV_CODEC_ID_AMR_NB: case AV_CODEC_ID_AMR_NB:
case AV_CODEC_ID_AMR_WB: case AV_CODEC_ID_AMR_WB:
if (!s->max_frames_per_packet) if (!s->max_frames_per_packet)
@@ -271,18 +277,13 @@ static int rtp_write_header(AVFormatContext *s1)
goto fail; goto fail;
} }
s->num_frames = 0; s->num_frames = 0;
goto defaultcase; break;
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
s->num_frames = 0; s->num_frames = 0;
if (!s->max_frames_per_packet) if (!s->max_frames_per_packet)
s->max_frames_per_packet = 5; s->max_frames_per_packet = 5;
goto defaultcase; break;
default: default:
defaultcase:
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
avpriv_set_pts_info(st, 32, 1, st->codec->sample_rate);
}
s->buf_ptr = s->buf;
break; break;
} }