Ticket #5980: MythTV-H264Parser.h.patch

File MythTV-H264Parser.h.patch, 2.9 KB (added by Jonathan Martens <jonathan@…>, 13 years ago)
  • libs/libmythtv/mpeg/H264Parser.h

     
    105105    bool onFrameStart(void) const { return on_frame; }
    106106    bool onKeyFrameStart(void) const { return on_key_frame; }
    107107
    108     uint pictureWidth(void) const { return pic_width; }
    109     uint pictureHeight(void) const { return pic_height; }
     108    int pictureWidth(void) const { return pic_width; }
     109    int pictureHeight(void) const { return pic_height; }
    110110
    111111    /** \brief Computes aspect ratio from picture size and sample aspect ratio
    112112     */
    113     uint aspectRatio(void) const;
     113    int aspectRatio(void) const;
    114114
    115115    uint64_t frameAUstreamOffset(void) const {return frame_start_offset;}
    116116    uint64_t keyframeAUstreamOffset(void) const {return keyframe_start_offset;}
    117117
    118     static int isKeySlice(uint slice_type)
     118    static int isKeySlice(int slice_type)
    119119        {
    120120            return (slice_type == SLICE_I   ||
    121121                    slice_type == SLICE_SI  ||
     
    152152    uint8_t    NAL_type;
    153153
    154154    int        prev_frame_num, frame_num;
    155     uint       slice_type;
     155    int        slice_type;
    156156    int        prev_pic_parameter_set_id, pic_parameter_set_id;
    157157    int8_t     prev_field_pic_flag, field_pic_flag;
    158158    int8_t     prev_bottom_field_flag, bottom_field_flag;
     
    162162    int        prev_delta_pic_order_cnt_bottom, delta_pic_order_cnt_bottom;
    163163    int        prev_delta_pic_order_cnt[2], delta_pic_order_cnt[2];
    164164    uint8_t    prev_nal_unit_type, nal_unit_type;
    165     uint       prev_idr_pic_id, idr_pic_id;
     165    int        prev_idr_pic_id, idr_pic_id;
    166166
    167     uint       log2_max_frame_num, log2_max_pic_order_cnt_lsb;
    168     uint       seq_parameter_set_id;
     167    int        log2_max_frame_num, log2_max_pic_order_cnt_lsb;
     168    int        seq_parameter_set_id;
    169169
    170170    uint8_t    delta_pic_order_always_zero_flag;
    171171    uint8_t    separate_colour_plane_flag;
     
    173173    int8_t     pic_order_present_flag;
    174174    int8_t     redundant_pic_cnt_present_flag;
    175175
    176     uint       num_ref_frames;
    177     uint       redundant_pic_cnt;
     176    int        num_ref_frames;
     177    int        redundant_pic_cnt;
    178178//    uint       pic_width_in_mbs, pic_height_in_map_units;
    179     uint       pic_width, pic_height;
    180     uint       frame_crop_left_offset;
    181     uint       frame_crop_right_offset;
    182     uint       frame_crop_top_offset;
    183     uint       frame_crop_bottom_offset;
     179    int        pic_width, pic_height;
     180    int        frame_crop_left_offset;
     181    int        frame_crop_right_offset;
     182    int        frame_crop_top_offset;
     183    int        frame_crop_bottom_offset;
    184184    uint8_t    aspect_ratio_idc;
    185     uint       sar_width, sar_height;
     185    int        sar_width, sar_height;
    186186
    187187    uint64_t   AU_offset, frame_start_offset, keyframe_start_offset;
    188188    bool       on_frame, on_key_frame;