Mercurial > libavformat.hg
comparison rtp.c @ 1472:49d5a5ca2987 libavformat
get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used
| author | bcoudurier |
|---|---|
| date | Thu, 09 Nov 2006 11:37:30 +0000 |
| parents | 234a04b906f9 |
| children | 92afee454599 |
comparison
equal
deleted
inserted
replaced
| 1471:ad18f1010f47 | 1472:49d5a5ca2987 |
|---|---|
| 184 | 184 |
| 185 /* statistics functions */ | 185 /* statistics functions */ |
| 186 RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; | 186 RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler= NULL; |
| 187 | 187 |
| 188 static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4}; | 188 static RTPDynamicProtocolHandler mp4v_es_handler= {"MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4}; |
| 189 static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_MPEG4AAC}; | 189 static RTPDynamicProtocolHandler mpeg4_generic_handler= {"mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_AAC}; |
| 190 | 190 |
| 191 static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) | 191 static void register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler) |
| 192 { | 192 { |
| 193 handler->next= RTPFirstDynamicPayloadHandler; | 193 handler->next= RTPFirstDynamicPayloadHandler; |
| 194 RTPFirstDynamicPayloadHandler= handler; | 194 RTPFirstDynamicPayloadHandler= handler; |
| 562 addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; | 562 addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; |
| 563 addend = (addend * 5625) >> 14; | 563 addend = (addend * 5625) >> 14; |
| 564 pkt->pts = addend + delta_timestamp; | 564 pkt->pts = addend + delta_timestamp; |
| 565 } | 565 } |
| 566 break; | 566 break; |
| 567 case CODEC_ID_MPEG4AAC: | 567 case CODEC_ID_AAC: |
| 568 case CODEC_ID_H264: | 568 case CODEC_ID_H264: |
| 569 case CODEC_ID_MPEG4: | 569 case CODEC_ID_MPEG4: |
| 570 pkt->pts = timestamp; | 570 pkt->pts = timestamp; |
| 571 break; | 571 break; |
| 572 default: | 572 default: |
| 692 memcpy(pkt->data, buf, len); | 692 memcpy(pkt->data, buf, len); |
| 693 break; | 693 break; |
| 694 // moved from below, verbatim. this is because this section handles packets, and the lower switch handles | 694 // moved from below, verbatim. this is because this section handles packets, and the lower switch handles |
| 695 // timestamps. | 695 // timestamps. |
| 696 // TODO: Put this into a dynamic packet handler... | 696 // TODO: Put this into a dynamic packet handler... |
| 697 case CODEC_ID_MPEG4AAC: | 697 case CODEC_ID_AAC: |
| 698 if (rtp_parse_mp4_au(s, buf)) | 698 if (rtp_parse_mp4_au(s, buf)) |
| 699 return -1; | 699 return -1; |
| 700 { | 700 { |
| 701 rtp_payload_data_t *infos = s->rtp_payload_data; | 701 rtp_payload_data_t *infos = s->rtp_payload_data; |
| 702 if (infos == NULL) | 702 if (infos == NULL) |