[12/16] rtpdec: Get rid of all trivial .alloc/.free functions

Message ID 1424727122-2827-12-git-send-email-martin@martin.st
State Committed
Headers show

Commit Message

Martin Storsjö Feb. 23, 2015, 9:31 p.m.
---
 libavformat/rtpdec_ac3.c          |  7 +------
 libavformat/rtpdec_amr.c          |  7 -------
 libavformat/rtpdec_asf.c          |  7 +------
 libavformat/rtpdec_dv.c           |  7 +------
 libavformat/rtpdec_h261.c         |  7 +------
 libavformat/rtpdec_h263_rfc2190.c |  7 +------
 libavformat/rtpdec_h264.c         |  7 +------
 libavformat/rtpdec_hevc.c         | 13 +------------
 libavformat/rtpdec_jpeg.c         |  2 +-
 libavformat/rtpdec_latm.c         |  7 +------
 libavformat/rtpdec_mpa_robust.c   |  7 +------
 libavformat/rtpdec_mpeg4.c        |  8 ++------
 libavformat/rtpdec_mpegts.c       |  7 +------
 libavformat/rtpdec_qcelp.c        | 13 +------------
 libavformat/rtpdec_qdm2.c         | 13 +------------
 libavformat/rtpdec_qt.c           |  7 +------
 libavformat/rtpdec_svq3.c         |  7 +------
 libavformat/rtpdec_xiph.c         |  9 ++-------
 18 files changed, 19 insertions(+), 123 deletions(-)

Comments

Luca Barbato Feb. 23, 2015, 9:40 p.m. | #1
On 23/02/15 22:31, Martin Storsjö wrote:
> ---
>   libavformat/rtpdec_ac3.c          |  7 +------
>   libavformat/rtpdec_amr.c          |  7 -------
>   libavformat/rtpdec_asf.c          |  7 +------
>   libavformat/rtpdec_dv.c           |  7 +------
>   libavformat/rtpdec_h261.c         |  7 +------
>   libavformat/rtpdec_h263_rfc2190.c |  7 +------
>   libavformat/rtpdec_h264.c         |  7 +------
>   libavformat/rtpdec_hevc.c         | 13 +------------
>   libavformat/rtpdec_jpeg.c         |  2 +-
>   libavformat/rtpdec_latm.c         |  7 +------
>   libavformat/rtpdec_mpa_robust.c   |  7 +------
>   libavformat/rtpdec_mpeg4.c        |  8 ++------
>   libavformat/rtpdec_mpegts.c       |  7 +------
>   libavformat/rtpdec_qcelp.c        | 13 +------------
>   libavformat/rtpdec_qdm2.c         | 13 +------------
>   libavformat/rtpdec_qt.c           |  7 +------
>   libavformat/rtpdec_svq3.c         |  7 +------
>   libavformat/rtpdec_xiph.c         |  9 ++-------
>   18 files changed, 19 insertions(+), 123 deletions(-)
>

Ok.

Patch

diff --git a/libavformat/rtpdec_ac3.c b/libavformat/rtpdec_ac3.c
index 1b04a0b..4a793d4 100644
--- a/libavformat/rtpdec_ac3.c
+++ b/libavformat/rtpdec_ac3.c
@@ -31,11 +31,6 @@  struct PayloadContext {
     AVIOContext *fragment;
 };
 
