Changeset 4867


Ignore:
Timestamp:
Jul 2, 2014 5:55:45 PM (5 years ago)
Author:
bennylp
Message:

Re #1758: updated with the latest OpenH264 to fix compilation error with bsi->eOutuptFrameType and missing int32_t type on Windows

File:
1 edited

Legend:

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

    r4864 r4867  
    563563    } 
    564564 
    565     int32_t color_fmt = videoFormatI420; 
     565    pj_int32_t color_fmt = videoFormatI420; 
    566566    rc = oh264_data->dec->SetOption (DECODER_OPTION_DATAFORMAT,  &color_fmt); 
    567567    if (rc) { 
     
    648648    } 
    649649 
    650     if (oh264_data->bsi.eOutputFrameType == videoFrameTypeSkip) { 
     650    if (oh264_data->bsi.eFrameType == videoFrameTypeSkip) { 
    651651        output->size = 0; 
    652652        output->type = PJMEDIA_FRAME_TYPE_NONE; 
     
    747747        output->size = payload_len; 
    748748 
    749         if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) { 
     749        if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) { 
    750750            output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME; 
    751751        } 
     
    796796    output->size = payload_len; 
    797797 
    798     if (oh264_data->bsi.eOutputFrameType == videoFrameTypeIDR) { 
     798    if (oh264_data->bsi.eFrameType == videoFrameTypeIDR) { 
    799799        output->bit_info |= PJMEDIA_VID_FRM_KEYFRAME; 
    800800    } 
     
    10451045 
    10461046    /* Signal that we have no more frames */ 
    1047     int32_t iEndOfStreamFlag; 
    1048     iEndOfStreamFlag = true; 
     1047    pj_int32_t iEndOfStreamFlag = true; 
    10491048    oh264_data->dec->SetOption( DECODER_OPTION_END_OF_STREAM, 
    10501049                                (void*)&iEndOfStreamFlag); 
Note: See TracChangeset for help on using the changeset viewer.