#endif
#define APP_MAX_LENGTH 1024
-#define PLAYPATH_MAX_LENGTH 512
#define TCURL_MAX_LENGTH 1024
#define FLASHVER_MAX_LENGTH 64
#define RTMP_PKTDATA_DEFAULT_SIZE 4096
if (rt->nb_tracked_methods + 1 > rt->tracked_methods_size) {
rt->tracked_methods_size = (rt->nb_tracked_methods + 1) * 2;
- if ((err = av_reallocp(&rt->tracked_methods, rt->tracked_methods_size *
+ if ((err = av_reallocp_array(&rt->tracked_methods, rt->tracked_methods_size,
sizeof(*rt->tracked_methods))) < 0) {
rt->nb_tracked_methods = 0;
rt->tracked_methods_size = 0;
RTMPContext *rt = s->priv_data;
uint8_t *in_data = NULL, *out_data = NULL, *swfdata;
int64_t in_size;
- URLContext *stream;
+ URLContext *stream = NULL;
char swfhash[32];
int swfsize;
int ret = 0;
next += size + 3 + 4;
}
if (p != rt->flv_data + rt->flv_size) {
- av_log(NULL, AV_LOG_WARNING, "Incomplete flv packets in "
+ av_log(rt, AV_LOG_WARNING, "Incomplete flv packets in "
"RTMP_PT_METADATA packet\n");
rt->flv_size = p - rt->flv_data;
}
free_tracked_methods(rt);
av_freep(&rt->flv_data);
- ffurl_close(rt->stream);
+ ffurl_closep(&rt->stream);
return ret;
}
}
if (!rt->playpath) {
- rt->playpath = av_malloc(PLAYPATH_MAX_LENGTH);
+ int max_len = 1;
+ if (fname)
+ max_len = strlen(fname) + 5; // add prefix "mp4:"
+ rt->playpath = av_malloc(max_len);
if (!rt->playpath) {
ret = AVERROR(ENOMEM);
goto fail;
fname[len - 4] = '\0';
rt->playpath[0] = 0;
}
- av_strlcat(rt->playpath, fname, PLAYPATH_MAX_LENGTH);
+ av_strlcat(rt->playpath, fname, max_len);
} else {
rt->playpath[0] = '\0';
}
if (rt->do_reconnect) {
int i;
- ffurl_close(rt->stream);
- rt->stream = NULL;
+ ffurl_closep(&rt->stream);
rt->do_reconnect = 0;
rt->nb_invokes = 0;
for (i = 0; i < 2; i++)
return 0;
fail:
+ av_freep(&rt->playpath);
+ av_freep(&rt->tcurl);
+ av_freep(&rt->flashver);
av_dict_free(opts);
rtmp_close(s);
return ret;
{ NULL },
};
-#define RTMP_PROTOCOL(flavor) \
+#define RTMP_PROTOCOL_0(flavor)
+#define RTMP_PROTOCOL_1(flavor) \
static const AVClass flavor##_class = { \
.class_name = #flavor, \
.item_name = av_default_item_name, \
.flags = URL_PROTOCOL_FLAG_NETWORK, \
.priv_data_class= &flavor##_class, \
};
-
-
-RTMP_PROTOCOL(rtmp)
-RTMP_PROTOCOL(rtmpe)
-RTMP_PROTOCOL(rtmps)
-RTMP_PROTOCOL(rtmpt)
-RTMP_PROTOCOL(rtmpte)
-RTMP_PROTOCOL(rtmpts)
+#define RTMP_PROTOCOL_2(flavor, enabled) \
+ RTMP_PROTOCOL_ ## enabled(flavor)
+#define RTMP_PROTOCOL_3(flavor, config) \
+ RTMP_PROTOCOL_2(flavor, config)
+#define RTMP_PROTOCOL(flavor, uppercase) \
+ RTMP_PROTOCOL_3(flavor, CONFIG_ ## uppercase ## _PROTOCOL)
+
+RTMP_PROTOCOL(rtmp, RTMP)
+RTMP_PROTOCOL(rtmpe, RTMPE)
+RTMP_PROTOCOL(rtmps, RTMPS)
+RTMP_PROTOCOL(rtmpt, RTMPT)
+RTMP_PROTOCOL(rtmpte, RTMPTE)
+RTMP_PROTOCOL(rtmpts, RTMPTS)