FCL/sf/mw/gstreamer: comparison gst_plugins_symbian/gst/devsound/gstdevsoundsrc.c

equal deleted inserted replaced

-:29ecd5cb86b3
+:d43ce56a1534
 */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <gst/gst.h>
+#include <e32err.h>
 #include <gqueue.h>
 #include "common.h"
 #include "gstdevsoundsrc.h"
 #include <glib_global.h>
 GList** aSupportedBitrates);
 static gint gst_get_speech_encoder_vad_mode(gboolean* aVadMode);
 static gint gst_set_speech_encoder_bit_rate(guint aBitrate);
 static gint gst_set_speech_encoder_vad_mode(gboolean aVadMode);
 static void gst_Apply_SpeechEncoder_Update(GstDevsoundSrc *devsoundsrc );
+static void gst_update_devsound_speech_bitrate(GstDevsoundSrc *devsoundsrc );
 /*************************
 * G711 Encoder Interface
 * ***********************/
 static void gst_g711_encoder_handler_init(gpointer g_iface,
 STOP,
 /*UPDATE,*/
 CLOSE
 };
 enum command_to_consumer_thread_enum cmd;
+int return_error;
 enum
 {
 LAST_SIGNAL
 };
 GST_STATIC_CAPS ("audio/x-raw-int, "
 "endianness = (int) { " G_STRINGIFY (G_BYTE_ORDER) " }, "
 "signed = (boolean) TRUE, "
 "width = (int) 16, "
 "depth = (int) 16, "
-"rate = (int) [ 8000, 48000 ],"
+"rate = (int) { 8000, 16000, 24000, 32000, 48000 },"
 "channels = (int) [ 1, 2 ]; "
 "audio/amr, "
-"rate = (int) [ 8000, 48000 ], "
+"rate = (int) 8000, "
-"channels = (int) [ 1, 2 ]; "
+"channels = (int) [ 1, 2 ]; ")
-"audio/x-alaw, "
-"rate = (int) [ 8000, 48000 ], "
-"channels = (int) [ 1, 2 ]; "
-"audio/g729, "
-"rate = (int) [ 8000, 48000 ], "
-"channels = (int) [ 1, 2 ]; "
-"audio/ilbc, "
-"rate = (int) [ 8000, 48000 ], "
-"channels = (int) [ 1, 2 ]; "
-"audio/x-mulaw, "
-"rate = (int) [ 8000, 48000 ], "
-"channels = (int) [ 1, 2 ]")
 );
 static GstElementClass *parent_class= NULL;
 static void gst_devsound_src_base_init(gpointer g_class)
 GstDevsoundSrc *devsoundsrc= GST_DEVSOUND_SRC (threadarg);
 int buffersize;
 TUint8* gBuffer;
 GstBuffer* pushBuffer= NULL;
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) devsoundsrc, "StartDevSoundThread ",NULL);
-open_devsound(&(devsoundsrc->handle));
+int ret = open_devsound(&(devsoundsrc->handle));
+if( 0 != ret )
+{
+pthread_mutex_lock(&(create_mutex1));
+return_error = ret;
+pthread_cond_signal(&(create_condition1));
+pthread_mutex_unlock(&(create_mutex1));
+//return_error = ret;
+pthread_exit(NULL);
+}
 getsupporteddatatypes(devsoundsrc);
 // TODO obtain mutex to update variable here???
 consumer_thread_state = CONSUMER_THREAD_INITIALIZED;
 //pre_init_setconf(devsoundsrc);
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) devsoundsrc, "After Record Init ",NULL);
 pthread_mutex_lock(&(create_mutex1));
