Skip to content

Optimize Stream.create_stream_from_file_obj by using file.readinto() … #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Keithcat1 wants to merge 4 commits into
base: cython
Choose a base branch
from
Open

Optimize Stream.create_stream_from_file_obj by using file.readinto() … #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ff3579
Optimize Stream.create_stream_from_file_obj by using file.readinto() …
Keithcat1 Mar 3, 2022
af93ddf
bass.Stream.create_stream_from_file_obj: if readinto() is not availab…
Keithcat1 Mar 5, 2022
ea23f34
Fix use of wrong variable name
Keithcat1 Mar 8, 2022
6567f29
Fix wrong use of attribute name.
Keithcat1 Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions Bass4Py/bass/stream.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from libc.string cimport memmove

from ..bindings.bass cimport (
_BASS_ATTRIB_BITRATE,
_BASS_ATTRIB_NET_RESUME,
Expand Down Expand Up @@ -97,18 +96,15 @@ cdef QWORD __stdcall CFILELENPROC_STD(void *user) with gil:

cdef DWORD CFILEREADPROC(void *buffer, DWORD length, void *user) with gil:
cdef Stream strm = <Stream?>user
cdef bytes data
cdef DWORD blen

cdef unsigned char[:] buffer_memoryview = <unsigned char[:length]>buffer # make memoryview, using buffer as the memory
cdef const unsigned char[:] bytes_memoryview # if readinto() is not available, we'll put the result of read() in this variable and copy the data
try:
data = strm._file.read(length)
blen = len(data)

if blen > length:
data = data[:length]
blen = length

memmove(buffer, <char *>data, blen)
if hasattr(strm._file, "readinto"): blen = strm._file.readinto(buffer_memoryview) # read data directly from file into the buffer
elif hasattr(strm._file, "read"):
bytes_memoryview = strm._file.read(length)
len = bytes_memoryview.shape[0] # we might not've gotten as much data as requested
buffer_memoryview[:len] = bytes_memoryview[:len] # let Cython copy the data for us
return blen
except Exception:
warnings.warn(traceback.format_exc(), RuntimeWarning)
Expand Down