eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

MediaImpl: move buffer processing in gstNewSampleCallback (bug #30)

Browse Source 
Buffer releasing should happen independently of videoPull() getting called for
texture updates. We move all processing and buffer unreferencing in
gstNewSampleCallback. This way we don't run out of memory in case of video
pipeline playing without texture/mappings.
This commit is contained in:
Vasilis Liaskovitis
2014-10-20 00:33:53 +02:00
committed by Tats
parent 0735271fa7
commit c85b4e073c
1 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaImpl.cpp
+31 -36
View File
@@ -98,42 +98,7 @@ bool MediaImpl::_videoPull()
// Either means we are not playing or we have reached EOS.
return false;
}
else
{
// Pull current frame buffer.
GstBuffer *buffer = gst_sample_get_buffer(sample);
// for live sources, video dimensions have not been set, because
// gstPadAddedCallback is never called. Fix dimensions from first sample /
// caps we receive
if (_isSharedMemorySource && ( _padHandlerData.width == -1 ||
_padHandlerData.height == -1)) {
GstCaps *caps = gst_sample_get_caps(sample);
GstStructure *structure;
structure = gst_caps_get_structure(caps, 0);
gst_structure_get_int(structure, "width", &_padHandlerData.width);
gst_structure_get_int(structure, "height", &_padHandlerData.height);
// g_print("Size is %u x %u\n", _padHandlerData.width, _padHandlerData.height);
}
GstMapInfo map;
if (gst_buffer_map(buffer, &map, GST_MAP_READ))
{
// For debugging:
//gst_util_dump_mem(map.data, map.size)
_data = map.data;
// release memory previously mapped with gst_buffer_map
gst_buffer_unmap(buffer, &map);
if (this->_frame != NULL)
{
// queue this frame to async queue
_queueOutputBuffer.put(this->_frame);
}
_frame = sample;
}
return true;
}
else return true;
}
bool MediaImpl::_eos() const
@@ -152,11 +117,41 @@ bool MediaImpl::_eos() const
GstFlowReturn MediaImpl::gstNewSampleCallback(GstElement*, MediaImpl *p)
{
GstSample *sample;
GstMapInfo map;
sample = gst_app_sink_pull_sample(GST_APP_SINK(p->_appsink0));
//g_signal_emit_by_name (p->_appsink0, "pull-sample", &sample);
// save last frame
p->getQueueInputBuffer()->put(sample);
GstBuffer *buffer = gst_sample_get_buffer(sample);
// for live sources, video dimensions have not been set, because
// gstPadAddedCallback is never called. Fix dimensions from first sample /
// caps we receive
if (p->_isSharedMemorySource && ( p->_padHandlerData.width == -1 ||
p->_padHandlerData.height == -1)) {
GstCaps *caps = gst_sample_get_caps(sample);
GstStructure *structure;
structure = gst_caps_get_structure(caps, 0);
gst_structure_get_int(structure, "width", &p->_padHandlerData.width);
gst_structure_get_int(structure, "height", &p->_padHandlerData.height);
// g_print("Size is %u x %u\n", _padHandlerData.width, _padHandlerData.height);
}
if (gst_buffer_map(buffer, &map, GST_MAP_READ))
{
// For debugging:
//gst_util_dump_mem(map.data, map.size)
p->_data = map.data;
// release memory previously mapped with gst_buffer_map
gst_buffer_unmap(buffer, &map);
if (p->_frame != NULL)
{
// queue this frame to async queue
p->getQueueOutputBuffer()->put(p->_frame);
}
p->_frame = sample;
}
// we only keep the last one:
if (p->getQueueOutputBuffer()->size() > 1)