github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 13:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't mess with the OMX Buffer Size

Browse source
This commit is contained in:
Florian Märkl 2021-01-04 12:44:13 +01:00
commit 1ee23e0fa2
1 changed files with 43 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

47
lib/src/pidecoder.c
View file

@ -8,7 +8,6 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#define MAX_DECODE_UNIT_SIZE 262144
CHIAKI_EXPORT ChiakiErrorCode chiaki_pi_decoder_init(ChiakiPiDecoder *decoder, ChiakiLog *log) CHIAKI_EXPORT ChiakiErrorCode chiaki_pi_decoder_init(ChiakiPiDecoder *decoder, ChiakiLog *log)
{ {
@ -108,29 +107,6 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_pi_decoder_init(ChiakiPiDecoder *decoder, C
return CHIAKI_ERR_UNKNOWN; return CHIAKI_ERR_UNKNOWN;
} }
OMX_PARAM_PORTDEFINITIONTYPE port;
memset(&port, 0, sizeof(OMX_PARAM_PORTDEFINITIONTYPE));
port.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE);
port.nVersion.nVersion = OMX_VERSION;
port.nPortIndex = 130;
if(OMX_GetParameter(ILC_GET_HANDLE(decoder->video_decode), OMX_IndexParamPortDefinition, &port) != OMX_ErrorNone)
{
CHIAKI_LOGE(decoder->log, "Failed to get decoder port definition\n");
chiaki_pi_decoder_fini(decoder);
return CHIAKI_ERR_UNKNOWN;
}
// Increase the buffer size to fit the largest possible frame
port.nBufferSize = MAX_DECODE_UNIT_SIZE;
if(OMX_SetParameter(ILC_GET_HANDLE(decoder->video_decode), OMX_IndexParamPortDefinition, &port) != OMX_ErrorNone)
{
CHIAKI_LOGE(decoder->log, "OMX_SetParameter failed for port");
chiaki_pi_decoder_fini(decoder);
return CHIAKI_ERR_UNKNOWN;
}
if(ilclient_enable_port_buffers(decoder->video_decode, 130, NULL, NULL, NULL) != 0) if(ilclient_enable_port_buffers(decoder->video_decode, 130, NULL, NULL, NULL) != 0)
{ {
CHIAKI_LOGE(decoder->log, "ilclient_enable_port_buffers failed"); CHIAKI_LOGE(decoder->log, "ilclient_enable_port_buffers failed");
@ -179,6 +155,8 @@ CHIAKI_EXPORT void chiaki_pi_decoder_fini(ChiakiPiDecoder *decoder)
} }
static bool push_buffer(ChiakiPiDecoder *decoder, uint8_t *buf, size_t buf_size) static bool push_buffer(ChiakiPiDecoder *decoder, uint8_t *buf, size_t buf_size)
{
while(buf_size)
{ {
OMX_BUFFERHEADERTYPE *omx_buf = ilclient_get_input_buffer(decoder->video_decode, 130, 1); OMX_BUFFERHEADERTYPE *omx_buf = ilclient_get_input_buffer(decoder->video_decode, 130, 1);
if(!omx_buf) if(!omx_buf)
@ -187,24 +165,26 @@ static bool push_buffer(ChiakiPiDecoder *decoder, uint8_t *buf, size_t buf_size)
return false; return false;
} }
if(omx_buf->nAllocLen < buf_size) size_t push_size = buf_size;
if(push_size > omx_buf->nAllocLen)
{ {
CHIAKI_LOGE(decoder->log, "Buffer from omx is too small for frame"); CHIAKI_LOGW(decoder->log, "OMX Buffer too small, fragmenting to multiple buffers.");
return false; push_size = omx_buf->nAllocLen;
} }
memcpy(omx_buf->pBuffer, buf, push_size);
omx_buf->nFilledLen = 0; buf_size -= push_size;
buf += push_size;
omx_buf->nFilledLen = push_size;
omx_buf->nOffset = 0; omx_buf->nOffset = 0;
omx_buf->nFlags = OMX_BUFFERFLAG_ENDOFFRAME; omx_buf->nFlags = 0;
if(!buf_size)
omx_buf->nFlags |= OMX_BUFFERFLAG_ENDOFFRAME;
if(decoder->first_packet) if(decoder->first_packet)
{ {
omx_buf->nFlags |= OMX_BUFFERFLAG_STARTTIME; omx_buf->nFlags |= OMX_BUFFERFLAG_STARTTIME;
decoder->first_packet = false; decoder->first_packet = false;
} }
memcpy(omx_buf->pBuffer + omx_buf->nFilledLen, buf, buf_size);
omx_buf->nFilledLen += buf_size;
if(!decoder->port_settings_changed if(!decoder->port_settings_changed
&& ((omx_buf->nFilledLen > 0 && ilclient_remove_event(decoder->video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1) == 0) && ((omx_buf->nFilledLen > 0 && ilclient_remove_event(decoder->video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1) == 0)
|| (omx_buf->nFilledLen == 0 && ilclient_wait_for_event(decoder->video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1, ILCLIENT_EVENT_ERROR | ILCLIENT_PARAMETER_CHANGED, 10000) == 0))) || (omx_buf->nFilledLen == 0 && ilclient_wait_for_event(decoder->video_decode, OMX_EventPortSettingsChanged, 131, 0, 0, 1, ILCLIENT_EVENT_ERROR | ILCLIENT_PARAMETER_CHANGED, 10000) == 0)))
@ -225,6 +205,7 @@ static bool push_buffer(ChiakiPiDecoder *decoder, uint8_t *buf, size_t buf_size)
CHIAKI_LOGE(decoder->log, "OMX_EmptyThisBuffer failed"); CHIAKI_LOGE(decoder->log, "OMX_EmptyThisBuffer failed");
return false; return false;
} }
}
return true; return true;
} }