forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-14 03:23:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't cache dict_frame

Browse Source
This commit is contained in:
Devaev Maxim
2021-03-14 18:16:41 +03:00
parent 91ff97f721
commit 5e49f50e22
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
python/ustreamer.c
View File

@@ -50,7 +50,6 @@ typedef struct {
memsink_shared_s *mem; memsink_shared_s *mem;
tmp_frame_s *tmp_frame; tmp_frame_s *tmp_frame;
PyObject *dict_frame; // PyDict
} MemsinkObject; } MemsinkObject;
@@ -67,10 +66,6 @@ static void MemsinkObject_destroy_internals(MemsinkObject *self) {
close(self->fd); close(self->fd);
self->fd = -1; self->fd = -1;
} }
if (self->dict_frame != NULL) {
Py_DECREF(self->dict_frame);
self->dict_frame = NULL;
}
if (self->tmp_frame) { if (self->tmp_frame) {
if (TMP(data)) { if (TMP(data)) {
free(TMP(data)); free(TMP(data));
@@ -108,10 +103,6 @@ static int MemsinkObject_init(MemsinkObject *self, PyObject *args, PyObject *kwa
TMP(allocated) = 512 * 1024; TMP(allocated) = 512 * 1024;
A_REALLOC(TMP(data), TMP(allocated)); A_REALLOC(TMP(data), TMP(allocated));
if ((self->dict_frame = PyDict_New()) == NULL) {
goto error;
}
if ((self->fd = shm_open(self->obj, O_RDWR, 0)) == -1) { if ((self->fd = shm_open(self->obj, O_RDWR, 0)) == -1) {
PyErr_SetFromErrno(PyExc_OSError); PyErr_SetFromErrno(PyExc_OSError);
goto error; goto error;
@@ -274,14 +265,17 @@ static PyObject *MemsinkObject_wait_frame(MemsinkObject *self, PyObject *Py_UNUS
return PyErr_SetFromErrno(PyExc_OSError); return PyErr_SetFromErrno(PyExc_OSError);
} }
PyDict_Clear(self->dict_frame); PyObject *dict_frame = PyDict_New();
if (dict_frame == NULL) {
return NULL;
}
# define SET_VALUE(_key, _maker) { \ # define SET_VALUE(_key, _maker) { \
PyObject *_tmp = _maker; \ PyObject *_tmp = _maker; \
if (_tmp == NULL) { \ if (_tmp == NULL) { \
return NULL; \ return NULL; \
} \ } \
if (PyDict_SetItemString(self->dict_frame, _key, _tmp) < 0) { \ if (PyDict_SetItemString(dict_frame, _key, _tmp) < 0) { \
Py_DECREF(_tmp); \ Py_DECREF(_tmp); \
return NULL; \ return NULL; \
} \ } \
@@ -303,8 +297,7 @@ static PyObject *MemsinkObject_wait_frame(MemsinkObject *self, PyObject *Py_UNUS
# undef SET_NUMBER # undef SET_NUMBER
# undef SET_VALUE # undef SET_VALUE
Py_INCREF(self->dict_frame); return dict_frame;
return self->dict_frame;
} }
static PyObject *MemsinkObject_is_opened(MemsinkObject *self, PyObject *Py_UNUSED(ignored)) { static PyObject *MemsinkObject_is_opened(MemsinkObject *self, PyObject *Py_UNUSED(ignored)) {