Removed cyclic dependency with mediademuxer

Change-Id: I7e2354284d14959fb2aece3fb815cadd29098ce2

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index 17b00a8..7196071 100644 (file)
--- a/packaging/capi-media-codec.spec
+++ b/packaging/capi-media-codec.spec
@@ -16,14 +16,12 @@ BuildRequires:  pkgconfig(mm-common)
 BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(capi-media-tool)
-BuildRequires:  pkgconfig(capi-media-camera)
 BuildRequires:  pkgconfig(libtbm)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(iniparser)
-BuildRequires:  pkgconfig(capi-mediademuxer)
 
 %description
 A Media Codec library in Tizen Native API

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 754b501..d6a1257
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(../include/headers)
 link_directories(${CMAKE_SOURCE_DIR}/../)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED appcore-efl elementary capi-media-camera capi-mediademuxer)
+pkg_check_modules(${fw_test} REQUIRED appcore-efl elementary)
 FOREACH(flag ${${fw_test}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/test/media_codec_test.c b/test/media_codec_test.c
index 505dede..5eca332 100644 (file)
--- a/test/media_codec_test.c
+++ b/test/media_codec_test.c
@@ -25,19 +25,18 @@
 #include <tbm_surface.h>
 #include <dlog.h>
 #include <time.h>
-#include <camera.h>
 #include <media_codec.h>
 #include <media_packet.h>
 #include <media_packet_internal.h>
 #include <media_packet_pool.h>
 #include <media_codec_internal.h>
+#ifdef TIZEN_FEATURE_INTEGRATION
+#include <camera.h>
 #include <mediademuxer.h>
+#endif
 
 #define PACKAGE "media_codec_test"
 #define MAX_HANDLE                     4
-#if 0
-#define DUMP_OUTBUF           1
-#endif
 #define TEST_FILE_SIZE       (10 * 1024 * 1024)
 #define MAX_STRING_LEN       256
 
@@ -143,7 +142,11 @@ struct _App {
        gboolean enable_dump;
        gint frame;
        type_e type;
+
+#ifdef TIZEN_FEATURE_INTEGRATION
        camera_h camera_handle;
+       mediademuxer_h demuxer;
+#endif
 
        GThread *thread;
        GCond thread_cond;
@@ -156,7 +159,6 @@ struct _App {
        gint suspend;
        gchar filepath[256];
        /* demuxer */
-       mediademuxer_h demuxer;
        media_format_h format[MAX_HANDLE];
        /* video */
        mediacodec_h mc_handle[MAX_HANDLE];
@@ -216,7 +218,6 @@ const char* codec_type_to_string(mediacodec_codec_type_e media_codec_id);
 void (*extractor)(App *app, guint8** data, gint *size, gboolean *have_frame, gboolean *codec_data);
 
 gint g_menu_state = CURRENT_STATUS_MAINMENU;
-void demuxer_error_cb(mediademuxer_error_e error, void *user_data);
 
 gint _create_app(void *data)
 {
@@ -1089,6 +1090,7 @@ void av_feed_resume(App *app)
        g_mutex_unlock(&app->thread_mutex);
 }
 
+#ifdef TIZEN_FEATURE_INTEGRATION
 gpointer av_feed_thread(gpointer data)
 {
        App *app = (App *)data;
@@ -1164,6 +1166,7 @@ gboolean feed_video(App *app)
 
        return TRUE;
 }
+#endif
 
 void start_feed(App *app)
 {
@@ -1330,11 +1333,6 @@ void _mediacodec_error_cb(mediacodec_error_e error, void *user_data)
        return;
 }
 
-void demuxer_error_cb(mediademuxer_error_e error, void *user_data)
-{
-       g_print("Got Error %d from Mediademuxer\n", error);
-       return;
-}
 
 void _mediacodec_eos_cb(void *user_data)
 {
@@ -1348,6 +1346,13 @@ void _mediacodec_eos_cb(void *user_data)
        return;
 }
 
+#ifdef TIZEN_FEATURE_INTEGRATION
+void demuxer_error_cb(mediademuxer_error_e error, void *user_data)
+{
+       g_print("Got Error %d from Mediademuxer\n", error);
+       return;
+}
+
 void _mediademuxer_eos_cb(int track, void *user_data)
 {
        App *app = (App *)user_data;
@@ -1361,6 +1366,7 @@ void _mediademuxer_eos_cb(int track, void *user_data)
 
        return;
 }
+#endif
 
 gboolean  _foreach_cb(mediacodec_codec_type_e codec_type, void *user_data)
 {
@@ -1540,6 +1546,7 @@ void _media_packet_preview_cb(media_packet_h packet, void *user_data)
        return;
 }
 
+#ifdef TIZEN_FEATURE_INTEGRATION
 void _mediacodec_camera_start(App *app)
 {
        int default_format = CAMERA_PIXEL_FORMAT_NV12;
@@ -1592,7 +1599,9 @@ void _mediacodec_camera_stop(App *app)
        mediacodec_destroy(app->mc_handle[1]);
        return;
 }
+#endif
 
+#ifdef TIZEN_FEATURE_INTEGRATION
 void _mediacodec_auto_test(App *app, char *path)
 {
        gint ret = 0;
@@ -1810,6 +1819,7 @@ void _mediacodec_auto_test(App *app, char *path)
 
        return;
 }
+#endif
 
 void _mediacodec_unprepare(App *app)
 {
@@ -1901,12 +1911,14 @@ void _interpret_main_menu(char *cmd, App *app)
                        _mediacodec_unprepare(app);
                else if (strncmp(cmd, "dt", 2) == 0)
                        _mediacodec_destroy(app);
+#ifdef TIZEN_FEATURE_INTEGRATION
                else if (strncmp(cmd, "cr", 2) == 0)
                        _mediacodec_camera_start(app);
                else if (strncmp(cmd, "ct", 2) == 0)
                        _mediacodec_camera_stop(app);
                else if (strncmp(cmd, "au", 2) == 0)
                        g_menu_state = CURRENT_STATUS_AUTO_TEST;
+#endif
                else if (strncmp(cmd, "dp", 2) == 0) {
                        if (!app->enable_dump) {
                                app->enable_dump = TRUE;
@@ -1973,8 +1985,10 @@ void displaymenu(void)
                g_print("*** input dec process number\n");
        } else if (g_menu_state == CURRENT_STATUS_GET_OUTPUT) {
                g_print("*** input get output buffer number\n");
+#ifdef TIZEN_FEATURE_INTEGRATION
        } else if (g_menu_state == CURRENT_STATUS_AUTO_TEST) {
                g_print("*** enter media path and select the track to decode (0 : audio, 1 : video).\n");
+#endif
        } else {
                g_print("*** unknown status.\n");
        }
@@ -2142,7 +2156,7 @@ void interpret(char *cmd)
                case 3:
                        tmp = atoi(cmd);
 
-                       if (tmp <= 0 || tmp > INT_MAX) {
+                       if (tmp <= 0 || tmp >= INT_MAX) {
                                g_print(";;Invalid value\n");
                                reset_menu_state();
                                break;
@@ -2162,7 +2176,7 @@ void interpret(char *cmd)
        {
                tmp = atoi(cmd);
 
-               if (tmp <= 0 || tmp > INT_MAX) {
+               if (tmp <= 0 || tmp >= 10) {
                        g_print("Invalid value\n");
                        reset_menu_state();
                        break;
@@ -2178,6 +2192,7 @@ void interpret(char *cmd)
                reset_menu_state();
        }
        break;
+#ifdef TIZEN_FEATURE_INTEGRATION
        case CURRENT_STATUS_AUTO_TEST:
        {
                int len;
@@ -2200,6 +2215,7 @@ void interpret(char *cmd)
                }
        }
        break;
+#endif
        }
 
        g_timeout_add(100, timeout_menu_display, 0);
@@ -2226,10 +2242,12 @@ void display_sub_basic()
        g_print("dt. Destroy \t\t");
        g_print("q. quit test suite \n");
        g_print("dp. enable dump \n");
+#ifdef TIZEN_FEATURE_INTEGRATION
        g_print("-----------------------------------------------------------------------------------------\n");
        g_print("cr. camera preview -> encoder -> decoder\n");
-       g_print("au. interlocking with mediademuxer\n");
+       g_print("au. integration test with mediademuxer\n");
        g_print("ct. quit camera test\n");
+#endif
        g_print("\n");
        g_print("=========================================================================================\n");
 }