+return_error = ret;
 pthread_cond_signal(&(create_condition1));
 pthread_mutex_unlock(&(create_mutex1));
 // Wait until we receive a command from the main thread
 // TODO obtain mutex to read variable here???
 // This could happen if client creates sink and deletes it
 // without putting it to play state
 if ( cmd != CLOSE )
 {
-initialize_devsound(devsoundsrc);
+gst_update_devsound_speech_bitrate(devsoundsrc);
+ret = initialize_devsound(devsoundsrc);
-recordinit(devsoundsrc->handle);
+if( 0 == ret )
-initproperties(devsoundsrc);
+{
+ret = recordinit(devsoundsrc->handle);
+if( 0 == ret )
+initproperties(devsoundsrc);
+}
+/// if initialization of devsound failed, return error,
+/// on return other thread will send CLOSE cmd to exit from thread.
+if( ret )
+{
+pthread_mutex_lock(&(create_mutex1));
+return_error = ret;
+pthread_cond_signal(&(create_condition1));
+pthread_mutex_unlock(&(create_mutex1));
+pthread_mutex_lock(&create_mutex1);
+pthread_cond_wait(&create_condition1, &create_mutex1);
+pthread_mutex_unlock(&create_mutex1);
+}
 }
 while (TRUE)
 {
 switch (cmd)
 break;
 case RECORDING:
 {
 pre_init_setconf(devsoundsrc);
-gst_Apply_SpeechEncoder_Update(devsoundsrc);
+//                gst_Apply_SpeechEncoder_Update(devsoundsrc);
 gst_Apply_G711Encoder_Update(devsoundsrc);
 gst_Apply_G729Encoder_Update(devsoundsrc );
 gst_Apply_IlbcEncoder_Update(devsoundsrc );
 populateproperties(devsoundsrc);
 consumer_thread_state = CONSUMER_THREAD_UNINITIALIZED;
 pthread_exit(NULL);
 break;
 }
 pthread_mutex_lock(&(create_mutex1));
+return_error = call_back_error(devsoundsrc->handle);
 pthread_cond_signal(&(create_condition1));
 pthread_mutex_unlock(&(create_mutex1));
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_wait(&create_condition1, &create_mutex1);
 }
 static gboolean gst_devsound_src_start(GstBaseSrc * bsrc)
 {
 GstBuffer *tmp_gstbuffer=NULL;
+gboolean ret = TRUE;
 GstDevsoundSrc *src= GST_DEVSOUND_SRC(bsrc);
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "gst_devsound_src_start ENTER ",NULL);
 pthread_mutex_init(&create_mutex1, NULL);
 pthread_cond_init(&create_condition1, NULL);
 dataqueue = g_queue_new();
 }
 consumer_thread_state = CONSUMER_THREAD_INITIALIZING;
 cmd = OPEN;
+return_error = 0;
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "Before Thread Create ",NULL);
 pthread_create(&ds_thread, NULL, StartDevSoundThread, (void *)src);
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "After Thread Create ",NULL);
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "Before Mutex Wait in START ",NULL);
 if (consumer_thread_state == CONSUMER_THREAD_INITIALIZING)
 {
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_wait(&create_condition1, &create_mutex1);
+ret = !return_error; // should be TRUE on no Error, and FALSE at ERROR.
 pthread_mutex_unlock(&create_mutex1);
 }
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "AFter Mutex Wait in START ",NULL);
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) src, "gst_devsound_src_start EXIT ",NULL);
-return TRUE;
+return ret;
 /* ERRORS */
 }
 static gboolean gst_devsound_src_stop(GstBaseSrc * bsrc)
 {
 static GstFlowReturn gst_devsound_src_create(GstBaseSrc *src, guint64 offset,
 guint size, GstBuffer **buf)
 {
 GstDevsoundSrc *dsrc= GST_DEVSOUND_SRC(src);
 int bufferpos=0;
+int ret = 0;
 if(!g_queue_get_length(dataqueue) && (dsrc->eosreceived == TRUE))
 {
 pthread_mutex_lock(&(create_mutex1));
 pthread_cond_signal(&(create_condition1));
 return GST_FLOW_UNEXPECTED;
 }
 else
 {
 cmd = RECORDING;
+return_error = 0;
 pthread_mutex_lock(&(create_mutex1));
 pthread_cond_signal(&(create_condition1));
 pthread_mutex_unlock(&(create_mutex1));
 pthread_mutex_lock(&(create_mutex1));
 pthread_cond_wait(&(create_condition1), &(create_mutex1));
+ret = return_error;
 pthread_mutex_unlock(&(create_mutex1));
 }
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) dsrc, "AFTER WAIT in CREATE ",NULL);
 }
+if( KErrInUse == ret || KErrDied  == ret || KErrAccessDenied == ret )
+{
+// post error as pre-emption
+GST_ELEMENT_ERROR (src, RESOURCE, BUSY,
+(("Pre-emption error.")),
+("streaming paused because higher priority app requested resource, Err(%d)", ret));
+return GST_FLOW_UNEXPECTED;
+}
+else if( KErrNone != ret )
+{
+// no need to post error as base src will post error.
+return GST_FLOW_ERROR;
+}
 //gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) dsrc, "Before POP in CREATE ",NULL);
 GST_OBJECT_LOCK(dsrc);
 popBuffer = (GstBuffer*)g_queue_pop_tail(dataqueue);
 GST_OBJECT_UNLOCK(dsrc);
-//gst_debug_log(devsound_debug, GST_LEVEL_LOG, "", "", 0, (GObject *) dsrc, "AFTER POP in CREATE ",NULL);
-if(!popBuffer)
+if(!popBuffer )
-	{
+{
-	return GST_FLOW_UNEXPECTED;
+return GST_FLOW_UNEXPECTED;
-	}
+}
 if(dsrc->firstTimeInit != kPlayed)
 {
 dsrc->prevbuffersize = gst_base_src_get_blocksize(src);
 gst_base_src_set_blocksize (src, GST_BUFFER_SIZE(popBuffer));
 (*buf)->size = GST_BUFFER_SIZE(popBuffer);
 if (src->firstTimeInit != kPlayed)
 src->firstTimeInit = kPausedToPlaying;
 if(cmd == PAUSE)
 {
 cmd = RESUME;
+return_error = 0;
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_signal(&create_condition1);
 pthread_mutex_unlock(&create_mutex1);
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_wait(&create_condition1, &create_mutex1);
+if( return_error )
+ret = GST_STATE_CHANGE_FAILURE;
 pthread_mutex_unlock(&create_mutex1);
 }
 break;
 default:
 break;
 switch (transition) {
 case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
 cmd = PAUSE;
+return_error = 0;
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_signal(&create_condition1);
 pthread_mutex_unlock(&create_mutex1);
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_wait(&create_condition1, &create_mutex1);
+if( return_error )
+ret = GST_STATE_CHANGE_FAILURE;
 pthread_mutex_unlock(&create_mutex1);
 break;
 default:
 break;
 }
 speechvadmode = aVadMode;
 customInfaceUpdate.speechvadmodeupdate = TRUE;
 return 0;
 }
+static void gst_update_devsound_speech_bitrate(GstDevsoundSrc *devsoundsrc )
+{
+if(customInfaceUpdate.speechbitrateupdate == TRUE)
+{
+update_devsound_speech_bitrate(devsoundsrc->handle,speechbitrate);
+customInfaceUpdate.speechbitrateupdate = FALSE;
+}
+}
 static void gst_Apply_SpeechEncoder_Update(GstDevsoundSrc *devsoundsrc )
 {
 if(customInfaceUpdate.speechbitrateupdate == TRUE)
 {
 set_speech_encoder_bit_rate(devsoundsrc->handle,speechbitrate);
 case GST_EVENT_EOS:
 // end-of-stream, we should close down all stream leftovers here
 //reset_devsound(sink->handle);
 src->eosreceived = TRUE;
 cmd = STOP;
+return_error = 0;
 pthread_mutex_lock(&create_mutex1);
 pthread_cond_signal(&create_condition1);
 pthread_mutex_unlock(&create_mutex1);
 pthread_mutex_lock(&create_mutex1);

changeset 27	d43ce56a1534
parent 23	29ecd5cb86b3
child 28	4ed5253bb6ba