Mercurial > libavformat.hg

comparison rtp.c @ 5910:536e5527c1e0 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.
author stefano
date Tue, 30 Mar 2010 23:30:55 +0000
parents ab2af3bc94f6
children f06908662125
comparison
equal deleted inserted replaced
5909:b8041f85c327 5910:536e5527c1e0
33 */ 33 */
34 static const struct 34 static const struct
35 { 35 {
36 int pt; 36 int pt;
37 const char enc_name[6]; 37 const char enc_name[6];
38 enum CodecType codec_type; 38 enum AVMediaType codec_type;
39 enum CodecID codec_id; 39 enum CodecID codec_id;
40 int clock_rate; 40 int clock_rate;
41 int audio_channels; 41 int audio_channels;
42 } AVRtpPayloadTypes[]= 42 } AVRtpPayloadTypes[]=
43 { 43 {
44 {0, "PCMU", CODEC_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1}, 44 {0, "PCMU", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_MULAW, 8000, 1},
45 {3, "GSM", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 45 {3, "GSM", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
46 {4, "G723", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 46 {4, "G723", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
47 {5, "DVI4", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 47 {5, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
48 {6, "DVI4", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 16000, 1}, 48 {6, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 16000, 1},
49 {7, "LPC", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 49 {7, "LPC", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
50 {8, "PCMA", CODEC_TYPE_AUDIO, CODEC_ID_PCM_ALAW, 8000, 1}, 50 {8, "PCMA", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_ALAW, 8000, 1},
51 {9, "G722", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 51 {9, "G722", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
52 {10, "L16", CODEC_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 2}, 52 {10, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 2},
53 {11, "L16", CODEC_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 1}, 53 {11, "L16", AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_S16BE, 44100, 1},
54 {12, "QCELP", CODEC_TYPE_AUDIO, CODEC_ID_QCELP, 8000, 1}, 54 {12, "QCELP", AVMEDIA_TYPE_AUDIO, CODEC_ID_QCELP, 8000, 1},
55 {13, "CN", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 55 {13, "CN", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
56 {14, "MPA", CODEC_TYPE_AUDIO, CODEC_ID_MP2, -1, -1}, 56 {14, "MPA", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP2, -1, -1},
57 {14, "MPA", CODEC_TYPE_AUDIO, CODEC_ID_MP3, -1, -1}, 57 {14, "MPA", AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3, -1, -1},
58 {15, "G728", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 58 {15, "G728", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
59 {16, "DVI4", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 11025, 1}, 59 {16, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 11025, 1},
60 {17, "DVI4", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 22050, 1}, 60 {17, "DVI4", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 22050, 1},
61 {18, "G729", CODEC_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1}, 61 {18, "G729", AVMEDIA_TYPE_AUDIO, CODEC_ID_NONE, 8000, 1},
62 {25, "CelB", CODEC_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1}, 62 {25, "CelB", AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1},
63 {26, "JPEG", CODEC_TYPE_VIDEO, CODEC_ID_MJPEG, 90000, -1}, 63 {26, "JPEG", AVMEDIA_TYPE_VIDEO, CODEC_ID_MJPEG, 90000, -1},
64 {28, "nv", CODEC_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1}, 64 {28, "nv", AVMEDIA_TYPE_VIDEO, CODEC_ID_NONE, 90000, -1},
65 {31, "H261", CODEC_TYPE_VIDEO, CODEC_ID_H261, 90000, -1}, 65 {31, "H261", AVMEDIA_TYPE_VIDEO, CODEC_ID_H261, 90000, -1},
66 {32, "MPV", CODEC_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, 90000, -1}, 66 {32, "MPV", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG1VIDEO, 90000, -1},
67 {32, "MPV", CODEC_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, 90000, -1}, 67 {32, "MPV", AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO, 90000, -1},
68 {33, "MP2T", CODEC_TYPE_DATA, CODEC_ID_MPEG2TS, 90000, -1}, 68 {33, "MP2T", AVMEDIA_TYPE_DATA, CODEC_ID_MPEG2TS, 90000, -1},
69 {34, "H263", CODEC_TYPE_VIDEO, CODEC_ID_H263, 90000, -1}, 69 {34, "H263", AVMEDIA_TYPE_VIDEO, CODEC_ID_H263, 90000, -1},
70 {-1, "", CODEC_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1} 70 {-1, "", AVMEDIA_TYPE_UNKNOWN, CODEC_ID_NONE, -1, -1}
71 }; 71 };
72 72
73 int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type) 73 int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type)
74 { 74 {
75 int i = 0; 75 int i = 0;
116 } 116 }
117 117
118 return ""; 118 return "";
119 } 119 }
120 120
121 enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type) 121 enum CodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type)
122 { 122 {
123 int i; 123 int i;
124 124
125 for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++) 125 for (i = 0; AVRtpPayloadTypes[i].pt >= 0; i++)
126 if (!strcmp(buf, AVRtpPayloadTypes[i].enc_name) && (codec_type == AVRtpPayloadTypes[i].codec_type)){ 126 if (!strcmp(buf, AVRtpPayloadTypes[i].enc_name) && (codec_type == AVRtpPayloadTypes[i].codec_type)){