FCL/sf/mw/mmmw: comparison khronosfws/openmax_al/src/gst

equal deleted inserted replaced

-:ebf79c79991a
+:5e8b14bae8c3
 #include <assert.h>
 #include <string.h>
 #include <gst/gst.h>
 #include <gst/gstbuffer.h>
 #include "xaobjectitf.h"
-#include "xacameradevice.h"
 #include "xaradiodevice.h"
-#include "xaoutputmix.h"
-#include "xamediaplayeradaptctx.h"
-#include "xacameraadaptctx.h"
 #include <stdlib.h>
+#include "xaadaptationgst.h"
-#ifdef OMAX_CAMERABIN
-extern XAboolean cameraRealized;
-extern XACameraAdaptationCtx_* cameraCtx;
-#else
-XAboolean cameraRealized = XA_BOOLEAN_FALSE;
-XACameraAdaptationCtx_* cameraCtx = NULL;
-#endif
 /*
 * XAAdaptationGstCtx* XAAdaptationGst_Create()
 * 1st phase initialization function for Adaptation Base context structure.
 * Reserves memory for base context and initializes GStreamer FW.
 */
 free(pSelf);
 pSelf = NULL;
 }
 else
 {
+GError* gerror = 0;
 /*         Add default handler for Gst-bus messages */
 pSelf->busCb = XAAdaptationGst_GstBusCb;
 // VASU MOD BEGINS
 pSelf->cond_mutx_inited = XA_BOOLEAN_FALSE;
 // VASU MOD ENDS
 sem_init(&(pSelf->semAsyncWait), 0, 0);
+//cross check
+if ( !gst_init_check( NULL, NULL, &gerror ) )
+{
+DEBUG_ERR("Gst Initalization failure.");
+return XA_RESULT_INTERNAL_ERROR;
+}
 }
 }
 else
 {
 DEBUG_ERR("Invalid Gst Base Context.")
 break;
 default:
 DEBUG_INFO("Unhandled Gst-Bus message")
 ;
 break;
-}DEBUG_API("<-XAAdaptationGst_GstBusCb");
+}
+DEBUG_API("<-XAAdaptationGst_GstBusCb");
 return TRUE;
 }
 XAresult XAAdaptationGst_InitGstListener(XAAdaptationGstCtx* ctx)
 {
 }
 if (ret)
 {
 DEBUG_ERR_A1("could not create thread!! (%d)",ret)
 return XA_RESULT_INTERNAL_ERROR;
-}DEBUG_API("<-XAAdaptationGst_InitGstListener");
+}
+DEBUG_API("<-XAAdaptationGst_InitGstListener");
 return XA_RESULT_SUCCESS;
 }
 void * XAAdaptationGst_LaunchGstListener(void* args)
 {
 }
 if (ctx->bus)
 {
 gst_object_unref(ctx->bus);
 ctx->bus = NULL;
-}DEBUG_API("<-XAAdaptationGst_StopGstListener");
+}
+DEBUG_API("<-XAAdaptationGst_StopGstListener");
 }
 /*
 * ASynchronous operation managing
 **/
 {
 DEBUG_ERR_A3("ASYNC TIMED OUT : current %d, gsttarget %d, wanted %d",
 GST_STATE(bCtx->bin), GST_STATE_TARGET(bCtx->bin), bCtx->binWantedState);
 bCtx->waitingasyncop = XA_BOOLEAN_FALSE;
 sem_post(&(bCtx->semAsyncWait));
-}DEBUG_API("<-XAAdaptationGst_CancelAsyncWait");
+}
+DEBUG_API("<-XAAdaptationGst_CancelAsyncWait");
 /* return false to remove timer */
 return FALSE;
 }
 void XAAdaptationGst_CompleteAsyncWait(XAAdaptationGstCtx* ctx)
 }
 else if (i > 0)
 { /* should not be, reset semaphore */
 sem_init(&(ctx->semAsyncWait), 0, 0);
 }
