[PATCH] mpeg4ip fix compile
Bruce M Simpson
bms at incunabulum.net
Fri Feb 8 16:56:12 PST 2008
I needed this to get it to build.
-------------- next part --------------
--- ./audio_faac.cpp.orig 2008-02-09 00:39:34.000000000 +0000
+++ ./audio_faac.cpp 2008-02-09 00:43:11.000000000 +0000
@@ -123,16 +123,16 @@
sdpMediaAudioFormat->media = sdpMediaAudio;
sdpMediaAudioFormat->fmt = strdup("97");
- sdpMediaAudioFormat->rtpmap_clock_rate = pConfig->GetIntegerValue(CFG_AUDIO_SAMPLE_RATE);
+ sdpMediaAudioFormat->rtpmap->clock_rate = pConfig->GetIntegerValue(CFG_AUDIO_SAMPLE_RATE);
char* sConfig = MP4BinaryToBase16(*audioConfig, *audioConfigLen);
if(pConfig->GetBoolValue(CFG_RTP_RFC3016)) {
- sdpMediaAudioFormat->rtpmap_name = strdup("MP4A-LATM");
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("MP4A-LATM");
sprintf(audioFmtpBuf, "profile-level-id=15;object=2;cpresent=0; config=%s ", sConfig);
} else {
sdp_add_string_to_list(&sdpMediaAudio->unparsed_a_lines, "a=mpeg4-esid:10");
- sdpMediaAudioFormat->rtpmap_name = strdup("mpeg4-generic");
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("mpeg4-generic");
sprintf(audioFmtpBuf,
"streamtype=5; profile-level-id=15; mode=AAC-hbr; config=%s; "
@@ -142,7 +142,7 @@
free(sConfig);
sdpMediaAudioFormat->fmt_param = strdup(audioFmtpBuf);
- sdpMediaAudio->fmt_list = sdpMediaAudioFormat;
+ sdpMediaAudio->fmt = sdpMediaAudioFormat;
return sdpMediaAudio;
}
--- ./audio_ffmpeg.cpp.orig 2008-02-09 00:46:59.000000000 +0000
+++ ./audio_ffmpeg.cpp 2008-02-09 00:47:45.000000000 +0000
@@ -242,7 +242,7 @@
sdpMediaAudioFormat = MALLOC_STRUCTURE(format_list_t);
memset(sdpMediaAudioFormat, 0, sizeof(*sdpMediaAudioFormat));
- sdpMediaAudio->fmt_list = sdpMediaAudioFormat;
+ sdpMediaAudio->fmt = sdpMediaAudioFormat;
sdpMediaAudioFormat->media = sdpMediaAudio;
@@ -254,29 +254,29 @@
if (type == MP3AUDIOFRAME) {
if (pConfig->GetBoolValue(CFG_RTP_USE_MP3_PAYLOAD_14)) {
sdpMediaAudioFormat->fmt = strdup("14");
- sdpMediaAudioFormat->rtpmap_clock_rate = 90000;
+ sdpMediaAudioFormat->rtpmap->clock_rate = 90000;
} else {
- sdpMediaAudioFormat->rtpmap_clock_rate =
+ sdpMediaAudioFormat->rtpmap->clock_rate =
pConfig->GetIntegerValue(CFG_AUDIO_SAMPLE_RATE);
sdpMediaAudioFormat->fmt = strdup("97");
sdp_add_string_to_list(&sdpMediaAudio->unparsed_a_lines,
"a=mpeg4-esid:10");
}
- sdpMediaAudioFormat->rtpmap_name = strdup("MPA");
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("MPA");
} else if (type == AMRNBAUDIOFRAME) {
*is3gp = true;
- sdpMediaAudioFormat->rtpmap_name = strdup("AMR");
- sdpMediaAudioFormat->rtpmap_clock_rate = 8000;
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("AMR");
+ sdpMediaAudioFormat->rtpmap->clock_rate = 8000;
sdpMediaAudioFormat->fmt = strdup("97");
sdpMediaAudioFormat->fmt_param = strdup("octet-align=1");
- sdpMediaAudioFormat->rtpmap_encode_param = 1;
+ sdpMediaAudioFormat->rtpmap->encode_param = 1;
} else if (type == AMRWBAUDIOFRAME) {
*is3gp = true;
- sdpMediaAudioFormat->rtpmap_name = strdup("AMR-WB");
- sdpMediaAudioFormat->rtpmap_clock_rate = 16000;
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("AMR-WB");
+ sdpMediaAudioFormat->rtpmap->clock_rate = 16000;
sdpMediaAudioFormat->fmt = strdup("97");
sdpMediaAudioFormat->fmt_param = strdup("octet-align=1");
- sdpMediaAudioFormat->rtpmap_encode_param = 1;
+ sdpMediaAudioFormat->rtpmap->encode_param = 1;
}
}
--- ./audio_g711.cpp.orig 2008-02-09 00:43:37.000000000 +0000
+++ ./audio_g711.cpp 2008-02-09 00:43:45.000000000 +0000
@@ -106,7 +106,7 @@
sdpMediaAudioFormat = MALLOC_STRUCTURE(format_list_t);
memset(sdpMediaAudioFormat, 0, sizeof(*sdpMediaAudioFormat));
- sdpMediaAudio->fmt_list = sdpMediaAudioFormat;
+ sdpMediaAudio->fmt = sdpMediaAudioFormat;
sdpMediaAudioFormat->media = sdpMediaAudio;
--- ./audio_l16.cpp.orig 2008-02-09 00:44:48.000000000 +0000
+++ ./audio_l16.cpp 2008-02-09 00:45:05.000000000 +0000
@@ -88,15 +88,15 @@
sdpMediaAudioFormat = MALLOC_STRUCTURE(format_list_t);
memset(sdpMediaAudioFormat, 0, sizeof(*sdpMediaAudioFormat));
- sdpMediaAudio->fmt_list = sdpMediaAudioFormat;
+ sdpMediaAudio->fmt = sdpMediaAudioFormat;
sdpMediaAudioFormat->media = sdpMediaAudio;
if (pConfig->GetIntegerValue(CFG_AUDIO_CHANNELS) == 2) {
- sdpMediaAudioFormat->rtpmap_encode_param = 2;
+ sdpMediaAudioFormat->rtpmap->encode_param = 2;
} else {
- sdpMediaAudioFormat->rtpmap_encode_param = 1;
+ sdpMediaAudioFormat->rtpmap->encode_param = 1;
}
- sdpMediaAudioFormat->rtpmap_name = strdup("L16");
- sdpMediaAudioFormat->rtpmap_clock_rate = pConfig->GetIntegerValue(CFG_AUDIO_SAMPLE_RATE);
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("L16");
+ sdpMediaAudioFormat->rtpmap->clock_rate = pConfig->GetIntegerValue(CFG_AUDIO_SAMPLE_RATE);
sdpMediaAudioFormat->fmt = strdup("97");
return sdpMediaAudio;
--- ./audio_lame.cpp.orig 2008-02-09 00:44:15.000000000 +0000
+++ ./audio_lame.cpp 2008-02-09 00:44:36.000000000 +0000
@@ -132,18 +132,18 @@
sdpMediaAudioFormat = MALLOC_STRUCTURE(format_list_t);
memset(sdpMediaAudioFormat, 0, sizeof(*sdpMediaAudioFormat));
- sdpMediaAudio->fmt_list = sdpMediaAudioFormat;
+ sdpMediaAudio->fmt = sdpMediaAudioFormat;
sdpMediaAudioFormat->media = sdpMediaAudio;
if (pConfig->GetBoolValue(CFG_RTP_USE_MP3_PAYLOAD_14)) {
sdpMediaAudioFormat->fmt = strdup("14");
- sdpMediaAudioFormat->rtpmap_clock_rate = 90000;
+ sdpMediaAudioFormat->rtpmap->clock_rate = 90000;
} else {
- sdpMediaAudioFormat->rtpmap_clock_rate =
+ sdpMediaAudioFormat->rtpmap->clock_rate =
pConfig->GetIntegerValue(CFG_AUDIO_SAMPLE_RATE);
sdpMediaAudioFormat->fmt = strdup("97");
}
- sdpMediaAudioFormat->rtpmap_name = strdup("MPA");
+ sdpMediaAudioFormat->rtpmap->encode_name = strdup("MPA");
return sdpMediaAudio;
--- ./text_encoder.cpp.orig 2008-02-09 00:45:19.000000000 +0000
+++ ./text_encoder.cpp 2008-02-09 00:45:49.000000000 +0000
@@ -221,16 +221,16 @@
sdpMediaFormat->media = sdpMedia;
sdpMediaFormat->fmt = strdup("98");
- sdpMediaFormat->rtpmap_clock_rate = 90000;
- sdpMedia->fmt_list = sdpMediaFormat;
+ sdpMediaFormat->rtpmap->clock_rate = 90000;
+ sdpMedia->fmt = sdpMediaFormat;
if (strcmp(pConfig->GetStringValue(CFG_TEXT_ENCODING),
TEXT_ENCODING_PLAIN) == 0) {
// text
- sdpMediaFormat->rtpmap_name = strdup("x-plain-text");
+ sdpMediaFormat->rtpmap->encode_name = strdup("x-plain-text");
sdpMedia->media = strdup("application");
} else {
- sdpMediaFormat->rtpmap_name = strdup("X-HREF");
+ sdpMediaFormat->rtpmap->encode_name = strdup("X-HREF");
sdpMedia->media = strdup("control");
const char *base_url = pConfig->GetStringValue(CFG_TEXT_HREF_BASE_URL);
if (base_url != NULL) {
--- ./video_encoder_base.cpp.orig 2008-02-09 00:45:59.000000000 +0000
+++ ./video_encoder_base.cpp 2008-02-09 00:46:46.000000000 +0000
@@ -234,7 +234,7 @@
sdpMediaVideoFormat = MALLOC_STRUCTURE(format_list_t);
memset(sdpMediaVideoFormat, 0, sizeof(*sdpMediaVideoFormat));
- sdpMediaVideo->fmt_list = sdpMediaVideoFormat;
+ sdpMediaVideo->fmt = sdpMediaVideoFormat;
if (mtype == MPEG4VIDEOFRAME) {
*is3gp = true;
@@ -243,8 +243,8 @@
"a=mpeg4-esid:20");
sdpMediaVideoFormat->fmt = create_payload_number_string(payload_number);
- sdpMediaVideoFormat->rtpmap_name = strdup("MP4V-ES");
- sdpMediaVideoFormat->rtpmap_clock_rate = 90000;
+ sdpMediaVideoFormat->rtpmap->encode_name = strdup("MP4V-ES");
+ sdpMediaVideoFormat->rtpmap->clock_rate = 90000;
char* sConfig = MP4BinaryToBase16(*videoConfig,
@@ -271,8 +271,8 @@
*is3gp = true;
sdpMediaVideoFormat->fmt = create_payload_number_string(payload_number);
sdpMediaVideoFormat->media = sdpMediaVideo;
- sdpMediaVideoFormat->rtpmap_clock_rate = 90000;
- sdpMediaVideoFormat->rtpmap_name = strdup("H263-2000");
+ sdpMediaVideoFormat->rtpmap->clock_rate = 90000;
+ sdpMediaVideoFormat->rtpmap->encode_name = strdup("H263-2000");
char cliprect[80];
sprintf(cliprect, "a=cliprect:0,0,%d,%d",
pConfig->GetIntegerValue(CFG_VIDEO_HEIGHT),
@@ -281,8 +281,8 @@
} else if (mtype == H264VIDEOFRAME) {
sdpMediaVideoFormat->fmt = create_payload_number_string(payload_number);
sdpMediaVideoFormat->media = sdpMediaVideo;
- sdpMediaVideoFormat->rtpmap_clock_rate = 90000;
- sdpMediaVideoFormat->rtpmap_name = strdup("H264");
+ sdpMediaVideoFormat->rtpmap->clock_rate = 90000;
+ sdpMediaVideoFormat->rtpmap->encode_name = strdup("H264");
sprintf(videoFmtpBuf,
"profile-level-id=%06x; sprop-parameter-sets=%s; packetization-mode=1",
*videoProfile,
More information about the freebsd-multimedia
mailing list