FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

adaptivedemux2: Handle another case in download_request_take_buffer_range

Browse Source 
Handle the case where we want to get a range from the available data that
doesn't start at the first available byte (and discard the bytes before that
start offset).

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3883>
This commit is contained in:
Jan Schmidt 2022-10-14 22:12:26 +11:00 committed by GStreamer Marge Bot
parent cbb9cfe987
commit 40938c8853
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
subprojects/gst-plugins-good/ext/adaptivedemux2/downloadrequest.c
View File

@ -235,6 +235,10 @@ download_request_take_buffer (DownloadRequest * request)
return buffer; return buffer;
} }
/* Extract the byte range of the download, matching the
* requested range against the GST_BUFFER_OFFSET() values of the
* data buffer, which tracks the byte position in the
* original resource */
GstBuffer * GstBuffer *
download_request_take_buffer_range (DownloadRequest * request, download_request_take_buffer_range (DownloadRequest * request,
gint64 target_range_start, gint64 target_range_end) gint64 target_range_start, gint64 target_range_end)
@ -263,15 +267,20 @@ download_request_take_buffer_range (DownloadRequest * request,
gint64 avail_start = GST_BUFFER_OFFSET (input_buffer); gint64 avail_start = GST_BUFFER_OFFSET (input_buffer);
gint64 avail_end = avail_start + gst_buffer_get_size (input_buffer) - 1; gint64 avail_end = avail_start + gst_buffer_get_size (input_buffer) - 1;
target_range_start = MAX (avail_start, target_range_start);
if (target_range_start <= avail_end) { if (target_range_start <= avail_end) {
/* There's at least 1 byte available that belongs to this target request, but /* There's at least 1 byte available that belongs to this target request, but
* does this buffer need splitting in two? */ * does this buffer need splitting in two? */
if (target_range_end != -1 && target_range_end < avail_end) { if (target_range_end != -1 && target_range_end < avail_end) {
/* Yes, it does. Cut off the front of the buffer */ /* Yes, it does. Drop the front of the buffer if needed and take the piece we want */
guint64 start_offset = target_range_start - avail_start;
buffer = buffer =
gst_buffer_copy_region (input_buffer, GST_BUFFER_COPY_MEMORY, 0, gst_buffer_copy_region (input_buffer, GST_BUFFER_COPY_MEMORY,
target_range_end - avail_start); start_offset, target_range_end - avail_start);
GST_BUFFER_OFFSET (buffer) = GST_BUFFER_OFFSET (input_buffer); GST_BUFFER_OFFSET (buffer) =
GST_BUFFER_OFFSET (input_buffer) + start_offset;
/* Put the rest of the buffer back */ /* Put the rest of the buffer back */
priv->buffer = priv->buffer =
@ -280,8 +289,20 @@ download_request_take_buffer_range (DownloadRequest * request,
/* Release the original buffer. The sub-buffers are holding their own refs as needed */ /* Release the original buffer. The sub-buffers are holding their own refs as needed */
gst_buffer_unref (input_buffer); gst_buffer_unref (input_buffer);
} else if (target_range_start != avail_start) {
/* We want to the end of the buffer, but need to drop a piece at the front */
guint64 start_offset = target_range_start - avail_start;
buffer =
gst_buffer_copy_region (input_buffer, GST_BUFFER_COPY_MEMORY,
start_offset, -1);
GST_BUFFER_OFFSET (buffer) =
GST_BUFFER_OFFSET (input_buffer) + start_offset;
/* Release the original buffer. The sub-buffer is holding its own ref as needed */
gst_buffer_unref (input_buffer);
} else { } else {
/* No, return the entire buffer */ /* No, return the entire buffer as-is */
buffer = input_buffer; buffer = input_buffer;
} }
} }