Changeset 4863 for pjproject

Timestamp:

Jun 23, 2014 6:21:21 AM (10 years ago)

Author:

bennylp

Message:

Re #1758: Updated with the latest OpenH264 to fix compilation error and codec initialization error for packing mode

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

@@ -480 +480 @@
     eprm.bPrefixNalAddingCtrl           = false;
     eprm.iSpatialLayerNum               = 1;
+    if (!oh264_data->whole) {
+        eprm.uiMaxNalSize                       = param->enc_mtu;
+    }
 
     pj_bzero(&elayer_ctx, sizeof (SLayerPEncCtx));
@@ -660 +663 @@
         /* Find which layer with biggest payload */
         oh264_data->ilayer = 0;
-        payload_size = oh264_data->bsi.sLayerInfo[0].iNalLengthInByte[0];
+        payload_size = oh264_data->bsi.sLayerInfo[0].pNalLengthInByte[0];
         for (i=0; i < (unsigned)oh264_data->bsi.iLayerNum; ++i) {
             unsigned j;
             pLayerBsInfo = &oh264_data->bsi.sLayerInfo[i];
             for (j=0; j < (unsigned)pLayerBsInfo->iNalCount; ++j) {
-                if (pLayerBsInfo->iNalLengthInByte[j] > (int)payload_size) {
-                    payload_size = pLayerBsInfo->iNalLengthInByte[j];
+                if (pLayerBsInfo->pNalLengthInByte[j] > (int)payload_size) {
+                    payload_size = pLayerBsInfo->pNalLengthInByte[j];
                     oh264_data->ilayer = i;
                 }
@@ -682 +685 @@
         payload_size = 0;
         for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
-            payload_size += pLayerBsInfo->iNalLengthInByte[inal];
+            payload_size += pLayerBsInfo->pNalLengthInByte[inal];
         }
 
@@ -761 +764 @@
     oh264_data->enc_frame_size = 0;
     for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
-        oh264_data->enc_frame_size += pLayerBsInfo->iNalLengthInByte[inal];
+        oh264_data->enc_frame_size += pLayerBsInfo->pNalLengthInByte[inal];
     }
 
@@ -859 +862 @@
 static pj_status_t oh264_got_decoded_frame(pjmedia_vid_codec *codec,
                                            struct oh264_codec_data *oh264_data,
-                                           void *pData[3],
+                                           unsigned char *pData[3],
                                            SBufferInfo *sDstBufInfo,
                                            pj_timestamp *timestamp,
@@ -932 +935 @@
 {
     struct oh264_codec_data *oh264_data;
-    void* pData[3] = {NULL};
+    unsigned char* pData[3] = {NULL};
     const pj_uint8_t nal_start[] = { 0, 0, 1 };
     SBufferInfo sDstBufInfo;