diff mbox

[FFmpeg-devel,1/6] avcodec/avpacket: add av_packet_make_refcounted()

Message ID 20180330172423.11712-1-jamrial@gmail.com
State Accepted
Headers show

Commit Message

James Almer March 30, 2018, 5:24 p.m. UTC 
It works as a drop in replacement for the deprecated av_dup_packet(),
to ensure a packet is reference counted.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/avcodec.h  | 18 +++++++++++++++++-
 libavcodec/avpacket.c | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

Comments

Michael Niedermayer April 1, 2018, 2:12 p.m. UTC | #1 
On Fri, Mar 30, 2018 at 02:24:23PM -0300, James Almer wrote:
> It works as a drop in replacement for the deprecated av_dup_packet(),
> to ensure a packet is reference counted.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/avcodec.h  | 18 +++++++++++++++++-
>  libavcodec/avpacket.c | 18 ++++++++++++++++++
>  2 files changed, 35 insertions(+), 1 deletion(-)

LGTM

thx

[...]
James Almer April 2, 2018, 3:50 a.m. UTC | #2 
On 4/1/2018 11:12 AM, Michael Niedermayer wrote:
> On Fri, Mar 30, 2018 at 02:24:23PM -0300, James Almer wrote:
>> It works as a drop in replacement for the deprecated av_dup_packet(),
>> to ensure a packet is reference counted.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavcodec/avcodec.h  | 18 +++++++++++++++++-
>>  libavcodec/avpacket.c | 18 ++++++++++++++++++
>>  2 files changed, 35 insertions(+), 1 deletion(-)
> 
> LGTM
> 
> thx

Patchset pushed.
diff mbox

Patch

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3306910dd2..c046f300ef 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4365,7 +4365,7 @@  int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
  * @warning This is a hack - the packet memory allocation stuff is broken. The
  * packet is allocated if it was not really allocated.
  *
- * @deprecated Use av_packet_ref
+ * @deprecated Use av_packet_ref or av_packet_make_refcounted
  */
 attribute_deprecated
 int av_dup_packet(AVPacket *pkt);
@@ -4536,6 +4536,22 @@  void av_packet_move_ref(AVPacket *dst, AVPacket *src);
  */
 int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
 
+/**
+ * Ensure the data described by a given packet is reference counted.
+ *
+ * @note This function does no ensure that the reference will be writable.
+ *       Use av_packet_make_writable instead for that purpose.
+ *
+ * @see av_packet_ref
+ * @see av_packet_make_writable
+ *
+ * @param pkt packet whose data should be made reference counted.
+ *
+ * @return 0 on success, a negative AVERROR on error. On failure, the
+ *         packet is unchanged.
+ */
+int av_packet_make_refcounted(AVPacket *pkt);
+
 /**
  * Create a writable reference for the data described by a given packet,
  * avoiding data copy if possible.
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 0993481961..99a0c1383b 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -652,6 +652,24 @@  void av_packet_move_ref(AVPacket *dst, AVPacket *src)
     src->size = 0;
 }
 
+int av_packet_make_refcounted(AVPacket *pkt)
+{
+    int ret;
+
+    if (pkt->buf)
+        return 0;
+
+    ret = packet_alloc(&pkt->buf, pkt->size);
+    if (ret < 0)
+        return ret;
+    if (pkt->size)
+        memcpy(pkt->buf->data, pkt->data, pkt->size);
+
+    pkt->data = pkt->buf->data;
+
+    return 0;
+}
+
 int av_packet_make_writable(AVPacket *pkt)
 {
     AVBufferRef *buf = NULL;