Ticket #5980: MythTV-H264Parser.h.patch
File MythTV-H264Parser.h.patch, 2.9 KB (added by , 15 years ago) |
---|
-
libs/libmythtv/mpeg/H264Parser.h
105 105 bool onFrameStart(void) const { return on_frame; } 106 106 bool onKeyFrameStart(void) const { return on_key_frame; } 107 107 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; } 110 110 111 111 /** \brief Computes aspect ratio from picture size and sample aspect ratio 112 112 */ 113 uint aspectRatio(void) const;113 int aspectRatio(void) const; 114 114 115 115 uint64_t frameAUstreamOffset(void) const {return frame_start_offset;} 116 116 uint64_t keyframeAUstreamOffset(void) const {return keyframe_start_offset;} 117 117 118 static int isKeySlice( uint slice_type)118 static int isKeySlice(int slice_type) 119 119 { 120 120 return (slice_type == SLICE_I || 121 121 slice_type == SLICE_SI || … … 152 152 uint8_t NAL_type; 153 153 154 154 int prev_frame_num, frame_num; 155 uintslice_type;155 int slice_type; 156 156 int prev_pic_parameter_set_id, pic_parameter_set_id; 157 157 int8_t prev_field_pic_flag, field_pic_flag; 158 158 int8_t prev_bottom_field_flag, bottom_field_flag; … … 162 162 int prev_delta_pic_order_cnt_bottom, delta_pic_order_cnt_bottom; 163 163 int prev_delta_pic_order_cnt[2], delta_pic_order_cnt[2]; 164 164 uint8_t prev_nal_unit_type, nal_unit_type; 165 uintprev_idr_pic_id, idr_pic_id;165 int prev_idr_pic_id, idr_pic_id; 166 166 167 uintlog2_max_frame_num, log2_max_pic_order_cnt_lsb;168 uintseq_parameter_set_id;167 int log2_max_frame_num, log2_max_pic_order_cnt_lsb; 168 int seq_parameter_set_id; 169 169 170 170 uint8_t delta_pic_order_always_zero_flag; 171 171 uint8_t separate_colour_plane_flag; … … 173 173 int8_t pic_order_present_flag; 174 174 int8_t redundant_pic_cnt_present_flag; 175 175 176 uintnum_ref_frames;177 uintredundant_pic_cnt;176 int num_ref_frames; 177 int redundant_pic_cnt; 178 178 // uint pic_width_in_mbs, pic_height_in_map_units; 179 uintpic_width, pic_height;180 uintframe_crop_left_offset;181 uintframe_crop_right_offset;182 uintframe_crop_top_offset;183 uintframe_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; 184 184 uint8_t aspect_ratio_idc; 185 uintsar_width, sar_height;185 int sar_width, sar_height; 186 186 187 187 uint64_t AU_offset, frame_start_offset, keyframe_start_offset; 188 188 bool on_frame, on_key_frame;