[001/264] avpacket: add a function for wrapping existing data as side data

Message ID 1447012658-16819-2-git-send-email-anton@khirnov.net
State Committed
Headers show

Commit Message

Anton Khirnov Nov. 8, 2015, 7:57 p.m.
---
 doc/APIchanges        |  4 +++-
 libavcodec/avcodec.h  | 16 ++++++++++++++++
 libavcodec/avpacket.c | 38 ++++++++++++++++++++++++++++----------
 libavcodec/version.h  |  2 +-
 4 files changed, 48 insertions(+), 12 deletions(-)

Comments

Luca Barbato Nov. 8, 2015, 8:14 p.m. | #1
On 08/11/15 20:57, Anton Khirnov wrote:
> ---
>  doc/APIchanges        |  4 +++-
>  libavcodec/avcodec.h  | 16 ++++++++++++++++
>  libavcodec/avpacket.c | 38 ++++++++++++++++++++++++++++----------
>  libavcodec/version.h  |  2 +-
>  4 files changed, 48 insertions(+), 12 deletions(-)
> 

Fine for me.

lu
Kieran Kunhya Nov. 8, 2015, 11:03 p.m. | #2
>      pkt->side_data = av_realloc(pkt->side_data,
>                                  (elems + 1) * sizeof(*pkt->side_data));

Would a linked list be better? (I'm not sure)

Kieran
Anton Khirnov Nov. 9, 2015, 6:29 a.m. | #3
Quoting Kieran Kunhya (2015-11-09 00:03:19)
> >      pkt->side_data = av_realloc(pkt->side_data,
> >                                  (elems + 1) * sizeof(*pkt->side_data));
> 
> Would a linked list be better? (I'm not sure)
> 

Well, it's too late to make this decision, the struct already exists.

Patch

diff --git a/doc/APIchanges b/doc/APIchanges
index d301bd5..8c12284 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -12,7 +12,9 @@  libavutil:     2015-08-28
 
 
 API changes, most recent first:
-2015-xx-xx - xxxxxxx - lavc 57.6.0 - avcodec.h
+
+2015-xx-xx - xxxxxxx - lavc 57.9.0 - avcodec.h
+  Add av_packet_add_side_data().
 
 2015-xx-xx - lavc 57.7.0 - avcodec.h
   xxxxxx - Deprecate av_free_packet(). Use av_packet_unref() as replacement,
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index b274ecd..a139113 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3543,6 +3543,22 @@  uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
                                  int size);
 
 /**
+ * Wrap an existing array as a packet side data.
+ *
+ * @param pkt packet
+ * @param type side information type
+ * @param data the side data array. It must be allocated with the av_malloc()
+ *             family of functions. The ownership of the data is transferred to
+ *             pkt.
+ * @param size side information size
+ * @return a non-negative number on success, a negative AVERROR code on
+ *         failure. On failure, the packet is unchanged and the data remains
+ *         owned by the caller.
+ */
+int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                            uint8_t *data, size_t size);
+
+/**
  * Shrink the already allocated side data buffer
  *
  * @param pkt packet
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index a6eb241..80e7158 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -237,29 +237,47 @@  void av_free_packet(AVPacket *pkt)
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
-uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size)
+int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                            uint8_t *data, size_t size)
 {
     int elems = pkt->side_data_elems;
 
     if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data))
-        return NULL;
-    if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
-        return NULL;
+        return AVERROR(EOVERFLOW);
 
     pkt->side_data = av_realloc(pkt->side_data,
                                 (elems + 1) * sizeof(*pkt->side_data));
     if (!pkt->side_data)
-        return NULL;
+        return AVERROR(ENOMEM);
 
-    pkt->side_data[elems].data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
-    if (!pkt->side_data[elems].data)
-        return NULL;
+    pkt->side_data[elems].data = data;
     pkt->side_data[elems].size = size;
     pkt->side_data[elems].type = type;
     pkt->side_data_elems++;
 
-    return pkt->side_data[elems].data;
+    return 0;
+}
+
+
+uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int size)
+{
+    int ret;
+    uint8_t *data;
+
+    if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
+        return NULL;
+    data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+    if (!data)
+        return NULL;
+
+    ret = av_packet_add_side_data(pkt, type, data, size);
+    if (ret < 0) {
+        av_freep(&data);
+        return NULL;
+    }
+
+    return data;
 }
 
 uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index bd75525..5776670 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@ 
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR  8
+#define LIBAVCODEC_VERSION_MINOR  9
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \