amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-29 22:55:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/zqsong/ZLMediaKit into zqsong

Browse Source
This commit is contained in:
xiongziliang 2019-08-02 13:40:15 +08:00
commit dd80d6a6bb
4 changed files with 747 additions and 624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Extension/H265.cpp
View File

@ -32,24 +32,40 @@ namespace mediakit{
bool getAVCH265Info(const string& strSps,int &iVideoWidth, int &iVideoHeight, float &iVideoFps) { bool getAVCH265Info(const string& strVps, const string& strSps,int &iVideoWidth, int &iVideoHeight, float &iVideoFps) {
return getAVC265Info(strSps.data(),strSps.size(),iVideoWidth,iVideoHeight,iVideoFps); return getAVC265Info(strVps.data(),strVps.size(),strSps.data(),strSps.size(),iVideoWidth,iVideoHeight,iVideoFps);
} }
bool getAVC265Info(const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight, float &iVideoFps){ bool getAVC265Info(const char * vps, int vps_len,const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight, float &iVideoFps){
T_GetBitContext tGetBitBuf; T_GetBitContext tGetBitBuf;
T_HEVCSPS tH265SpsInfo; T_HEVCSPS tH265SpsInfo;
memset(&tGetBitBuf,0,sizeof(tGetBitBuf)); T_HEVCVPS tH265VpsInfo;
memset(&tH265SpsInfo,0,sizeof(tH265SpsInfo)); if ( vps_len > 2 ){
tGetBitBuf.pu8Buf = (uint8_t*)sps ; memset(&tGetBitBuf,0,sizeof(tGetBitBuf));
tGetBitBuf.iBufSize = sps_len ; memset(&tH265VpsInfo,0,sizeof(tH265VpsInfo));
if(0 != h265DecSeqParameterSet((void *) &tGetBitBuf, &tH265SpsInfo)){ tGetBitBuf.pu8Buf = (uint8_t*)vps+2;
return false; tGetBitBuf.iBufSize = vps_len-2;
} if(0 != h265DecVideoParameterSet((void *) &tGetBitBuf, &tH265VpsInfo)){
return false;
}
}
if ( sps_len > 2 ){
memset(&tGetBitBuf,0,sizeof(tGetBitBuf));
memset(&tH265SpsInfo,0,sizeof(tH265SpsInfo));
tGetBitBuf.pu8Buf = (uint8_t*)sps+2;
tGetBitBuf.iBufSize = sps_len-2;
if(0 != h265DecSeqParameterSet((void *) &tGetBitBuf, &tH265SpsInfo)){
return false;
}
}
else
return false;
h265GetWidthHeight(&tH265SpsInfo, &iVideoWidth, &iVideoHeight); h265GetWidthHeight(&tH265SpsInfo, &iVideoWidth, &iVideoHeight);
h265GeFramerate(&tH265SpsInfo, &iVideoFps); iVideoFps = 0;
//ErrorL << iVideoWidth << " " << iVideoHeight << " " << iVideoFps; h265GeFramerate(&tH265VpsInfo, &tH265SpsInfo, &iVideoFps);
// ErrorL << iVideoWidth << " " << iVideoHeight << " " << iVideoFps;
return true; return true;
} }

6
src/Extension/H265.h
View File

@ -36,8 +36,8 @@ using namespace toolkit;
namespace mediakit { namespace mediakit {
bool getAVCH265Info(const string& strSps,int &iVideoWidth, int &iVideoHeight, float &iVideoFps); bool getAVCH265Info(const string& strVps,const string& strSps,int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
bool getAVC265Info(const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight, float &iVideoFps); bool getAVC265Info(const char * vps, int vps_len,const char * sps,int sps_len,int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
/** /**
* 265帧类 * 265帧类
@ -336,7 +336,7 @@ private:
* 解析sps获取宽高fps * 解析sps获取宽高fps
*/ */
void onReady(){ void onReady(){
getAVCH265Info(_sps,_width,_height,_fps); getAVCH265Info(_vps,_sps,_width,_height,_fps);
} }
Track::Ptr clone() override { Track::Ptr clone() override {
return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this); return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this);

1047
src/Extension/SPSParser.c
View File

File diff suppressed because it is too large Load Diff

276
src/Extension/SPSParser.h
View File

@ -237,184 +237,204 @@ typedef struct T_PPS {
typedef struct T_HEVCWindow { typedef struct T_HEVCWindow {
unsigned int left_offset; unsigned int uiLeftOffset;
unsigned int right_offset; unsigned int uiRightOffset;
unsigned int top_offset; unsigned int uiTopOffset;
unsigned int bottom_offset; unsigned int uiBottomOffset;
} T_HEVCWindow; } T_HEVCWindow;
typedef struct T_VUI { typedef struct T_VUI {
T_AVRational sar; T_AVRational tSar;
int overscan_info_present_flag; int iOverscanInfoPresentFlag;
int overscan_appropriate_flag; int iOverscanAppropriateFlag;
int video_signal_type_present_flag; int iVideoSignalTypePresentFlag;
int video_format; int iVideoFormat;
int video_full_range_flag; int iVideoFullRangeFlag;
int colour_description_present_flag; int iColourDescriptionPresentFlag;
uint8_t colour_primaries; uint8_t u8ColourPrimaries;
uint8_t transfer_characteristic; uint8_t u8TransferCharacteristic;
uint8_t matrix_coeffs; uint8_t u8MatrixCoeffs;
int chroma_loc_info_present_flag; int iChromaLocInfoPresentFlag;
int chroma_sample_loc_type_top_field; int iChromaSampleLocTypeTopField;
int chroma_sample_loc_type_bottom_field; int iChromaSampleLocTypeBottomField;
int neutra_chroma_indication_flag; int iNeutraChromaIndicationFlag;
int field_seq_flag; int iFieldSeqFlag;
int frame_field_info_present_flag; int iFrameFieldInfoPresentFlag;
int default_display_window_flag; int iDefaultDisplayWindowFlag;
T_HEVCWindow def_disp_win; T_HEVCWindow tDefDispWin;
int vui_timing_info_present_flag; int iVuiTimingInfoPresentFlag;
uint32_t vui_num_units_in_tick; uint32_t u32VuiNumUnitsInTick;
uint32_t vui_time_scale; uint32_t u32VuiTimeScale;
int vui_poc_proportional_to_timing_flag; int iVuiPocProportionalToTimingFlag;
int vui_num_ticks_poc_diff_one_minus1; int iVuiNumTicksPocDiffOneMinus1;
int vui_hrd_parameters_present_flag; int iVuiHrdParametersPresentFlag;
int bitstream_restriction_flag; int iBitstreamRestrictionFlag;
int tiles_fixed_structure_flag; int iTilesFixedStructureFlag;
int motion_vectors_over_pic_boundaries_flag; int iMotionVectorsOverPicBoundariesFlag;
int restricted_ref_pic_lists_flag; int iRestrictedRefPicListsFlag;
int min_spatial_segmentation_idc; int iMinSpatialSegmentationIdc;
int max_bytes_per_pic_denom; int iMaxBytesPerPicDenom;
int max_bits_per_min_cu_denom; int iMaxBitsPerMinCuDenom;
int log2_max_mv_length_horizontal; int iLog2MaxMvLengthHorizontal;
int log2_max_mv_length_vertical; int iLog2MaxMvLengthVertical;
} T_VUI; } T_VUI;
typedef struct T_PTLCommon { typedef struct T_PTLCommon {
uint8_t profile_space; uint8_t u8ProfileSpace;
uint8_t tier_flag; uint8_t u8TierFlag;
uint8_t profile_idc; uint8_t u8ProfileIdc;
uint8_t profile_compatibility_flag[32]; uint8_t au8ProfileCompatibilityFlag[32];
uint8_t level_idc; uint8_t u8LevelIdc;
uint8_t progressive_source_flag; uint8_t u8ProgressiveSourceFlag;
uint8_t interlaced_source_flag; uint8_t u8InterlacedSourceFlag;
uint8_t non_packed_constraint_flag; uint8_t u8NonPackedConstraintFlag;
uint8_t frame_only_constraint_flag; uint8_t u8FrameOnlyConstraintFlag;
} T_PTLCommon; } T_PTLCommon;
typedef struct T_PTL { typedef struct T_PTL {
T_PTLCommon general_ptl; T_PTLCommon tGeneralPtl;
T_PTLCommon sub_layer_ptl[HEVC_MAX_SUB_LAYERS]; T_PTLCommon atSubLayerPtl[HEVC_MAX_SUB_LAYERS];
uint8_t sub_layer_profile_present_flag[HEVC_MAX_SUB_LAYERS]; uint8_t au8SubLayerProfilePresentFlag[HEVC_MAX_SUB_LAYERS];
uint8_t sub_layer_level_present_flag[HEVC_MAX_SUB_LAYERS]; uint8_t au8SubLayerLevelPresentFlag[HEVC_MAX_SUB_LAYERS];
} T_PTL; } T_PTL;
typedef struct T_ScalingList { typedef struct T_ScalingList {
/* This is a little wasteful, since sizeID 0 only needs 8 coeffs, /* This is a little wasteful, since sizeID 0 only needs 8 coeffs,
* and size ID 3 only has 2 arrays, not 6. */ * and size ID 3 only has 2 arrays, not 6. */
uint8_t sl[4][6][64]; uint8_t aaau8Sl[4][6][64];
uint8_t sl_dc[2][6]; uint8_t aau8SlDc[2][6];
} T_ScalingList; } T_ScalingList;
typedef struct T_ShortTermRPS { typedef struct T_ShortTermRPS {
unsigned int num_negative_pics; unsigned int uiNumNegativePics;
int num_delta_pocs; int iNumDeltaPocs;
int rps_idx_num_delta_pocs; int iRpsIdxNumDeltaPocs;
int32_t delta_poc[32]; int32_t au32DeltaPoc[32];
uint8_t used[32]; uint8_t au8Used[32];
} T_ShortTermRPS; } T_ShortTermRPS;
typedef struct T_HEVCVPS {
uint8_t u8VpsTemporalIdNestingFlag;
int iVpsMaxLayers;
int iVpsMaxSubLayers; ///< vps_max_temporal_layers_minus1 + 1
T_PTL tPtl;
int iVpsSubLayerOrderingInfoPresentFlag;
unsigned int uiVpsMaxDecPicBuffering[HEVC_MAX_SUB_LAYERS];
unsigned int auiVpsNumReorderPics[HEVC_MAX_SUB_LAYERS];
unsigned int auiVpsMaxLatencyIncrease[HEVC_MAX_SUB_LAYERS];
int iVpsMaxLayerId;
int iVpsNumLayerSets; ///< vps_num_layer_sets_minus1 + 1
uint8_t u8VpsTimingInfoPresentFlag;
uint32_t u32VpsNumUnitsInTick;
uint32_t u32VpsTimeScale;
uint8_t u8VpsPocProportionalToTimingFlag;
int iVpsNumTicksPocDiffOne; ///< vps_num_ticks_poc_diff_one_minus1 + 1
int iVpsNumHrdParameters;
} T_HEVCVPS;
typedef struct T_HEVCSPS { typedef struct T_HEVCSPS {
unsigned vps_id; unsigned int uiVpsId;
int chroma_format_idc; int iChromaFormatIdc;
uint8_t separate_colour_plane_flag; uint8_t u8SeparateColourPlaneFlag;
///< output (i.e. cropped) values ///< output (i.e. cropped) values
int output_width, output_height; int iIutputWidth, iOutputHeight;
T_HEVCWindow output_window; T_HEVCWindow tOutputWindow;
T_HEVCWindow pic_conf_win; T_HEVCWindow tPicConfWin;
int bit_depth; int iBitDepth;
int bit_depth_chroma; int iBitDepthChroma;
int pixel_shift; int iPixelShift;
// enum AVPixelFormat pix_fmt;
unsigned int log2_max_poc_lsb; unsigned int uiLog2MaxPocLsb;
int pcm_enabled_flag; int iPcmEnabledFlag;
int max_sub_layers; int iMaxSubLayers;
struct { struct {
int max_dec_pic_buffering; int iMaxDecPicBuffering;
int num_reorder_pics; int iNumReorderPics;
int max_latency_increase; int iMaxLatencyIncrease;
} temporal_layer[HEVC_MAX_SUB_LAYERS]; } stTemporalLayer[HEVC_MAX_SUB_LAYERS];
uint8_t temporal_id_nesting_flag; uint8_t u8temporalIdNestingFlag;
T_VUI vui; T_VUI tVui;
T_PTL ptl; T_PTL tPtl;
uint8_t scaling_list_enable_flag; uint8_t u8ScalingListEnableFlag;
T_ScalingList scaling_list; T_ScalingList tScalingList;
unsigned int nb_st_rps; unsigned int uiNbStRps;
T_ShortTermRPS st_rps[HEVC_MAX_SHORT_TERM_RPS_COUNT]; T_ShortTermRPS atStRps[HEVC_MAX_SHORT_TERM_RPS_COUNT];
uint8_t amp_enabled_flag; uint8_t u8AmpEnabledFlag;
uint8_t sao_enabled; uint8_t u8SaoEnabled;
uint8_t long_term_ref_pics_present_flag; uint8_t u8LongTermRefPicsPresentFlag;
uint16_t lt_ref_pic_poc_lsb_sps[32]; uint16_t au16LtRefPicPocLsbSps[32];
uint8_t used_by_curr_pic_lt_sps_flag[32]; uint8_t au8UsedByCurrPicLtSpsFlag[32];
uint8_t num_long_term_ref_pics_sps; uint8_t u8NumLongTermRefPicsSps;
struct { struct {
uint8_t bit_depth; uint8_t u8BitDepth;
uint8_t bit_depth_chroma; uint8_t u8BitDepthChroma;
unsigned int log2_min_pcm_cb_size; unsigned int uiLog2MinPcmCbSize;
unsigned int log2_max_pcm_cb_size; unsigned int uiLog2MaxPcmCbSize;
uint8_t loop_filter_disable_flag; uint8_t u8LoopFilterDisableFlag;
} pcm; } pcm;
uint8_t sps_temporal_mvp_enabled_flag; uint8_t u8SpsTemporalMvpEnabledFlag;
uint8_t sps_strong_intra_smoothing_enable_flag; uint8_t u8SpsStrongIntraMmoothingEnableFlag;
unsigned int log2_min_cb_size; unsigned int uiLog2MinCbSize;
unsigned int log2_diff_max_min_coding_block_size; unsigned int uiLog2DiffMaxMinCodingBlockSize;
unsigned int log2_min_tb_size; unsigned int uiLog2MinTbSize;
unsigned int log2_max_trafo_size; unsigned int uiLog2MaxTrafoSize;
unsigned int log2_ctb_size; unsigned int uiLog2CtbSize;
unsigned int log2_min_pu_size; unsigned int uiLog2MinPuSize;
int max_transform_hierarchy_depth_inter; int iMaxTransformHierarchyDepthInter;
int max_transform_hierarchy_depth_intra; int iMaxTransformHierarchyDepthIntra;
int transform_skip_rotation_enabled_flag; int iTransformSkipRotationEnabledFlag;
int transform_skip_context_enabled_flag; int iTransformSkipContextEnabledFlag;
int implicit_rdpcm_enabled_flag; int iImplicitRdpcmEnabledFlag;
int explicit_rdpcm_enabled_flag; int iExplicitRdpcmEnabledFlag;
int intra_smoothing_disabled_flag; int iIntraSmoothingDisabledFlag;
int persistent_rice_adaptation_enabled_flag; int iHighPrecisionOffsetsEnabledFlag;
int iPersistentRiceAdaptationEnabledFlag;
///< coded frame dimension in various units ///< coded frame dimension in various units
int width; int iWidth;
int height; int iHeight;
int ctb_width; int iCtbWidth;
int ctb_height; int iCtbHeight;
int ctb_size; int iCtbSize;
int min_cb_width; int iMinCbWidth;
int min_cb_height; int iMinCbHeight;
int min_tb_width; int iMinTbWidth;
int min_tb_height; int iMinTbHeight;
int min_pu_width; int iMinPuWidth;
int min_pu_height; int iMinPuHeight;
int tb_mask; int iTbMask;
int hshift[3]; int aiHshift[3];
int vshift[3]; int aiVshift[3];
int qp_bd_offset; int iQpBdOffset;
uint8_t data[4096]; int iVuiPresent;
int data_size;
}T_HEVCSPS; }T_HEVCSPS;
@ -428,13 +448,15 @@ typedef struct T_GetBitContext{
int h264DecSeqParameterSet(void *pvBuf, T_SPS *ptSps); int h264DecSeqParameterSet(void *pvBuf, T_SPS *ptSps);
int h265DecSeqParameterSet( void *pvBufSrc, T_HEVCSPS *p_sps ); int h265DecSeqParameterSet( void *pvBufSrc, T_HEVCSPS *ptSps );
int h265DecVideoParameterSet( void *pvBufSrc, T_HEVCVPS *ptVps );
void h264GetWidthHeight(T_SPS *ptSps, int *piWidth, int *piHeight); void h264GetWidthHeight(T_SPS *ptSps, int *piWidth, int *piHeight);
void h265GetWidthHeight(T_HEVCSPS *ptSps, int *piWidth, int *piHeight); void h265GetWidthHeight(T_HEVCSPS *ptSps, int *piWidth, int *piHeight);
void h264GeFramerate(T_SPS *ptSps, float *pfFramerate); void h264GeFramerate(T_SPS *ptSps, float *pfFramerate);
void h265GeFramerate(T_HEVCSPS *ptSps, float *pfFramerate); void h265GeFramerate(T_HEVCVPS *ptVps, T_HEVCSPS *ptSps,float *pfFramerate);
#if defined (__cplusplus) #if defined (__cplusplus)
} }