正在显示
1 个修改的文件
包含
16 行增加
和
9 行删除
@@ -134,6 +134,9 @@ public: | @@ -134,6 +134,9 @@ public: | ||
134 | int nb_sample_units; | 134 | int nb_sample_units; |
135 | SrsCodecSampleUnit sample_units[SRS_MAX_CODEC_SAMPLE]; | 135 | SrsCodecSampleUnit sample_units[SRS_MAX_CODEC_SAMPLE]; |
136 | public: | 136 | public: |
137 | + /** | ||
138 | + * whether the sample is video sample which demux from video packet. | ||
139 | + */ | ||
137 | bool is_video; | 140 | bool is_video; |
138 | /** | 141 | /** |
139 | * CompositionTime, video_file_format_spec_v10_1.pdf, page 78. | 142 | * CompositionTime, video_file_format_spec_v10_1.pdf, page 78. |
@@ -191,19 +194,26 @@ private: | @@ -191,19 +194,26 @@ private: | ||
191 | SrsStream* stream; | 194 | SrsStream* stream; |
192 | public: | 195 | public: |
193 | /** | 196 | /** |
194 | - * video specified | 197 | + * metadata specified |
195 | */ | 198 | */ |
199 | + int duration; | ||
200 | + int width; | ||
201 | + int height; | ||
202 | + int frame_rate; | ||
196 | // @see: SrsCodecVideo | 203 | // @see: SrsCodecVideo |
197 | int video_codec_id; | 204 | int video_codec_id; |
205 | + int video_data_rate; // in bps | ||
206 | + // @see: SrsCod ecAudioType | ||
207 | + int audio_codec_id; | ||
208 | + int audio_data_rate; // in bps | ||
209 | +public: | ||
210 | + /** | ||
211 | + * video specified | ||
212 | + */ | ||
198 | // profile_idc, H.264-AVC-ISO_IEC_14496-10.pdf, page 45. | 213 | // profile_idc, H.264-AVC-ISO_IEC_14496-10.pdf, page 45. |
199 | u_int8_t avc_profile; | 214 | u_int8_t avc_profile; |
200 | // level_idc, H.264-AVC-ISO_IEC_14496-10.pdf, page 45. | 215 | // level_idc, H.264-AVC-ISO_IEC_14496-10.pdf, page 45. |
201 | u_int8_t avc_level; | 216 | u_int8_t avc_level; |
202 | - int width; | ||
203 | - int height; | ||
204 | - int video_data_rate; // in bps | ||
205 | - int frame_rate; | ||
206 | - int duration; | ||
207 | // lengthSizeMinusOne, H.264-AVC-ISO_IEC_14496-15.pdf, page 16 | 217 | // lengthSizeMinusOne, H.264-AVC-ISO_IEC_14496-15.pdf, page 16 |
208 | int8_t NAL_unit_length; | 218 | int8_t NAL_unit_length; |
209 | u_int16_t sequenceParameterSetLength; | 219 | u_int16_t sequenceParameterSetLength; |
@@ -214,9 +224,6 @@ public: | @@ -214,9 +224,6 @@ public: | ||
214 | /** | 224 | /** |
215 | * audio specified | 225 | * audio specified |
216 | */ | 226 | */ |
217 | - // @see: SrsCodecAudioType | ||
218 | - int audio_codec_id; | ||
219 | - int audio_data_rate; // in bps | ||
220 | // 1.6.2.1 AudioSpecificConfig, in aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 33. | 227 | // 1.6.2.1 AudioSpecificConfig, in aac-mp4a-format-ISO_IEC_14496-3+2001.pdf, page 33. |
221 | // audioObjectType, value defines in 7.1 Profiles, aac-iso-13818-7.pdf, page 40. | 228 | // audioObjectType, value defines in 7.1 Profiles, aac-iso-13818-7.pdf, page 40. |
222 | u_int8_t aac_profile; | 229 | u_int8_t aac_profile; |
-
请 注册 或 登录 后发表评论