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

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4873 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 14 insertions, 14 deletions

diff --git a/pjmedia/src/pjmedia-codec/openh264.cpp b/pjmedia/src/pjmedia-codec/openh264.cpp
index 0c0ff95c..8dc94d4c 100644
--- a/pjmedia/src/pjmedia-codec/openh264.cpp
+++ b/pjmedia/src/pjmedia-codec/openh264.cpp
@@ -647,7 +647,7 @@ static pj_status_t oh264_codec_encode_begin(pjmedia_vid_codec *codec,
 	return PJMEDIA_CODEC_EFAILED;
     }
 
-    if (oh264_data->bsi.eFrameType == videoFrameTypeSkip) {
+    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeSkip) {
 	output->size = 0;
 	output->type = PJMEDIA_FRAME_TYPE_NONE;
 	output->timestamp = input->timestamp;
@@ -667,13 +667,13 @@ static pj_status_t oh264_codec_encode_begin(pjmedia_vid_codec *codec,
 
 	/* 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;
 		}
 	    }
@@ -689,7 +689,7 @@ static pj_status_t oh264_codec_encode_begin(pjmedia_vid_codec *codec,
 	payload = pLayerBsInfo->pBsBuf;
 	payload_size = 0;
 	for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) {
-	    payload_size += pLayerBsInfo->pNalLengthInByte[inal];
+	    payload_size += pLayerBsInfo->iNalLengthInByte[inal];
 	}
 
 	if (payload_size > out_size)
@@ -746,7 +746,7 @@ static pj_status_t oh264_codec_encode_more(pjmedia_vid_codec *codec,
         pj_memcpy(output->buf, payload, payload_len);
         output->size = payload_len;
 
-        if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
+        if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
 	    output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
         }
 
@@ -768,7 +768,7 @@ static pj_status_t oh264_codec_encode_more(pjmedia_vid_codec *codec,
 
     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];
     }
 
     oh264_data->enc_frame_whole = pLayerBsInfo->pBsBuf;
@@ -795,7 +795,7 @@ static pj_status_t oh264_codec_encode_more(pjmedia_vid_codec *codec,
     pj_memcpy(output->buf, payload, payload_len);
     output->size = payload_len;
 
-    if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) {
+    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) {
 	output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME;
     }
 
diff --git a/pjmedia/src/test/test.h b/pjmedia/src/test/test.h
index f7fae812..229b462b 100644
--- a/pjmedia/src/test/test.h
+++ b/pjmedia/src/test/test.h
@@ -23,13 +23,13 @@
 #include <pjmedia.h>
 #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);
 int rtp_test(void);