From 12127b65b095d36f528ac477e1c995d1b3742852 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 7 Aug 2012 12:21:31 +0200 Subject: [PATCH] rtmp: Factorize simultaneous URLProtocol / AVClass declarations with a macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtmpproto.c | 127 ++++++++-------------------------------- 1 file changed, 23 insertions(+), 104 deletions(-) diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 4a35319c4d..1a6b5c1903 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1598,110 +1598,29 @@ static const AVOption rtmp_options[] = { { NULL }, }; -static const AVClass rtmp_class = { - .class_name = "rtmp", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, +#define RTMP_PROTOCOL(flavor) \ +static const AVClass flavor##_class = { \ + .class_name = #flavor, \ + .item_name = av_default_item_name, \ + .option = rtmp_options, \ + .version = LIBAVUTIL_VERSION_INT, \ +}; \ + \ +URLProtocol ff_##flavor##_protocol = { \ + .name = #flavor, \ + .url_open = rtmp_open, \ + .url_read = rtmp_read, \ + .url_write = rtmp_write, \ + .url_close = rtmp_close, \ + .priv_data_size = sizeof(RTMPContext), \ + .flags = URL_PROTOCOL_FLAG_NETWORK, \ + .priv_data_class= &flavor##_class, \ }; -URLProtocol ff_rtmp_protocol = { - .name = "rtmp", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class= &rtmp_class, -}; -static const AVClass rtmpe_class = { - .class_name = "rtmpe", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpe_protocol = { - .name = "rtmpe", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpe_class, -}; - -static const AVClass rtmps_class = { - .class_name = "rtmps", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmps_protocol = { - .name = "rtmps", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmps_class, -}; - -static const AVClass rtmpt_class = { - .class_name = "rtmpt", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpt_protocol = { - .name = "rtmpt", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpt_class, -}; - -static const AVClass rtmpte_class = { - .class_name = "rtmpte", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpte_protocol = { - .name = "rtmpte", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpte_class, -}; - -static const AVClass rtmpts_class = { - .class_name = "rtmpts", - .item_name = av_default_item_name, - .option = rtmp_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -URLProtocol ff_rtmpts_protocol = { - .name = "rtmpts", - .url_open = rtmp_open, - .url_read = rtmp_read, - .url_write = rtmp_write, - .url_close = rtmp_close, - .priv_data_size = sizeof(RTMPContext), - .flags = URL_PROTOCOL_FLAG_NETWORK, - .priv_data_class = &rtmpts_class, -}; +RTMP_PROTOCOL(rtmp) +RTMP_PROTOCOL(rtmpe) +RTMP_PROTOCOL(rtmps) +RTMP_PROTOCOL(rtmpt) +RTMP_PROTOCOL(rtmpte) +RTMP_PROTOCOL(rtmpts)