Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'

[ffmpeg] / libavformat / rtpdec_mpa_robust.c

diff --git a/libavformat/rtpdec_mpa_robust.c b/libavformat/rtpdec_mpa_robust.c
index 50c58e1082105f47a63956e0fe950991ed4ea661..776e245e253efc4f63b8383bd18cbaabd5e47915 100644 (file)
--- a/libavformat/rtpdec_mpa_robust.c
+++ b/libavformat/rtpdec_mpa_robust.c
@@ -22,6 +22,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/intreadwrite.h"
 
+#include "avio_internal.h"
 #include "rtpdec_formats.h"
 
 struct PayloadContext {
@@ -33,35 +34,10 @@ struct PayloadContext {
     AVIOContext *fragment;
 };
 
-static av_cold int mpa_robust_init(AVFormatContext *ctx, int st_index,
-                                   PayloadContext *data)
+static void mpa_robust_close_context(PayloadContext *data)
 {
-    if (st_index < 0)
-        return 0;
-    ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_HEADERS;
-    return 0;
-}
-
-static PayloadContext *mpa_robust_new_context(void)
-{
-    return av_mallocz(sizeof(PayloadContext));
-}
-
-static inline void free_fragment(PayloadContext *data)
-{
-    if (data->fragment) {
-        uint8_t *p;
-        avio_close_dyn_buf(data->fragment, &p);
-        av_free(p);
-        data->fragment = NULL;
-    }
-}
-
-static void mpa_robust_free_context(PayloadContext *data)
-{
-    free_fragment(data);
+    ffio_free_dyn_buf(&data->fragment);
     av_free(data->split_buf);
-    av_free(data);
 }
 
 static int mpa_robust_parse_rtp_header(AVFormatContext *ctx,
@@ -169,7 +145,7 @@ static int mpa_robust_parse_packet(AVFormatContext *ctx, PayloadContext *data,
         return 0;
     } else if (!continuation) { /* && adu_size > len */
         /* First fragment */
-        free_fragment(data);
+        ffio_free_dyn_buf(&data->fragment);
 
         data->adu_size = adu_size;
         data->cur_size = len;
@@ -192,7 +168,7 @@ static int mpa_robust_parse_packet(AVFormatContext *ctx, PayloadContext *data,
     }
     if (adu_size = data->adu_size ||
         data->timestamp != *timestamp) {
-        free_fragment(data);
+        ffio_free_dyn_buf(&data->fragment);
         av_log(ctx, AV_LOG_ERROR, "Invalid packet received\n");
         return AVERROR_INVALIDDATA;
     }
@@ -214,11 +190,11 @@ static int mpa_robust_parse_packet(AVFormatContext *ctx, PayloadContext *data,
 }
 
 RTPDynamicProtocolHandler ff_mpeg_audio_robust_dynamic_handler = {
+    .enc_name          = "mpa-robust",
     .codec_type        = AVMEDIA_TYPE_AUDIO,
     .codec_id          = AV_CODEC_ID_MP3ADU,
-    .init              = mpa_robust_init,
-    .alloc             = mpa_robust_new_context,
-    .free              = mpa_robust_free_context,
+    .need_parsing      = AVSTREAM_PARSE_HEADERS,
+    .priv_data_size    = sizeof(PayloadContext),
+    .close             = mpa_robust_close_context,
     .parse_packet      = mpa_robust_parse_packet,
-    .enc_name          = "mpa-robust",
 };