-static PayloadContext *ac3_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void free_fragment(PayloadContext *data)
 {
     if (data->fragment) {
@@ -142,7 +137,7 @@  RTPDynamicProtocolHandler ff_ac3_dynamic_handler = {
     .codec_type         = AVMEDIA_TYPE_AUDIO,
     .codec_id           = AV_CODEC_ID_AC3,
     .need_parsing       = AVSTREAM_PARSE_FULL,
-    .alloc              = ac3_new_context,
+    .priv_data_size     = sizeof(PayloadContext),
     .free               = ac3_free_context,
     .parse_packet       = ac3_handle_packet,
 };
diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c
index 20956a6..897873b 100644
--- a/libavformat/rtpdec_amr.c
+++ b/libavformat/rtpdec_amr.c
@@ -47,11 +47,6 @@  static PayloadContext *amr_new_context(void)
     return data;
 }
 
-static void amr_free_context(PayloadContext *data)
-{
-    av_free(data);
-}
-
 static int amr_handle_packet(AVFormatContext *ctx, PayloadContext *data,
                              AVStream *st, AVPacket *pkt, uint32_t *timestamp,
                              const uint8_t *buf, int len, uint16_t seq,
@@ -196,7 +191,6 @@  RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler = {
     .codec_id         = AV_CODEC_ID_AMR_NB,
     .parse_sdp_a_line = amr_parse_sdp_line,
     .alloc            = amr_new_context,
-    .free             = amr_free_context,
     .parse_packet     = amr_handle_packet,
 };
 
@@ -206,6 +200,5 @@  RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler = {
     .codec_id         = AV_CODEC_ID_AMR_WB,
     .parse_sdp_a_line = amr_parse_sdp_line,
     .alloc            = amr_new_context,
-    .free             = amr_free_context,
     .parse_packet     = amr_handle_packet,
 };
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c
index 61b1419..b0a5035 100644
--- a/libavformat/rtpdec_asf.c
+++ b/libavformat/rtpdec_asf.c
@@ -277,11 +277,6 @@  static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf,
     return res == 1 ? -1 : res;
 }
 
-static PayloadContext *asfrtp_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void asfrtp_free_context(PayloadContext *asf)
 {
     if (asf->pktbuf) {
@@ -299,8 +294,8 @@  RTPDynamicProtocolHandler ff_ms_rtp_ ## n ## _handler = { \
     .enc_name         = s, \
     .codec_type       = t, \
     .codec_id         = AV_CODEC_ID_NONE, \
+    .priv_data_size   = sizeof(PayloadContext), \
     .parse_sdp_a_line = asfrtp_parse_sdp_line, \
-    .alloc            = asfrtp_new_context, \
     .free             = asfrtp_free_context, \
     .parse_packet     = asfrtp_parse_packet,   \
 }
diff --git a/libavformat/rtpdec_dv.c b/libavformat/rtpdec_dv.c
index f83fd90..79a7218 100644
--- a/libavformat/rtpdec_dv.c
+++ b/libavformat/rtpdec_dv.c
@@ -31,11 +31,6 @@  struct PayloadContext {
     int         bundled_audio;
 };
 
-static av_cold PayloadContext *dv_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void dv_free_dyn_buffer(AVIOContext **dyn_buf)
 {
     uint8_t *ptr_dyn_buffer;
@@ -150,7 +145,7 @@  RTPDynamicProtocolHandler ff_dv_dynamic_handler = {
     .codec_id         = AV_CODEC_ID_DVVIDEO,
     .need_parsing     = AVSTREAM_PARSE_FULL,
     .parse_sdp_a_line = dv_parse_sdp_line,
-    .alloc            = dv_new_context,
+    .priv_data_size   = sizeof(PayloadContext),
     .free             = dv_free_context,
     .parse_packet     = dv_handle_packet,
 };
diff --git a/libavformat/rtpdec_h261.c b/libavformat/rtpdec_h261.c
index 5972a14..dac76c8 100644
--- a/libavformat/rtpdec_h261.c
+++ b/libavformat/rtpdec_h261.c
@@ -32,11 +32,6 @@  struct PayloadContext {
     uint32_t     timestamp;
 };
 
-static av_cold PayloadContext *h261_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void h261_free_dyn_buffer(AVIOContext **dyn_buf)
 {
     uint8_t *ptr_dyn_buffer;
@@ -184,7 +179,7 @@  RTPDynamicProtocolHandler ff_h261_dynamic_handler = {
     .codec_type        = AVMEDIA_TYPE_VIDEO,
     .codec_id          = AV_CODEC_ID_H261,
     .need_parsing      = AVSTREAM_PARSE_FULL,
-    .alloc             = h261_new_context,
+    .priv_data_size    = sizeof(PayloadContext),
     .free              = h261_free_context,
     .parse_packet      = h261_handle_packet,
     .static_payload_id = 31,
diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c
index e4e4e21..a7e8287 100644
--- a/libavformat/rtpdec_h263_rfc2190.c
+++ b/libavformat/rtpdec_h263_rfc2190.c
@@ -39,11 +39,6 @@  struct PayloadContext {
     int          newformat;
 };
 
-static PayloadContext *h263_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void h263_free_context(PayloadContext *data)
 {
     if (!data)
@@ -202,7 +197,7 @@  RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = {
     .codec_id          = AV_CODEC_ID_H263,
     .need_parsing      = AVSTREAM_PARSE_FULL,
     .parse_packet      = h263_handle_packet,
-    .alloc             = h263_new_context,
+    .priv_data_size    = sizeof(PayloadContext),
     .free              = h263_free_context,
     .static_payload_id = 34,
 };
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c
index 597e137..8a38392 100644
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -342,11 +342,6 @@  static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data,
     return result;
 }
 
-static PayloadContext *h264_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void h264_free_context(PayloadContext *data)
 {
 #ifdef DEBUG
@@ -408,8 +403,8 @@  RTPDynamicProtocolHandler ff_h264_dynamic_handler = {
     .codec_type       = AVMEDIA_TYPE_VIDEO,
     .codec_id         = AV_CODEC_ID_H264,
     .need_parsing     = AVSTREAM_PARSE_FULL,
+    .priv_data_size   = sizeof(PayloadContext),
     .parse_sdp_a_line = parse_h264_sdp_line,
-    .alloc            = h264_new_context,
     .free             = h264_free_context,
     .parse_packet     = h264_handle_packet,
 };
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c
index 518cfa8..5d99e6a 100644
--- a/libavformat/rtpdec_hevc.c
+++ b/libavformat/rtpdec_hevc.c
@@ -43,16 +43,6 @@  struct PayloadContext {
 
 static const uint8_t start_sequence[] = { 0x00, 0x00, 0x00, 0x01 };
 
-static av_cold PayloadContext *hevc_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
-static av_cold void hevc_free_context(PayloadContext *data)
-{
-    av_free(data);
-}
-
 static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s,
                                               AVStream *stream,
                                               PayloadContext *hevc_data,
@@ -405,8 +395,7 @@  RTPDynamicProtocolHandler ff_hevc_dynamic_handler = {
     .codec_type       = AVMEDIA_TYPE_VIDEO,
     .codec_id         = AV_CODEC_ID_HEVC,
     .need_parsing     = AVSTREAM_PARSE_FULL,
+    .priv_data_size   = sizeof(PayloadContext),
     .parse_sdp_a_line = hevc_parse_sdp_line,
-    .alloc            = hevc_new_context,
-    .free             = hevc_free_context,
     .parse_packet     = hevc_handle_packet,
 };
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index caa1bd2..30681a7 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -385,7 +385,7 @@  RTPDynamicProtocolHandler ff_jpeg_dynamic_handler = {
     .enc_name          = "JPEG",
     .codec_type        = AVMEDIA_TYPE_VIDEO,
     .codec_id          = AV_CODEC_ID_MJPEG,
-    .alloc             = jpeg_new_context,
+    .priv_data_size    = sizeof(PayloadContext),
     .free              = jpeg_free_context,
     .parse_packet      = jpeg_parse_packet,
     .static_payload_id = 26,
diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c
index f911a2a..9758efa 100644
--- a/libavformat/rtpdec_latm.c
+++ b/libavformat/rtpdec_latm.c
@@ -31,11 +31,6 @@  struct PayloadContext {
     uint32_t timestamp;
 };
 
-static PayloadContext *latm_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void latm_free_context(PayloadContext *data)
 {
     if (!data)
@@ -183,8 +178,8 @@  RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler = {
     .enc_name           = "MP4A-LATM",
     .codec_type         = AVMEDIA_TYPE_AUDIO,
     .codec_id           = AV_CODEC_ID_AAC,
+    .priv_data_size     = sizeof(PayloadContext),
     .parse_sdp_a_line   = latm_parse_sdp_line,
-    .alloc              = latm_new_context,
     .free               = latm_free_context,
     .parse_packet       = latm_parse_packet,
 };
diff --git a/libavformat/rtpdec_mpa_robust.c b/libavformat/rtpdec_mpa_robust.c
index 548718c..f9f5b9e 100644
--- a/libavformat/rtpdec_mpa_robust.c
+++ b/libavformat/rtpdec_mpa_robust.c
@@ -41,11 +41,6 @@  static av_cold int mpa_robust_init(AVFormatContext *ctx, int st_index,
     return 0;
 }
 
-static PayloadContext *mpa_robust_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static inline void free_fragment(PayloadContext *data)
 {
     if (data->fragment) {
@@ -217,7 +212,7 @@  RTPDynamicProtocolHandler ff_mpeg_audio_robust_dynamic_handler = {
     .codec_type        = AVMEDIA_TYPE_AUDIO,
     .codec_id          = AV_CODEC_ID_MP3ADU,
     .need_parsing      = AVSTREAM_PARSE_HEADERS,
-    .alloc             = mpa_robust_new_context,
+    .priv_data_size    = sizeof(PayloadContext),
     .free              = mpa_robust_free_context,
     .parse_packet      = mpa_robust_parse_packet,
 };
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c
index c449ea6..4a0593b 100644
--- a/libavformat/rtpdec_mpeg4.c
+++ b/libavformat/rtpdec_mpeg4.c
@@ -91,11 +91,6 @@  static const AttrNameMap attr_names[] = {
     { NULL, -1, -1 },
 };
 
-static PayloadContext *new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void free_context(PayloadContext *data)
 {
     av_free(data->au_headers);
@@ -326,6 +321,7 @@  RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = {
     .codec_type         = AVMEDIA_TYPE_VIDEO,
     .codec_id           = AV_CODEC_ID_MPEG4,
     .need_parsing       = AVSTREAM_PARSE_FULL,
+    .priv_data_size     = sizeof(PayloadContext),
     .parse_sdp_a_line   = parse_sdp_line,
 };
 
@@ -333,8 +329,8 @@  RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler = {
     .enc_name           = "mpeg4-generic",
     .codec_type         = AVMEDIA_TYPE_AUDIO,
     .codec_id           = AV_CODEC_ID_AAC,
+    .priv_data_size     = sizeof(PayloadContext),
     .parse_sdp_a_line   = parse_sdp_line,
-    .alloc              = new_context,
     .free               = free_context,
     .parse_packet       = aac_parse_packet,
 };
diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c
index b3ef261..5ef17cb 100644
--- a/libavformat/rtpdec_mpegts.c
+++ b/libavformat/rtpdec_mpegts.c
@@ -30,11 +30,6 @@  struct PayloadContext {
     uint8_t buf[RTP_MAX_PACKET_LENGTH];
 };
 
-static PayloadContext *mpegts_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void mpegts_free_context(PayloadContext *data)
 {
     if (!data)
@@ -100,8 +95,8 @@  static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
 
 RTPDynamicProtocolHandler ff_mpegts_dynamic_handler = {
     .codec_type        = AVMEDIA_TYPE_DATA,
+    .priv_data_size    = sizeof(PayloadContext),
     .parse_packet      = mpegts_handle_packet,
-    .alloc             = mpegts_new_context,
     .init              = mpegts_init,
     .free              = mpegts_free_context,
     .static_payload_id = 33,
diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c
index b612c7d..d5322d6 100644
--- a/libavformat/rtpdec_qcelp.c
+++ b/libavformat/rtpdec_qcelp.c
@@ -47,16 +47,6 @@  struct PayloadContext {
     uint32_t next_timestamp;
 };
 
-static PayloadContext *qcelp_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
-static void qcelp_free_context(PayloadContext *data)
-{
-    av_free(data);
-}
-
 static int return_stored_frame(AVFormatContext *ctx, PayloadContext *data,
                                AVStream *st, AVPacket *pkt, uint32_t *timestamp,
                                const uint8_t *buf, int len);
@@ -223,8 +213,7 @@  RTPDynamicProtocolHandler ff_qcelp_dynamic_handler = {
     .enc_name           = "x-Purevoice",
     .codec_type         = AVMEDIA_TYPE_AUDIO,
     .codec_id           = AV_CODEC_ID_QCELP,
+    .priv_data_size     = sizeof(PayloadContext),
     .static_payload_id  = 12,
-    .alloc              = qcelp_new_context,
-    .free               = qcelp_free_context,
     .parse_packet       = qcelp_parse_packet,
 };
diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c
index 0d7b5bb..8eea571 100644
--- a/libavformat/rtpdec_qdm2.c
+++ b/libavformat/rtpdec_qdm2.c
@@ -298,21 +298,10 @@  static int qdm2_parse_packet(AVFormatContext *s, PayloadContext *qdm,
     return (qdm->cache > 0) ? 1 : 0;
 }
 
-static PayloadContext *qdm2_extradata_new(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
-static void qdm2_extradata_free(PayloadContext *qdm)
-{
-    av_free(qdm);
-}
-
 RTPDynamicProtocolHandler ff_qdm2_dynamic_handler = {
     .enc_name         = "X-QDM",
     .codec_type       = AVMEDIA_TYPE_AUDIO,
     .codec_id         = AV_CODEC_ID_NONE,
-    .alloc            = qdm2_extradata_new,
-    .free             = qdm2_extradata_free,
+    .priv_data_size   = sizeof(PayloadContext),
     .parse_packet     = qdm2_parse_packet,
 };
diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c
index 2d9c603..7c14bad 100644
--- a/libavformat/rtpdec_qt.c
+++ b/libavformat/rtpdec_qt.c
@@ -235,11 +235,6 @@  static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt,
     }
 }
 
-static PayloadContext *qt_rtp_new(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void qt_rtp_free(PayloadContext *qt)
 {
     av_freep(&qt->pkt.data);
@@ -251,7 +246,7 @@  RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \
     .enc_name         = s, \
     .codec_type       = t, \
     .codec_id         = AV_CODEC_ID_NONE, \
-    .alloc            = qt_rtp_new,    \
+    .priv_data_size   = sizeof(PayloadContext), \
     .free             = qt_rtp_free,   \
     .parse_packet     = qt_rtp_parse_packet, \
 }
diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c
index aa880e5..d2c0a0b 100644
--- a/libavformat/rtpdec_svq3.c
+++ b/libavformat/rtpdec_svq3.c
@@ -109,11 +109,6 @@  static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv,
     return AVERROR(EAGAIN);
 }
 
-static PayloadContext *svq3_extradata_new(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static void svq3_extradata_free(PayloadContext *sv)
 {
     if (sv->pktbuf) {
@@ -128,7 +123,7 @@  RTPDynamicProtocolHandler ff_svq3_dynamic_handler = {
     .enc_name         = "X-SV3V-ES",
     .codec_type       = AVMEDIA_TYPE_VIDEO,
     .codec_id         = AV_CODEC_ID_NONE,      // see if (config_packet) above
-    .alloc            = svq3_extradata_new,
+    .priv_data_size   = sizeof(PayloadContext),
     .free             = svq3_extradata_free,
     .parse_packet     = svq3_parse_packet,
 };
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index ce3d591..d7a08bc 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -49,11 +49,6 @@  struct PayloadContext {
     int split_pkts;
 };
 
-static PayloadContext *xiph_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
 static inline void free_fragment(PayloadContext * data)
 {
     if (data->fragment) {
@@ -385,8 +380,8 @@  RTPDynamicProtocolHandler ff_theora_dynamic_handler = {
     .enc_name         = "theora",
     .codec_type       = AVMEDIA_TYPE_VIDEO,
     .codec_id         = AV_CODEC_ID_THEORA,
+    .priv_data_size   = sizeof(PayloadContext),
     .parse_sdp_a_line = xiph_parse_sdp_line,
-    .alloc            = xiph_new_context,
     .free             = xiph_free_context,
     .parse_packet     = xiph_handle_packet,
 };
@@ -396,8 +391,8 @@  RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
     .codec_type       = AVMEDIA_TYPE_AUDIO,
     .codec_id         = AV_CODEC_ID_VORBIS,
     .need_parsing     = AVSTREAM_PARSE_HEADERS,
+    .priv_data_size   = sizeof(PayloadContext),
     .parse_sdp_a_line = xiph_parse_sdp_line,
-    .alloc            = xiph_new_context,
     .free             = xiph_free_context,
     .parse_packet     = xiph_handle_packet,
 };