[FFmpeg-devel] [PATCH 1/2] avcodec/cbs: add ff_cbs_read_buf()

[James Almer]

To take a reference from an existing buffer outside of AVPackets.

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavcodec/cbs.c | 10 +++++++++-
 libavcodec/cbs.h | 11 +++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c
index c0f6c62d20..b26e3ea3de 100644
--- a/libavcodec/cbs.c
+++ b/libavcodec/cbs.c
@@ -261,7 +261,7 @@ static int cbs_fill_fragment_data(CodedBitstreamFragment *frag,
 
 static int cbs_read_data(CodedBitstreamContext *ctx,
                          CodedBitstreamFragment *frag,
-                         AVBufferRef *buf,
+                         const AVBufferRef *buf,
                          const uint8_t *data, size_t size,
                          int header)
 {
@@ -334,6 +334,14 @@ int CBS_FUNC(read)(CodedBitstreamContext *ctx,
     return cbs_read_data(ctx, frag, NULL,
                          data, size, 0);
 }
+
+int CBS_FUNC(read_buf)(CodedBitstreamContext *ctx,
+                       CodedBitstreamFragment *frag,
+                       const AVBufferRef *buf)
+{
+    return cbs_read_data(ctx, frag, buf,
+                         buf->data, buf->size, 0);
+}
 #endif
 
 #if CBS_WRITE
diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h
index 47818d5c12..8b503fdcce 100644
--- a/libavcodec/cbs.h
+++ b/libavcodec/cbs.h
@@ -381,6 +381,17 @@ int CBS_FUNC(read)(CodedBitstreamContext *ctx,
                 CodedBitstreamFragment *frag,
                 const uint8_t *data, size_t size);
 
+/**
+ * Read a bitstream from a memory region into a fragment, then
+ * split into units and decompose.
+ *
+ * This acts identical to ff_cbs_read() with the addition of an
+ * AVBufferRef backing the data.
+ */
+int CBS_FUNC(read_buf)(CodedBitstreamContext *ctx,
+                       CodedBitstreamFragment *frag,
+                       const AVBufferRef *buf);
+
 
 /**
  * Write the content of the fragment to its own internal buffer.
-- 
2.49.0