Changeset 4873


Ignore:
Timestamp:
Jul 11, 2014 4:20:08 AM (5 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:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

    r4867 r4873  
    648648    } 
    649649 
    650     if (oh264_data->bsi.eFrameType == videoFrameTypeSkip) { 
     650    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeSkip) { 
    651651        output->size = 0; 
    652652        output->type = PJMEDIA_FRAME_TYPE_NONE; 
     
    668668        /* Find which layer with biggest payload */ 
    669669        oh264_data->ilayer = 0; 
    670         payload_size = oh264_data->bsi.sLayerInfo[0].pNalLengthInByte[0]; 
     670        payload_size = oh264_data->bsi.sLayerInfo[0].iNalLengthInByte[0]; 
    671671        for (i=0; i < (unsigned)oh264_data->bsi.iLayerNum; ++i) { 
    672672            unsigned j; 
    673673            pLayerBsInfo = &oh264_data->bsi.sLayerInfo[i]; 
    674674            for (j=0; j < (unsigned)pLayerBsInfo->iNalCount; ++j) { 
    675                 if (pLayerBsInfo->pNalLengthInByte[j] > (int)payload_size) { 
    676                     payload_size = pLayerBsInfo->pNalLengthInByte[j]; 
     675                if (pLayerBsInfo->iNalLengthInByte[j] > (int)payload_size) { 
     676                    payload_size = pLayerBsInfo->iNalLengthInByte[j]; 
    677677                    oh264_data->ilayer = i; 
    678678                } 
     
    690690        payload_size = 0; 
    691691        for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) { 
    692             payload_size += pLayerBsInfo->pNalLengthInByte[inal]; 
     692            payload_size += pLayerBsInfo->iNalLengthInByte[inal]; 
    693693        } 
    694694 
     
    747747        output->size = payload_len; 
    748748 
    749         if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) { 
     749        if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) { 
    750750            output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME; 
    751751        } 
     
    769769    oh264_data->enc_frame_size = 0; 
    770770    for (int inal = pLayerBsInfo->iNalCount - 1; inal >= 0; --inal) { 
    771         oh264_data->enc_frame_size += pLayerBsInfo->pNalLengthInByte[inal]; 
     771        oh264_data->enc_frame_size += pLayerBsInfo->iNalLengthInByte[inal]; 
    772772    } 
    773773 
     
    796796    output->size = payload_len; 
    797797 
    798     if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) { 
     798    if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) { 
    799799        output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME; 
    800800    } 
  • pjproject/trunk/pjmedia/src/test/test.h

    r3667 r4873  
    2424#include <pjlib.h> 
    2525 
    26 #define HAS_VID_DEV_TEST        PJMEDIA_HAS_VIDEO 
    27 #define HAS_VID_PORT_TEST       PJMEDIA_HAS_VIDEO 
     26#define HAS_VID_DEV_TEST        0       // PJMEDIA_HAS_VIDEO 
     27#define HAS_VID_PORT_TEST       0       // PJMEDIA_HAS_VIDEO 
    2828#define HAS_VID_CODEC_TEST      PJMEDIA_HAS_VIDEO 
    29 #define HAS_SDP_NEG_TEST        1 
    30 #define HAS_JBUF_TEST           1 
    31 #define HAS_MIPS_TEST           1 
    32 #define HAS_CODEC_VECTOR_TEST   1 
     29#define HAS_SDP_NEG_TEST        0 
     30#define HAS_JBUF_TEST           0 
     31#define HAS_MIPS_TEST           0 
     32#define HAS_CODEC_VECTOR_TEST   0 
    3333 
    3434int session_test(void); 
Note: See TracChangeset for help on using the changeset viewer.