-}DEBUG_API("<-XAAdaptationGst_CompleteAsyncWait");
+}
+DEBUG_API("<-XAAdaptationGst_CompleteAsyncWait");
 }
 /**
 * GstElement* XAAdaptationGst_CreateGstSource( XADataSource* xaSrc, const XAchar *name )
 * @param XADataSource* xaSnk - XADataSource defining gst source to create
 "async", FALSE, "qos", FALSE, "handle-events", TRUE,
 "handle-expose", TRUE, "max-lateness", (gint64) (-1),
 NULL);
 break;
 case XA_DATALOCATOR_OUTPUTMIX:
-DEBUG_INFO("Sink locator type - XA_DATALOCATOR_OUTPUTMIX")
+DEBUG_INFO("Sink locator type - XA_DATALOCATOR_OUTPUTMIX");
-;
 {
-/* Get OutputMix adaptation from data locator */
-XADataLocator_OutputMix* omix =
-(XADataLocator_OutputMix*) (xaSnk->pLocator);
-if (omix->outputMix)
-{
-XAOMixImpl* omixDevice =
-(XAOMixImpl*) (*omix->outputMix);
-if (omixDevice)
-{
-/*TODO we had to remove this line below since adaptationCtx
-* was  not a member of structure*/
-/*gstSnk = XAOutputMixAdapt_GetSink(omixDevice->adaptationCtx);*/
-if (!gstSnk)
-{
-DEBUG_ERR("Cannot create sink!");
-return NULL;
-}
-*isobj = XA_BOOLEAN_TRUE;
-}
-else
-{
-DEBUG_ERR("Warning - NULL outputmix object - default audio output used");
-gstSnk = gst_element_factory_make("alsasink",
-name);
-}
-}
-else
-{
-DEBUG_ERR("Warning - NULL outputmix object - default audio output used");
-gstSnk = gst_element_factory_make("alsasink", name);
-}
 }
 break;
 case XA_DATALOCATOR_ADDRESS:
 {
 }
 }
 if (gstSnk)
 {
 DEBUG_INFO_A1("Created gstreamer sink element at %x", gstSnk);
-}DEBUG_API("<-XAAdaptationGst_CreateGstSink");
+}
+DEBUG_API("<-XAAdaptationGst_CreateGstSink");
 return gstSnk;
 }
 /**
 * GstElement* XAAdaptationGst_CreateVideoPP( )
 {
 DEBUG_ERR("Could not link videopp elements!!");
 gst_object_unref(vpp);
 vpp = NULL;
 }
-}DEBUG_API("<-XAAdaptationGst_CreateVideoPP");
+}
+DEBUG_API("<-XAAdaptationGst_CreateVideoPP");
 return vpp;
 }
 /**
 * GstElement* XAAdaptationGst_CreateFixedSizeRecordVideoPP( )
 {
 DEBUG_ERR("Could not link videopp elements!!");
 gst_object_unref(vpp);
 vpp = NULL;
 }
-}DEBUG_API("<-XAAdaptationGst_CreateFixedSizeVideoPP");
+}
+DEBUG_API("<-XAAdaptationGst_CreateFixedSizeVideoPP");
 return vpp;
 }
 /**
 * GstElement* XAAdaptationGst_CreateVideoPPBlackScr( )
 {
 DEBUG_ERR("Could not link videoppBSrc elements!!");
 gst_object_unref(vppBScr);
 vppBScr = NULL;
 }
-}DEBUG_API("<-XAAdaptationGst_CreateVideoPPBlackScr");
+}
+DEBUG_API("<-XAAdaptationGst_CreateVideoPPBlackScr");
 return vppBScr;
 }
 /**
 * GstElement* XAAdaptationGst_CreateInputSelector( )
 inputSelector = gst_element_factory_make("input-selector",
 "input-selector");
 if (inputSelector)
 {
 g_object_set(G_OBJECT(inputSelector), "select-all", TRUE, NULL);
-}DEBUG_API("<-XAAdaptationGst_CreateInputSelector");
+}
+DEBUG_API("<-XAAdaptationGst_CreateInputSelector");
 return inputSelector;
 }
 /**
 * GstElement* XAAdaptationGst_CreateAudioPP( )

changeset 33	5e8b14bae8c3
parent 28	ebf79c79991a
child 53	eabc8c503852