Sync with 2.4 (Error handling when eos not set.)

[1] Added description of test main menu('e') in display_sub_basic()

Change-Id: I90ba549185efdb3f0fe4a298ba01a56613ad57f4
Signed-off-by: Deepak Srivastava <srivatsava.d@samsung.com>

diff --git a/src/mediademuxer.c b/src/mediademuxer.c
index a48a649..e46e287 100755 (executable)
--- a/src/mediademuxer.c
+++ b/src/mediademuxer.c
@@ -117,7 +117,7 @@ int mediademuxer_prepare(mediademuxer_h demuxer)
        DEMUXER_INSTANCE_CHECK(demuxer);
        mediademuxer_s *handle;
        handle = (mediademuxer_s *)(demuxer);
-       if (handle && handle->demux_state == MEDIADEMUXER_IDLE) {
+       if (handle && handle->demux_state == MEDIADEMUXER_IDLE && handle->eos_cb != NULL) {
                ret = md_prepare((MMHandleType) (handle->md_handle));
                if (ret != MEDIADEMUXER_ERROR_NONE) {
                        MD_E("[CoreAPI][%s] DEMUXER_ERROR_INVALID_OPERATION(0x%08x)",
@@ -128,6 +128,8 @@ int mediademuxer_prepare(mediademuxer_h demuxer)
        } else {
                if (handle->demux_state != MEDIADEMUXER_IDLE)
                        return MEDIADEMUXER_ERROR_INVALID_STATE;
+               if (handle->eos_cb == NULL)
+                       MD_E("EOS callback is not set\n");
                MD_E("[CoreAPI][%s] DEMUXER_ERROR_INVALID_OPERATION(0x%08x)",
                        __FUNCTION__, MEDIADEMUXER_ERROR_INVALID_OPERATION);
                return MEDIADEMUXER_ERROR_INVALID_OPERATION;

diff --git a/test/mediademuxer_test.c b/test/mediademuxer_test.c
index de4faea..ec7b89a 100755 (executable)
--- a/test/mediademuxer_test.c
+++ b/test/mediademuxer_test.c
@@ -826,7 +826,7 @@ static void display_sub_basic()
        g_print("\n");
        g_print("===========================================================================\n");
        g_print("                     media demuxer test\n");
-       g_print(" SELECT : c -> (s) -> p -> (goto submenu) -> d -> q \n");
+       g_print(" SELECT : c -> (s) -> e -> p -> (goto submenu) -> d -> q \n");
        g_print("---------------------------------------------------------------------------\n");
        g_print("c. Create \t");
        g_print("s. Set callback \t");
@@ -929,7 +929,10 @@ static void interpret(char *cmd)
                                        g_menu_state = CURRENT_STATUS_SET_DATA;
                                } else {
                                        g_print("test_mediademuxer_prepare failed \n");
-                                       g_menu_state = CURRENT_STATUS_FILENAME;
+                                       if (ret == MEDIADEMUXER_ERROR_INVALID_OPERATION)
+                                               g_menu_state = CURRENT_STATUS_MAINMENU;
+                                       else
+                                               g_menu_state = CURRENT_STATUS_FILENAME;
                                }
                        } else {
                                g_menu_state = CURRENT_STATUS_FILENAME;