Changeset 4873

Timestamp:

Jul 11, 2014 4:20:08 AM (10 years ago)

Author:

bennylp

Message:

Closed #1758: use OpenH264 lib version 1.0.0 release instead of the latest git version which is still changing

Location:

pjproject/trunk/pjmedia/src

Files:

• pjmedia-codec/openh264.cpp (modified) (6 diffs)
• test/test.h (modified) (1 diff)

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

@@ -648 +648 @@
     }
 
-    if (oh264_data->bsi.eFrameType == videoFrameTypeSkip) {
+    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeSkip) {
         output->size = 0;
         output->type = PJMEDIA_FRAME_TYPE_NONE;
@@ -668 +668 @@
         /* Find which layer with biggest payload */
         oh264_data->ilayer = 0;
-        payload_size = oh264_data->bsi.sLayerInfo[0].pNalLengthInByte[0];
+        payload_size = oh264_data->bsi.sLayerInfo[0].iNalLengthInByte[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->pNalLengthInByte[j] > (int)payload_size) {
-                    payload_size = pLayerBsInfo->pNalLengthInByte[j];
+                if (pLayerBsInfo->iNalLengthInByte[j] > (int)payload_size) {
+                    payload_size = pLayerBsInfo->iNalLengthInByte[j];
                     oh264_data->ilayer = i;
                 }
@@ -690 +690 @@
         payload_size = 0;
         for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
-            payload_size += pLayerBsInfo->pNalLengthInByte[inal];
+            payload_size += pLayerBsInfo->iNalLengthInByte[inal];
         }
 
@@ -747 +747 @@
         output->size = payload_len;
 
-        if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
+        if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
             output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
         }
@@ -769 +769 @@
     oh264_data->enc_frame_size = 0;
     for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
-        oh264_data->enc_frame_size += pLayerBsInfo->pNalLengthInByte[inal];
+        oh264_data->enc_frame_size += pLayerBsInfo->iNalLengthInByte[inal];
     }
 
@@ -796 +796 @@
     output->size = payload_len;
 
-    if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
+    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
         output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
     }

pjproject/trunk/pjmedia/src/test/test.h

@@ -24 +24 @@
 #include <pjlib.h>
 
-#define HAS_VID_DEV_TEST        PJMEDIA_HAS_VIDEO
-#define HAS_VID_PORT_TEST       PJMEDIA_HAS_VIDEO
+#define HAS_VID_DEV_TEST        0       // PJMEDIA_HAS_VIDEO
+#define HAS_VID_PORT_TEST       0       // PJMEDIA_HAS_VIDEO
 #define HAS_VID_CODEC_TEST      PJMEDIA_HAS_VIDEO
-#define HAS_SDP_NEG_TEST        1
-#define HAS_JBUF_TEST           1
-#define HAS_MIPS_TEST           1
-#define HAS_CODEC_VECTOR_TEST   1
+#define HAS_SDP_NEG_TEST        0
+#define HAS_JBUF_TEST           0
+#define HAS_MIPS_TEST           0
+#define HAS_CODEC_VECTOR_TEST   0
 
 int session_test(void);