Changeset 5979 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

Timestamp:

May 9, 2019 4:00:00 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJSUA-LIB to use PJ_ERROR or pjsua_perror when applicable.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c (modified) (10 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -49 +49 @@
     status = pjmedia_video_format_mgr_create(pjsua_var.pool, 64, 0, NULL);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error creating PJMEDIA video format manager"));
+        pjsua_perror(THIS_FILE, "Error creating PJMEDIA video format manager",
+                     status);
         goto on_error;
     }
@@ -56 +56 @@
     status = pjmedia_converter_mgr_create(pjsua_var.pool, NULL);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error creating PJMEDIA converter manager"));
+        pjsua_perror(THIS_FILE, "Error creating PJMEDIA converter manager",
+                     status);
         goto on_error;
     }
@@ -63 +63 @@
     status = pjmedia_vid_codec_mgr_create(pjsua_var.pool, NULL);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error creating PJMEDIA video codec manager"));
+        pjsua_perror(THIS_FILE, "Error creating PJMEDIA video codec manager",
+                     status);
         goto on_error;
     }
@@ -71 +71 @@
                                      &pjsua_var.vid_conf);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error creating PJMEDIA video conference bridge"));
+        pjsua_perror(THIS_FILE,
+                     "Error creating PJMEDIA video conference bridge",
+                     status);
         goto on_error;
     }
@@ -79 +80 @@
     status = pjmedia_codec_vid_toolbox_init(NULL, &pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error initializing Video Toolbox codec"));
+        pjsua_perror(THIS_FILE, "Error initializing Video Toolbox codec",
+                     status);
         goto on_error;
     }
@@ -88 +89 @@
     status = pjmedia_codec_openh264_vid_init(NULL, &pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error initializing OpenH264 library"));
+        pjsua_perror(THIS_FILE, "Error initializing OpenH264 library",
+                     status);
         goto on_error;
     }
@@ -97 +98 @@
     status = pjmedia_codec_ffmpeg_vid_init(NULL, &pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error initializing ffmpeg library"));
+        pjsua_perror(THIS_FILE, "Error initializing ffmpeg library", status);
         goto on_error;
     }
@@ -105 +105 @@
     status = pjmedia_vid_dev_subsys_init(&pjsua_var.cp.factory);
     if (status != PJ_SUCCESS) {
-        PJ_PERROR(1,(THIS_FILE, status,
-                     "Error creating PJMEDIA video subsystem"));
+        pjsua_perror(THIS_FILE, "Error creating PJMEDIA video subsystem",
+                     status);
         goto on_error;
     }
@@ -766 +766 @@
                             &enabled);
             if (status != PJ_SUCCESS) {
-                PJ_PERROR(1,(THIS_FILE, status,
+                pjsua_perror(THIS_FILE,
                              "Error activating native preview, falling back "
-                             "to software preview.."));
+                             "to software preview..",
+                             status);
                 w->is_native = PJ_FALSE;
             }
@@ -1356 +1357 @@
                         &enabled);
         if (status != PJ_SUCCESS) {
-            PJ_PERROR(1,(THIS_FILE, status,
+            pjsua_perror(THIS_FILE,
                          "Error activating native preview, falling back "
-                         "to software preview.."));
+                         "to software preview..",
+                         status);
             w->is_native = PJ_FALSE;
         }