Changeset 6095

Timestamp:

Oct 21, 2019 1:58:11 AM (4 years ago)

Author:

nanang

Message:

Fix #2247: Distorted video sent by iOS 13 devices.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/vid_toolbox.m (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-codec/vid_toolbox.m

@@ -798 +798 @@
         count = CVPixelBufferGetPlaneCount(image_buf);
         for (i = 0; i < count; i++) {
-            void *ptr = CVPixelBufferGetBaseAddressOfPlane(image_buf, i);
-            size_t bpr = CVPixelBufferGetBytesPerRow(image_buf);
-            
-            pj_assert(bpr = plane_bpr[i]);
-            pj_memcpy(ptr, base_addr[i], plane_bpr[i] * plane_h[i]);
+            char *ptr = (char*)CVPixelBufferGetBaseAddressOfPlane(image_buf, i);
+            char *src = (char*)base_addr[i];
+            size_t bpr = CVPixelBufferGetBytesPerRowOfPlane(image_buf, i);
+            int j;
+
+            pj_assert(bpr >= plane_bpr[i]);
+            for (j = 0; j < plane_h[i]; ++j) {
+                pj_memcpy(ptr, src, plane_bpr[i]);
+                src += plane_bpr[i];
+                ptr += bpr;
+            }
         }