Changeset 5538 for pjproject/branches/projects/uwp/pjsip-apps/src/samples/aviplay.c

Timestamp:

Jan 23, 2017 4:18:59 AM (7 years ago)

Author:

nanang

Message:

Re #1900: Merged changes from trunk.

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/samples/aviplay.c (modified) (5 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/samples/aviplay.c

@@ -468 +468 @@
         puts("Error: filename required");
         puts(desc);
-        return 1;
+        return 110;
     }
 
@@ -474 +474 @@
     /* Must init PJLIB first: */
     status = pj_init();
-    PJ_ASSERT_RETURN(status == PJ_SUCCESS, 1);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, 120);
 
     /* Must create a pool factory before we can allocate any memory. */
@@ -493 +493 @@
     
     status = pjmedia_vid_dev_subsys_init(&cp.factory);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        rc = 130;
         goto on_return;
+    }
     
     status = pjmedia_aud_subsys_init(&cp.factory);
     if (status != PJ_SUCCESS) {
+        rc = 140;
         goto on_return;
     }
@@ -503 +506 @@
 #if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
     status = pjmedia_codec_openh264_vid_init(NULL, &cp.factory);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        rc = 150;
         goto on_return;
+    }
 #endif
 
 #if PJMEDIA_HAS_FFMPEG_VID_CODEC
     status = pjmedia_codec_ffmpeg_vid_init(NULL, &cp.factory);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        rc = 160;
         goto on_return;    
+    }
 #endif
 
@@ -549 +556 @@
 
     /* Done. */
-    return 0;
+    return rc;
 }