RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add MPEG2 support to the RTP muxer 

Originally committed as revision 11047 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2007-11-16 13:13:53 +00:00
parent 7ed19d7fbf
commit db628029c4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/rtp.c
View File

@ -79,6 +79,7 @@ AVRtpPayloadType_t AVRtpPayloadTypes[]=
{30, "unassigned", CODEC_TYPE_VIDEO, CODEC_ID_NONE, -1, -1}, {30, "unassigned", CODEC_TYPE_VIDEO, CODEC_ID_NONE, -1, -1},
{31, "H261", CODEC_TYPE_VIDEO, CODEC_ID_H261, 90000, -1}, {31, "H261", CODEC_TYPE_VIDEO, CODEC_ID_H261, 90000, -1},
{32, "MPV", CODEC_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, 90000, -1}, {32, "MPV", CODEC_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, 90000, -1},
{32, "MPV", CODEC_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, 90000, -1},
{33, "MP2T", CODEC_TYPE_DATA, CODEC_ID_MPEG2TS, 90000, -1}, {33, "MP2T", CODEC_TYPE_DATA, CODEC_ID_MPEG2TS, 90000, -1},
{34, "H263", CODEC_TYPE_VIDEO, CODEC_ID_H263, 90000, -1}, {34, "H263", CODEC_TYPE_VIDEO, CODEC_ID_H263, 90000, -1},
{35, "unassigned", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1}, {35, "unassigned", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1},
@ -559,6 +560,7 @@ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestam
switch(s->st->codec->codec_id) { switch(s->st->codec->codec_id) {
case CODEC_ID_MP2: case CODEC_ID_MP2:
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_MPEG2VIDEO:
if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) {
int64_t addend; int64_t addend;
@ -683,6 +685,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
memcpy(pkt->data, buf, len); memcpy(pkt->data, buf, len);
break; break;
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_MPEG2VIDEO:
/* better than nothing: skip mpeg video RTP header */ /* better than nothing: skip mpeg video RTP header */
if (len <= 4) if (len <= 4)
return -1; return -1;
@ -799,6 +802,7 @@ static int rtp_write_header(AVFormatContext *s1)
s->buf_ptr = s->buf + 4; s->buf_ptr = s->buf + 4;
break; break;
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_MPEG2VIDEO:
break; break;
case CODEC_ID_MPEG2TS: case CODEC_ID_MPEG2TS:
n = s->max_payload_size / TS_PACKET_SIZE; n = s->max_payload_size / TS_PACKET_SIZE;
@ -1040,6 +1044,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
rtp_send_mpegaudio(s1, buf1, size); rtp_send_mpegaudio(s1, buf1, size);
break; break;
case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_MPEG2VIDEO:
ff_rtp_send_mpegvideo(s1, buf1, size); ff_rtp_send_mpegvideo(s1, buf1, size);
break; break;
case CODEC_ID_AAC: case CODEC_ID_AAC: