Current implementation gives preference to codecname and enginename values set via set_property over autodetected during gst_set_sink_caps. To comply with this we need to default engine and codec name to NULL.

git-svn-id: https://gstreamer.ti.com/svn/gstreamer_ti/trunk@930 24075187-2e39-4e88-bbb8-bc8aa768f540

4 files changed, 12 insertions, 25 deletions

diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttiauddec1.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttiauddec1.c
index dc07464..ad59146 100644
--- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttiauddec1.c
+++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttiauddec1.c
@@ -65,6 +65,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_tiauddec1_debug);
 #define GST_CAT_DEFAULT gst_tiauddec1_debug
 
 /* define property defaults */
+#define     DEFAULT_ENGINE_NAME         "unspecified"
 #define     DEFAULT_CODEC_NAME          "unspecified"
 #define     DEFAULT_NUMOUTPUT_BUFS      3
 #define     DEFAULT_NUM_CHANNELES       2
@@ -72,13 +73,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_tiauddec1_debug);
 #define     DEFAULT_GENTIMESTAMPS       TRUE
 #define     DEFAULT_RTCODECTHREAD       TRUE
 
-/* define platform specific defaults */
-#if defined(Platfrom_dm6446)
-    #define     DEFAULT_ENGINE_NAME         "decode"
-#else
-    #define     DEFAULT_ENGINE_NAME         "codecServer"
-#endif
-    
 /* Element property identifiers */
 enum
 {
@@ -399,12 +393,13 @@ static void gst_tiauddec1_init(GstTIAuddec1 *auddec1, GstTIAuddec1Class *gclass)
     gst_element_add_pad(GST_ELEMENT(auddec1), auddec1->srcpad);
 
     /* Initialize TIAuddec1 state */
-    g_object_set(auddec1, "engineName", DEFAULT_ENGINE_NAME, (gchar*)NULL);
-    g_object_set(auddec1, "codecName", DEFAULT_CODEC_NAME, (gchar*)NULL);
+    auddec1->engineName         = NULL;
+    auddec1->codecName          = NULL;
     auddec1->displayBuffer      = DEFAULT_DISPLAY_BUFFER;
     auddec1->genTimeStamps      = DEFAULT_GENTIMESTAMPS;
 
     auddec1->hEngine            = NULL;
+    auddec1->codecName          = NULL;
     auddec1->hAd                = NULL;
     auddec1->channels           = DEFAULT_NUM_CHANNELES;
     auddec1->drainingEOS        = FALSE;
diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttiaudenc1.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttiaudenc1.c
index f3249e3..0fd7944 100644
--- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttiaudenc1.c
+++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttiaudenc1.c
@@ -389,9 +389,9 @@ static void gst_tiaudenc1_init(GstTIAudenc1 *audenc1, GstTIAudenc1Class *gclass)
 
     /* Initialize TIAudenc1 state */
     g_object_set(audenc1, "engineName", DEFAULT_ENGINE_NAME, (gchar*)NULL);
-    g_object_set(audenc1, "codecName", DEFAULT_CODEC_NAME, (gchar*)NULL);
     audenc1->displayBuffer      = DEFAULT_DISPLAY_BUFFER;
     audenc1->genTimeStamps      = DEFAULT_GENTIMESTAMPS;
+    audenc1->codecName          = NULL;
 
     audenc1->hEngine            = NULL;
     audenc1->hAe                = NULL;
diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividdec2.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividdec2.c
index 83a13a3..ea24d2d 100644
--- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividdec2.c
+++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividdec2.c
@@ -66,19 +66,16 @@
 #define     DEFAULT_GENTIMESTAMP    TRUE
 #define     DEFAULT_RTCODECTHREAD   TRUE
 #define     DEFAULT_DISPLAY_BUFFER  FALSE
+#define     DEFAULT_ENGINE_NAME     "unspecified"
 
 /* define platform specific defaults */
 #if defined(Platform_dm365) || defined(Platform_dm368)
-    #define     DEFAULT_ENGINE_NAME     "codecServer"
     #define     DEFAULT_PADALLOC        TRUE
 #elif defined(Platform_dm3730) || defined(Platform_omap3530)
-    #define     DEFAULT_ENGINE_NAME     "codecServer"
     #define     DEFAULT_PADALLOC        TRUE
 #elif defined(Platform_dm6467) || defined(Platform_dm6467t)
-    #define     DEFAULT_ENGINE_NAME     "codecServer"
     #define     DEFAULT_PADALLOC        FALSE
 #else
-    #define     DEFAULT_ENGINE_NAME     "decode"
     #define     DEFAULT_PADALLOC        FALSE
 #endif
 
@@ -468,7 +465,8 @@ static void gst_tividdec2_init(GstTIViddec2 *viddec2, GstTIViddec2Class *gclass)
     gst_element_add_pad(GST_ELEMENT(viddec2), viddec2->srcpad);
 
     /* Initialize TIViddec2 state */
-    g_object_set(viddec2, "engineName", DEFAULT_ENGINE_NAME, NULL);
+    viddec2->codecName          = NULL;
+    viddec2->engineName         = NULL;
     viddec2->displayBuffer      = DEFAULT_DISPLAY_BUFFER;
     viddec2->genTimeStamps      = DEFAULT_GENTIMESTAMP;
     viddec2->numOutputBufs      = DEFAULT_NUMOUTPUT_BUFS;
diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c
index 724a8f6..b372b0e 100644
--- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c
+++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c
@@ -65,16 +65,10 @@ GST_DEBUG_CATEGORY_STATIC (gst_tividenc1_debug);
 #define     DEFAULT_FRAMERATE_DEN       1001
 #define     DEFAULT_RATECTRL_PRESET     1
 #define     DEFAULT_BYTE_STREAM         FALSE
-#define     DEFAULT_CODEC_NAME          "h264enc"
+#define     DEFAULT_CODEC_NAME          "unspecified"
 #define     DEFAULT_CONTIG_INPUT_BUF    FALSE
 #define     DEFAULT_GENTIMESTAMP        TRUE
-
-/* define platform specific defaults */
-#if defined(Platform_dm6446)
-    #define     DEFAULT_ENGINE_NAME     "encode"
-#else
-    #define     DEFAULT_ENGINE_NAME     "codecServer"
-#endif
+#define     DEFAULT_ENGINE_NAME         "unspecified"
 
 #if defined(Platform_dm365) || defined(Platform_dm368) || defined(Platform_dm6467) \
     || defined(Platform_dm6467t)
@@ -388,8 +382,8 @@ static void gst_tividenc1_init(GstTIVidenc1 *videnc1, GstTIVidenc1Class *gclass)
     }
 
     /* Initialize TIVidenc1 state */
-    g_object_set(videnc1, "engineName", DEFAULT_ENGINE_NAME, NULL);
-    g_object_set(videnc1, "codecName", DEFAULT_CODEC_NAME, NULL);
+    videnc1->codecName              = NULL;
+    videnc1->engineName             = NULL;
     videnc1->genTimeStamps          = DEFAULT_GENTIMESTAMP;
 
     videnc1->hEngine                = NULL;