# include "config.h"
#endif
-#include <dlfcn.h>
-#if defined(USE_IOMX)
-/* On dll_open, just check that the OMX_Init symbol already is loaded */
-# define dll_open(name) dlsym(RTLD_DEFAULT, "OMX_Init")
-# define dll_close(handle) do { } while (0)
-# define dlsym(handle, name) dlsym(RTLD_DEFAULT, "I" name)
-#else
-# define dll_open(name) dlopen( name, RTLD_NOW )
-# define dll_close(handle) dlclose(handle)
-#endif
-
#include <limits.h>
#include <vlc_common.h>
#include "../h264_nal.h"
#include "omxil.h"
+#include "omxil_core.h"
+#include "OMX_Broadcom.h"
#ifndef NDEBUG
# define OMXIL_EXTRA_DEBUG
#define SENTINEL_FLAG 0x10000
-/*****************************************************************************
- * List of OpenMAX IL core we will try in order
- *****************************************************************************/
-static const char *ppsz_dll_list[] =
-{
-#if defined(USE_IOMX)
- "libiomx.so", /* Not used when using IOMX, the lib should already be loaded */
-#else
- "libOMX_Core.so", /* TI OMAP IL core */
- "libOmxCore.so", /* Qualcomm IL core */
- "libomxil-bellagio.so", /* Bellagio IL core */
-#endif
- 0
-};
+/* Defined in the broadcom version of OMX_Index.h */
+#define OMX_IndexConfigRequestCallback 0x7f000063
+#define OMX_IndexParamBrcmPixelAspectRatio 0x7f00004d
-/*****************************************************************************
- * Global OMX Core instance, shared between module instances
- *****************************************************************************/
-static vlc_mutex_t omx_core_mutex = VLC_STATIC_MUTEX;
-static unsigned int omx_refcount = 0;
-static void *dll_handle;
-static OMX_ERRORTYPE (*pf_init) (void);
-static OMX_ERRORTYPE (*pf_deinit) (void);
-static OMX_ERRORTYPE (*pf_get_handle) (OMX_HANDLETYPE *, OMX_STRING,
- OMX_PTR, OMX_CALLBACKTYPE *);
-static OMX_ERRORTYPE (*pf_free_handle) (OMX_HANDLETYPE);
-static OMX_ERRORTYPE (*pf_component_enum)(OMX_STRING, OMX_U32, OMX_U32);
-static OMX_ERRORTYPE (*pf_get_roles_of_component)(OMX_STRING, OMX_U32 *, OMX_U8 **);
+/* Defined in the broadcom version of OMX_Core.h */
+#define OMX_EventParamOrConfigChanged 0x7F000001
/*****************************************************************************
* Local prototypes
set_callbacks( OpenEncoder, CloseGeneric )
vlc_module_end ()
-/*****************************************************************************
- * CreateComponentsList: creates a list of components matching the given role
- *****************************************************************************/
-static int CreateComponentsList(decoder_t *p_dec, const char *psz_role)
-{
- decoder_sys_t *p_sys = p_dec->p_sys;
- char psz_name[OMX_MAX_STRINGNAME_SIZE];
- OMX_ERRORTYPE omx_error;
- OMX_U32 roles = 0;
- OMX_U8 **ppsz_roles = 0;
- unsigned int i, j, len;
-
- if(!psz_role) goto end;
- len = strlen(psz_role);
-
- for( i = 0; ; i++ )
- {
- bool b_found = false;
-
- omx_error = pf_component_enum(psz_name, OMX_MAX_STRINGNAME_SIZE, i);
- if(omx_error != OMX_ErrorNone) break;
-
- msg_Dbg(p_dec, "component %s", psz_name);
-
- omx_error = pf_get_roles_of_component(psz_name, &roles, 0);
- if(omx_error != OMX_ErrorNone || !roles) continue;
-
- ppsz_roles = malloc(roles * (sizeof(OMX_U8*) + OMX_MAX_STRINGNAME_SIZE));
- if(!ppsz_roles) continue;
-
- for( j = 0; j < roles; j++ )
- ppsz_roles[j] = ((OMX_U8 *)(&ppsz_roles[roles])) +
- j * OMX_MAX_STRINGNAME_SIZE;
-
- omx_error = pf_get_roles_of_component(psz_name, &roles, ppsz_roles);
- if(omx_error != OMX_ErrorNone) roles = 0;
-
- for(j = 0; j < roles; j++)
- {
- msg_Dbg(p_dec, " - role: %s", ppsz_roles[j]);
- if(!strncmp((char *)ppsz_roles[j], psz_role, len)) b_found = true;
- }
-
- free(ppsz_roles);
-
- if(!b_found) continue;
-
- if(p_sys->components >= MAX_COMPONENTS_LIST_SIZE)
- {
- msg_Dbg(p_dec, "too many matching components");
- continue;
- }
-
- strncpy(p_sys->ppsz_components[p_sys->components], psz_name,
- OMX_MAX_STRINGNAME_SIZE-1);
- p_sys->components++;
- }
-
- end:
- msg_Dbg(p_dec, "found %i matching components for role %s",
- p_sys->components, psz_role);
- for( i = 0; i < p_sys->components; i++ )
- msg_Dbg(p_dec, "- %s", p_sys->ppsz_components[i]);
-
- return p_sys->components;
-}
-
/*****************************************************************************
* ImplementationSpecificWorkarounds: place-holder for implementation
* specific workarounds
}
}
#endif
+#ifdef RPI_OMX
+ else if (!strcmp(p_sys->psz_component, "OMX.broadcom.video_decode"))
+ {
+ /* Clear these fields before setting parameters, to allow the codec
+ * fill in what it wants (instead of rejecting whatever happened to
+ * be there. */
+ def->format.video.nStride = def->format.video.nSliceHeight = 0;
+ }
+#endif
return OMX_ErrorNone;
}
omx_error = SetAudioParameters(p_port->omx_handle,
&p_port->format_param, def->nPortIndex,
def->format.audio.eEncoding,
+ p_fmt->i_codec,
p_fmt->audio.i_channels,
p_fmt->audio.i_rate,
p_fmt->i_bitrate,
p_fmt->audio.i_bitspersample,
p_fmt->audio.i_blockalign);
- CHECK_ERROR(omx_error, "SetAudioParameters failed (%x : %s)",
- omx_error, ErrorToString(omx_error));
+ if (def->eDir == OMX_DirInput) {
+ CHECK_ERROR(omx_error, "SetAudioParameters failed (%x : %s)",
+ omx_error, ErrorToString(omx_error));
+ } else if (omx_error != OMX_ErrorNone) {
+ msg_Warn(p_dec, "SetAudioParameters failed (%x : %s) on output port",
+ omx_error, ErrorToString(omx_error));
+ omx_error = OMX_ErrorNone;
+ }
}
if (!strcmp(p_dec->p_sys->psz_component, "OMX.TI.DUCATI1.VIDEO.DECODER") &&
def->eDir == OMX_DirOutput)
def->nBufferSize *= 2;
}
- if (def->format.video.eCompressionFormat == OMX_VIDEO_CodingWMV) {
- OMX_VIDEO_PARAM_WMVTYPE wmvtype = { 0 };
- OMX_INIT_STRUCTURE(wmvtype);
- wmvtype.nPortIndex = def->nPortIndex;
- switch (p_dec->fmt_in.i_codec) {
- case VLC_CODEC_WMV1:
- wmvtype.eFormat = OMX_VIDEO_WMVFormat7;
- break;
- case VLC_CODEC_WMV2:
- wmvtype.eFormat = OMX_VIDEO_WMVFormat8;
- break;
- case VLC_CODEC_WMV3:
- case VLC_CODEC_VC1:
- wmvtype.eFormat = OMX_VIDEO_WMVFormat9;
- break;
- }
- omx_error = OMX_SetParameter(p_port->omx_handle, OMX_IndexParamVideoWmv, &wmvtype);
- CHECK_ERROR(omx_error, "OMX_SetParameter OMX_IndexParamVideoWmv failed (%x : %s)",
- omx_error, ErrorToString(omx_error));
- }
-
error:
return omx_error;
}
+
+/*****************************************************************************
+ * UpdatePixelAspect: Update vlc pixel aspect based on the aspect reported on
+ * the omx port - NOTE: Broadcom specific
+ *****************************************************************************/
+static OMX_ERRORTYPE UpdatePixelAspect(decoder_t *p_dec)
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ OMX_CONFIG_POINTTYPE pixel_aspect;
+ OMX_INIT_STRUCTURE(pixel_aspect);
+ OMX_ERRORTYPE omx_err;
+
+ if (strncmp(p_sys->psz_component, "OMX.broadcom.", 13))
+ return OMX_ErrorNotImplemented;
+
+ pixel_aspect.nPortIndex = p_sys->out.i_port_index;
+ omx_err = OMX_GetParameter(p_sys->omx_handle,
+ OMX_IndexParamBrcmPixelAspectRatio, &pixel_aspect);
+ if (omx_err != OMX_ErrorNone) {
+ msg_Warn(p_dec, "Failed to retrieve aspect ratio");
+ } else {
+ p_dec->fmt_out.video.i_sar_num = pixel_aspect.nX;
+ p_dec->fmt_out.video.i_sar_den = pixel_aspect.nY;
+ }
+
+ return omx_err;
+}
+
/*****************************************************************************
* GetPortDefinition: set vlc format based on the definition of the omx port
*****************************************************************************/
strlen("OMX.qcom.video.decoder")))
def->format.video.eColorFormat = OMX_QCOM_COLOR_FormatYVU420SemiPlanar;
- /* Hack: Galaxy S II (stock firmware) gives a slice height larger
- * than the video height, but this doesn't imply padding between
- * the video planes. Nexus S also has a slice height larger than
- * the video height, but there it actually is real padding, thus
- * Galaxy S II is the buggy one. The Galaxy S II decoder is
- * named OMX.SEC.avcdec while the one on Nexus S is
- * OMX.SEC.AVC.Decoder. Thus do this for any OMX.SEC. that don't
- * contain the string ".Decoder". */
- if(!strncmp(p_sys->psz_component, "OMX.SEC.", strlen("OMX.SEC.")) &&
- !strstr(p_sys->psz_component, ".Decoder"))
+ if (IgnoreOmxDecoderPadding(p_sys->psz_component)) {
def->format.video.nSliceHeight = 0;
+ def->format.video.nStride = p_fmt->video.i_width;
+ }
if(!GetVlcVideoFormat( def->format.video.eCompressionFormat,
&p_fmt->i_codec, 0 ) )
def->format.video.nStride = p_port->i_frame_stride;
#endif
p_port->i_frame_stride = def->format.video.nStride;
+ UpdatePixelAspect(p_dec);
break;
case AUDIO_ES:
omx_error = OMX_SendCommand( omx_handle, OMX_CommandStateSet,
OMX_StateIdle, 0 );
CHECK_ERROR(omx_error, "OMX_CommandStateSet Idle failed (%x)", omx_error );
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
- CHECK_ERROR(omx_error, "Wait for Idle failed (%x)", omx_error );
+ while (1) {
+ OMX_U32 cmd, state;
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, &cmd, &state, 0);
+ CHECK_ERROR(omx_error, "Wait for Idle failed (%x)", omx_error );
+ // The event queue can contain other OMX_EventCmdComplete items,
+ // such as for OMX_CommandFlush
+ if (cmd == OMX_CommandStateSet && state == OMX_StateIdle)
+ break;
+ }
}
omx_error = OMX_GetState(omx_handle, &state);
}
}
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, 0, 0, 0);
CHECK_ERROR(omx_error, "Wait for Loaded failed (%x)", omx_error );
}
OMX_INIT_STRUCTURE(definition);
omx_error = OMX_GetParameter(omx_handle, p_dec->fmt_in.i_cat == VIDEO_ES ?
OMX_IndexParamVideoInit : OMX_IndexParamAudioInit, ¶m);
- if(omx_error != OMX_ErrorNone) param.nPorts = 0;
+ if(omx_error != OMX_ErrorNone) {
+#ifdef __ANDROID__
+ param.nPorts = 2;
+ param.nStartPortNumber = 0;
+#else
+ param.nPorts = 0;
+#endif
+ }
for(i = 0; i < param.nPorts; i++)
{
CHECK_ERROR(omx_error, "couldn't find an input and output port");
}
- if(!strncmp(p_sys->psz_component, "OMX.SEC.", 8))
+ if(!strncmp(p_sys->psz_component, "OMX.SEC.", 8) &&
+ p_dec->fmt_in.i_cat == VIDEO_ES)
{
OMX_INDEXTYPE index;
omx_error = OMX_GetExtensionIndex(omx_handle, (OMX_STRING) "OMX.SEC.index.ThumbnailMode", &index);
}
}
+ if(!strncmp(p_sys->psz_component, "OMX.broadcom.", 13))
+ {
+ OMX_CONFIG_REQUESTCALLBACKTYPE notifications;
+ OMX_INIT_STRUCTURE(notifications);
+
+ notifications.nPortIndex = p_sys->out.i_port_index;
+ notifications.nIndex = OMX_IndexParamBrcmPixelAspectRatio;
+ notifications.bEnable = OMX_TRUE;
+
+ omx_error = OMX_SetParameter(omx_handle,
+ OMX_IndexConfigRequestCallback, ¬ifications);
+ if (omx_error == OMX_ErrorNone)
+ msg_Dbg(p_dec, "Enabled aspect ratio notifications");
+ else
+ msg_Dbg(p_dec, "Could not enable aspect ratio notifications");
+ }
+
/* Set port definitions */
for(i = 0; i < p_sys->ports; i++)
{
p_port->i_port_index, NULL);
CHECK_ERROR(omx_error, "OMX_CommandPortEnable on %i failed (%x)",
(int)p_port->i_port_index, omx_error );
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, 0, 0, 0);
CHECK_ERROR(omx_error, "Wait for PortEnable on %i failed (%x)",
(int)p_port->i_port_index, omx_error );
}
if( 0 || !GetOmxRole(p_dec->fmt_in.i_codec, p_dec->fmt_in.i_cat, false) )
return VLC_EGENERIC;
-#ifdef HAVE_MAEMO
- if( p_dec->fmt_in.i_cat != VIDEO_ES && !p_dec->b_force)
- return VLC_EGENERIC;
-#endif
-
status = OpenGeneric( p_this, false );
if(status != VLC_SUCCESS) return status;
OMX_BUFFERHEADERTYPE *p_header;
unsigned int i, j;
- vlc_mutex_lock( &omx_core_mutex );
- if( omx_refcount > 0 )
- goto loaded;
-
- /* Load the OMX core */
- for( i = 0; ppsz_dll_list[i]; i++ )
- {
- dll_handle = dll_open( ppsz_dll_list[i] );
- if( dll_handle ) break;
- }
- if( !dll_handle )
- {
- vlc_mutex_unlock( &omx_core_mutex );
- return VLC_EGENERIC;
- }
-
- pf_init = dlsym( dll_handle, "OMX_Init" );
- pf_deinit = dlsym( dll_handle, "OMX_Deinit" );
- pf_get_handle = dlsym( dll_handle, "OMX_GetHandle" );
- pf_free_handle = dlsym( dll_handle, "OMX_FreeHandle" );
- pf_component_enum = dlsym( dll_handle, "OMX_ComponentNameEnum" );
- pf_get_roles_of_component = dlsym( dll_handle, "OMX_GetRolesOfComponent" );
- if( !pf_init || !pf_deinit || !pf_get_handle || !pf_free_handle ||
- !pf_component_enum || !pf_get_roles_of_component )
- {
- msg_Warn( p_this, "cannot find OMX_* symbols in `%s' (%s)",
- ppsz_dll_list[i], dlerror() );
- dll_close(dll_handle);
- vlc_mutex_unlock( &omx_core_mutex );
+ if (InitOmxCore(p_this) != VLC_SUCCESS) {
return VLC_EGENERIC;
}
-loaded:
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys = calloc( 1, sizeof(*p_sys)) ) == NULL )
{
- if( omx_refcount == 0 )
- dll_close(dll_handle);
- vlc_mutex_unlock( &omx_core_mutex );
+ DeinitOmxCore();
return VLC_ENOMEM;
}
p_dec->fmt_out.video = p_dec->fmt_in.video;
p_dec->fmt_out.audio = p_dec->fmt_in.audio;
p_dec->fmt_out.i_codec = 0;
+
+ /* set default aspect of 1, if parser did not set it */
+ if (p_dec->fmt_out.video.i_sar_num == 0)
+ p_dec->fmt_out.video.i_sar_num = 1;
+ if (p_dec->fmt_out.video.i_sar_den == 0)
+ p_dec->fmt_out.video.i_sar_den = 1;
}
p_sys->b_enc = b_encode;
- p_sys->pp_last_event = &p_sys->p_events;
- vlc_mutex_init (&p_sys->mutex);
- vlc_cond_init (&p_sys->cond);
- vlc_mutex_init (&p_sys->lock);
+ InitOmxEventQueue(&p_sys->event_queue);
vlc_mutex_init (&p_sys->in.fifo.lock);
vlc_cond_init (&p_sys->in.fifo.wait);
p_sys->in.fifo.offset = offsetof(OMX_BUFFERHEADERTYPE, pOutputPortPrivate) / sizeof(void *);
vlc_cond_init (&p_sys->out.fifo.wait);
p_sys->out.fifo.offset = offsetof(OMX_BUFFERHEADERTYPE, pInputPortPrivate) / sizeof(void *);
p_sys->out.fifo.pp_last = &p_sys->out.fifo.p_first;
- p_sys->out.b_direct = true;
+ p_sys->out.b_direct = false;
p_sys->out.b_flushed = true;
p_sys->out.p_fmt = &p_dec->fmt_out;
p_sys->ports = 2;
p_sys->p_ports = &p_sys->in;
- p_sys->b_use_pts = 0;
+ p_sys->b_use_pts = 1;
msg_Dbg(p_dec, "fmt in:%4.4s, out: %4.4s", (char *)&p_dec->fmt_in.i_codec,
(char *)&p_dec->fmt_out.i_codec);
- /* Initialise the OMX core */
- omx_error = omx_refcount > 0 ? OMX_ErrorNone : pf_init();
- omx_refcount++;
- if(omx_error != OMX_ErrorNone)
- {
- msg_Warn( p_this, "OMX_Init failed (%x: %s)", omx_error,
- ErrorToString(omx_error) );
- vlc_mutex_unlock( &omx_core_mutex );
- CloseGeneric(p_this);
- return VLC_EGENERIC;
- }
- p_sys->b_init = true;
- vlc_mutex_unlock( &omx_core_mutex );
-
/* Enumerate components and build a list of the one we want to try */
- if( !CreateComponentsList(p_dec,
+ p_sys->components =
+ CreateComponentsList(p_this,
GetOmxRole(p_sys->b_enc ? p_dec->fmt_out.i_codec :
p_dec->fmt_in.i_codec, p_dec->fmt_in.i_cat,
- p_sys->b_enc)) )
+ p_sys->b_enc), p_sys->ppsz_components);
+ if( !p_sys->components )
{
msg_Warn( p_this, "couldn't find an omx component for codec %4.4s",
(char *)&p_dec->fmt_in.i_codec );
* has got a working OMX.qcom.video.decoder.avc instead though. */
if (!strncmp(p_sys->ppsz_components[i], "OMX.ARICENT.", 12))
continue;
- /* Some nVidia codec with DRM */
- if (!strncmp(p_sys->ppsz_components[i], "OMX.Nvidia.h264.decode.secure", 29))
+ /* Codecs with DRM, that don't output plain YUV data but only
+ * support direct rendering where the output can't be intercepted. */
+ if (strstr(p_sys->ppsz_components[i], ".secure"))
+ continue;
+ /* Use VC1 decoder for WMV3 for now */
+ if (!strcmp(p_sys->ppsz_components[i], "OMX.SEC.WMV.Decoder"))
+ continue;
+ /* This decoder does work, but has an insane latency (leading to errors
+ * about "main audio output playback way too late" and dropped frames).
+ * At least Samsung Galaxy S III (where this decoder is present) has
+ * got another one, OMX.SEC.mp3.dec, that works well and has a
+ * sensible latency. (Also, even if that one isn't found, in general,
+ * using SW codecs is usually more than fast enough for MP3.) */
+ if (!strcmp(p_sys->ppsz_components[i], "OMX.SEC.MP3.Decoder"))
+ continue;
+ /* This codec should be able to handle both VC1 and WMV3, but
+ * for VC1 it doesn't output any buffers at all (in the way we use
+ * it) and for WMV3 it outputs plain black buffers. Thus ignore
+ * it until we can make it work properly. */
+ if (!strcmp(p_sys->ppsz_components[i], "OMX.Nvidia.vc1.decode"))
continue;
#endif
omx_error = InitialiseComponent(p_dec, p_sys->ppsz_components[i],
p_port->pp_buffers[i] = (void *)ALIGN((uintptr_t)p_buf, p_port->definition.nBufferAlignment);
#endif
- if(0 && p_port->b_direct)
+ if(p_port->b_direct)
omx_error =
OMX_UseBuffer( p_sys->omx_handle, &p_port->pp_buffers[j],
p_port->i_port_index, 0,
omx_error, (int)p_port->i_port_index, j );
}
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, 0, 0, 0);
CHECK_ERROR(omx_error, "Wait for Idle failed (%x)", omx_error );
omx_error = OMX_SendCommand( p_sys->omx_handle, OMX_CommandStateSet,
OMX_StateExecuting, 0);
CHECK_ERROR(omx_error, "OMX_CommandStateSet Executing failed (%x)", omx_error );
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, 0, 0, 0);
CHECK_ERROR(omx_error, "Wait for Executing failed (%x)", omx_error );
/* Send codec configuration data */
p_header->pOutputPortPrivate = p_header->pBuffer;
p_header->pBuffer = p_dec->fmt_in.p_extra;
}
+ else if (p_dec->fmt_in.i_codec == VLC_CODEC_WMV3 &&
+ p_dec->fmt_in.i_extra >= 4 &&
+ p_header->nAllocLen >= 36)
+ {
+ int profile;
+ // According to OMX IL 1.2.0 spec (4.3.33.2), the codec config
+ // data for VC-1 Main/Simple (aka WMV3) is according to table 265
+ // in the VC-1 spec. Most of the fields are just set with placeholders
+ // (like framerate, hrd_buffer/rate).
+ static const uint8_t wmv3seq[] = {
+ 0xff, 0xff, 0xff, 0xc5, // numframes=ffffff, marker byte
+ 0x04, 0x00, 0x00, 0x00, // marker byte
+ 0x00, 0x00, 0x00, 0x00, // struct C, almost equal to p_extra
+ 0x00, 0x00, 0x00, 0x00, // struct A, vert size
+ 0x00, 0x00, 0x00, 0x00, // struct A, horiz size
+ 0x0c, 0x00, 0x00, 0x00, // marker byte
+ 0xff, 0xff, 0x00, 0x80, // struct B, level=4, cbr=0, hrd_buffer=ffff
+ 0xff, 0xff, 0x00, 0x00, // struct B, hrd_rate=ffff
+ 0xff, 0xff, 0xff, 0xff, // struct B, framerate=ffffffff
+ };
+ p_header->nFilledLen = sizeof(wmv3seq);
+ memcpy(p_header->pBuffer, wmv3seq, p_header->nFilledLen);
+ // Struct C - almost equal to the extradata
+ memcpy(&p_header->pBuffer[8], p_dec->fmt_in.p_extra, 4);
+ // Expand profile from the highest 2 bits to the highest 4 bits
+ profile = p_header->pBuffer[8] >> 6;
+ p_header->pBuffer[8] = (p_header->pBuffer[8] & 0x0f) | (profile << 4);
+ // Fill in the height/width for struct A
+ SetDWLE(&p_header->pBuffer[12], p_dec->fmt_in.video.i_height);
+ SetDWLE(&p_header->pBuffer[16], p_dec->fmt_in.video.i_width);
+ }
else
{
if(p_header->nFilledLen > p_header->nAllocLen)
if(p_sys->b_error) goto error;
p_dec->b_need_packetized = true;
- if (!strcmp(p_sys->psz_component, "OMX.TI.DUCATI1.VIDEO.DECODER"))
- p_sys->b_use_pts = 1;
+
+ if (!p_sys->b_use_pts)
+ msg_Dbg( p_dec, "using dts timestamp mode for %s", p_sys->psz_component);
+
return VLC_SUCCESS;
error:
for(i = 0; i < p_port->i_buffers; i++)
{
OMX_FIFO_GET(&p_port->fifo, p_buffer);
+ if (p_buffer->pAppPrivate != NULL)
+ decoder_DeletePicture( p_dec, p_buffer->pAppPrivate );
if (p_buffer->nFlags & SENTINEL_FLAG) {
free(p_buffer);
i--;
CHECK_ERROR(omx_error, "OMX_FreeBuffer failed (%x, %i, %i)",
omx_error, (int)p_port->i_port_index, i );
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, 0, 0, 0);
CHECK_ERROR(omx_error, "Wait for PortDisable failed (%x)", omx_error );
/* Get the new port definition */
p_port->i_buffers = p_port->definition.nBufferCountActual;
for(i = 0; i < p_port->i_buffers; i++)
{
- if(0 && p_port->b_direct)
+ if(p_port->b_direct)
omx_error =
OMX_UseBuffer( p_sys->omx_handle, &p_port->pp_buffers[i],
p_port->i_port_index, 0,
CHECK_ERROR(omx_error, "OMX_UseBuffer failed (%x, %i, %i)",
omx_error, (int)p_port->i_port_index, i );
- omx_error = WaitForSpecificOmxEvent(p_dec, OMX_EventCmdComplete, 0, 0, 0);
+ omx_error = WaitForSpecificOmxEvent(&p_sys->event_queue, OMX_EventCmdComplete, 0, 0, 0);
CHECK_ERROR(omx_error, "Wait for PortEnable failed (%x)", omx_error );
PrintOmx(p_dec, p_sys->omx_handle, p_dec->p_sys->in.i_port_index);
OMX_BUFFERHEADERTYPE *p_header;
block_t *p_block;
+ int i_input_used = 0;
+ struct H264ConvertState convert_state = { 0, 0 };
if( !pp_block || !*pp_block )
return NULL;
}
if (p_pic)
- p_pic->date = p_header->nTimeStamp;
+ p_pic->date = FromOmxTicks(p_header->nTimeStamp);
p_header->nFilledLen = 0;
p_header->pAppPrivate = 0;
}
/* Get a new picture */
- if(p_sys->in.b_direct && !p_header->pAppPrivate)
+ if(p_sys->out.b_direct && !p_header->pAppPrivate)
{
p_next_pic = decoder_NewPicture( p_dec );
if(!p_next_pic) break;
OMX_FillThisBuffer(p_sys->omx_handle, p_header);
}
+more_input:
/* Send the input buffer to the component */
- OMX_FIFO_GET(&p_sys->in.fifo, p_header);
+ OMX_FIFO_GET_TIMEOUT(&p_sys->in.fifo, p_header, 200000);
if (p_header && p_header->nFlags & SENTINEL_FLAG) {
free(p_header);
if(p_header)
{
- p_header->nFilledLen = p_block->i_buffer;
+ bool decode_more = false;
+ p_header->nFilledLen = p_block->i_buffer - i_input_used;
p_header->nOffset = 0;
p_header->nFlags = OMX_BUFFERFLAG_ENDOFFRAME;
if (p_sys->b_use_pts && p_block->i_pts)
- p_header->nTimeStamp = p_block->i_pts;
+ p_header->nTimeStamp = ToOmxTicks(p_block->i_pts);
else
- p_header->nTimeStamp = p_block->i_dts;
+ p_header->nTimeStamp = ToOmxTicks(p_block->i_dts);
/* In direct mode we pass the input pointer as is.
* Otherwise we memcopy the data */
p_header->pOutputPortPrivate = p_header->pBuffer;
p_header->pBuffer = p_block->p_buffer;
p_header->pAppPrivate = p_block;
+ i_input_used = p_header->nFilledLen;
}
else
{
if(p_header->nFilledLen > p_header->nAllocLen)
{
- msg_Dbg(p_dec, "buffer too small (%i,%i)",
- (int)p_header->nFilledLen, (int)p_header->nAllocLen);
p_header->nFilledLen = p_header->nAllocLen;
}
- memcpy(p_header->pBuffer, p_block->p_buffer, p_header->nFilledLen );
- block_Release(p_block);
+ memcpy(p_header->pBuffer, p_block->p_buffer + i_input_used, p_header->nFilledLen);
+ i_input_used += p_header->nFilledLen;
+ if (i_input_used == p_block->i_buffer)
+ {
+ block_Release(p_block);
+ }
+ else
+ {
+ decode_more = true;
+ p_header->nFlags &= ~OMX_BUFFERFLAG_ENDOFFRAME;
+ }
}
/* Convert H.264 NAL format to annex b. Doesn't do anything if
* i_nal_size_length == 0, which is the case for codecs other
* than H.264 */
convert_h264_to_annexb( p_header->pBuffer, p_header->nFilledLen,
- p_sys->i_nal_size_length );
+ p_sys->i_nal_size_length, &convert_state );
#ifdef OMXIL_EXTRA_DEBUG
- msg_Dbg( p_dec, "EmptyThisBuffer %p, %p, %i", p_header, p_header->pBuffer,
- (int)p_header->nFilledLen );
+ msg_Dbg( p_dec, "EmptyThisBuffer %p, %p, %i, %"PRId64, p_header, p_header->pBuffer,
+ (int)p_header->nFilledLen, FromOmxTicks(p_header->nTimeStamp) );
#endif
OMX_EmptyThisBuffer(p_sys->omx_handle, p_header);
p_sys->in.b_flushed = false;
- *pp_block = NULL; /* Avoid being fed the same packet again */
+ if (decode_more)
+ goto more_input;
+ else
+ *pp_block = NULL; /* Avoid being fed the same packet again */
}
reconfig:
/* Take care of decoded frames first */
while(!p_buffer)
{
- unsigned int i_samples;
+ unsigned int i_samples = 0;
OMX_FIFO_PEEK(&p_sys->out.fifo, p_header);
if(!p_header) break; /* No frame available */
- i_samples = p_header->nFilledLen / p_sys->out.p_fmt->audio.i_channels / 2;
+ if (p_sys->out.p_fmt->audio.i_channels)
+ i_samples = p_header->nFilledLen / p_sys->out.p_fmt->audio.i_channels / 2;
if(i_samples)
{
p_buffer = decoder_NewAudioBuffer( p_dec, i_samples );
memcpy( p_buffer->p_buffer, p_header->pBuffer, p_buffer->i_buffer );
p_header->nFilledLen = 0;
- if( p_header->nTimeStamp != 0 &&
- p_header->nTimeStamp != date_Get( &p_sys->end_date ) )
- date_Set( &p_sys->end_date, p_header->nTimeStamp );
+ int64_t timestamp = FromOmxTicks(p_header->nTimeStamp);
+ if( timestamp != 0 &&
+ timestamp != date_Get( &p_sys->end_date ) )
+ date_Set( &p_sys->end_date, timestamp );
p_buffer->i_pts = date_Get( &p_sys->end_date );
p_buffer->i_length = date_Increment( &p_sys->end_date, i_samples ) -
/* Send the input buffer to the component */
- OMX_FIFO_GET(&p_sys->in.fifo, p_header);
+ OMX_FIFO_GET_TIMEOUT(&p_sys->in.fifo, p_header, 200000);
if (p_header && p_header->nFlags & SENTINEL_FLAG) {
free(p_header);
p_header->nFilledLen = p_block->i_buffer;
p_header->nOffset = 0;
p_header->nFlags = OMX_BUFFERFLAG_ENDOFFRAME;
- p_header->nTimeStamp = p_block->i_dts;
+ p_header->nTimeStamp = ToOmxTicks(p_block->i_dts);
/* In direct mode we pass the input pointer as is.
* Otherwise we memcopy the data */
p_header->nFilledLen = p_sys->in.i_frame_size;
p_header->nOffset = 0;
p_header->nFlags = OMX_BUFFERFLAG_ENDOFFRAME;
- p_header->nTimeStamp = p_pic->date;
+ p_header->nTimeStamp = ToOmxTicks(p_pic->date);
#ifdef OMXIL_EXTRA_DEBUG
msg_Dbg( p_dec, "EmptyThisBuffer %p, %p, %i", p_header, p_header->pBuffer,
(int)p_header->nFilledLen );
{
/* We're not in direct rendering mode.
* Get a new block and copy the content */
- p_block = block_New( p_dec, p_header->nFilledLen );
+ p_block = block_Alloc( p_header->nFilledLen );
memcpy(p_block->p_buffer, p_header->pBuffer, p_header->nFilledLen );
}
p_block->i_buffer = p_header->nFilledLen;
- p_block->i_pts = p_block->i_dts = p_header->nTimeStamp;
+ p_block->i_pts = p_block->i_dts = FromOmxTicks(p_header->nTimeStamp);
p_header->nFilledLen = 0;
p_header->pAppPrivate = 0;
}
decoder_sys_t *p_sys = p_dec->p_sys;
if(p_sys->omx_handle) DeinitialiseComponent(p_dec, p_sys->omx_handle);
- vlc_mutex_lock( &omx_core_mutex );
- omx_refcount--;
- if( omx_refcount == 0 )
- {
- if( p_sys->b_init ) pf_deinit();
- dll_close( dll_handle );
- }
- vlc_mutex_unlock( &omx_core_mutex );
- vlc_mutex_destroy (&p_sys->mutex);
- vlc_cond_destroy (&p_sys->cond);
+ DeinitOmxCore();
+
+ DeinitOmxEventQueue(&p_sys->event_queue);
vlc_mutex_destroy (&p_sys->in.fifo.lock);
vlc_cond_destroy (&p_sys->in.fifo.wait);
vlc_mutex_destroy (&p_sys->out.fifo.lock);
unsigned int i;
(void)omx_handle;
+ PrintOmxEvent((vlc_object_t *) p_dec, event, data_1, data_2, event_data);
switch (event)
{
- case OMX_EventCmdComplete:
- switch ((OMX_STATETYPE)data_1)
- {
- case OMX_CommandStateSet:
- msg_Dbg( p_dec, "OmxEventHandler (%s, %s, %s)", EventToString(event),
- CommandToString(data_1), StateToString(data_2) );
- break;
-
- default:
- msg_Dbg( p_dec, "OmxEventHandler (%s, %s, %u)", EventToString(event),
- CommandToString(data_1), (unsigned int)data_2 );
- break;
- }
- break;
-
case OMX_EventError:
- msg_Dbg( p_dec, "OmxEventHandler (%s, %s, %u, %s)", EventToString(event),
- ErrorToString((OMX_ERRORTYPE)data_1), (unsigned int)data_2,
- (const char *)event_data);
//p_sys->b_error = true;
break;
case OMX_EventPortSettingsChanged:
- msg_Dbg( p_dec, "OmxEventHandler (%s, %u, %u)", EventToString(event),
- (unsigned int)data_1, (unsigned int)data_2 );
- if( data_2 == 0 || data_2 == OMX_IndexParamPortDefinition )
+ if( data_2 == 0 || data_2 == OMX_IndexParamPortDefinition ||
+ data_2 == OMX_IndexParamAudioPcm )
{
OMX_BUFFERHEADERTYPE *sentinel;
for(i = 0; i < p_sys->ports; i++)
msg_Dbg( p_dec, "Unhandled setting change %x", (unsigned int)data_2 );
}
break;
+ case OMX_EventParamOrConfigChanged:
+ UpdatePixelAspect(p_dec);
+ break;
default:
- msg_Dbg( p_dec, "OmxEventHandler (%s, %u, %u)", EventToString(event),
- (unsigned int)data_1, (unsigned int)data_2 );
break;
}
- PostOmxEvent(p_dec, event, data_1, data_2, event_data);
+ PostOmxEvent(&p_sys->event_queue, event, data_1, data_2, event_data);
return OMX_ErrorNone;
}
(void)omx_handle;
#ifdef OMXIL_EXTRA_DEBUG
- msg_Dbg( p_dec, "OmxFillBufferDone %p, %p, %i", omx_header, omx_header->pBuffer,
- (int)omx_header->nFilledLen );
+ msg_Dbg( p_dec, "OmxFillBufferDone %p, %p, %i, %"PRId64, omx_header, omx_header->pBuffer,
+ (int)omx_header->nFilledLen, FromOmxTicks(omx_header->nTimeStamp) );
#endif
if(omx_header->pInputPortPrivate)
projects / vlc / blobdiff