shithub: openh264

Info  •  Files  •  Log  •  Branches

remove frametype,add frameIdc paramter

--- a/codec/api/svc/codec_app_def.h

+++ b/codec/api/svc/codec_app_def.h

@@ -32,9 +32,8 @@

 #ifndef WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__

 #define WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__

-

 ////////////////Data and /or structures introduced in Cisco OpenH264 application////////////////

-

+#include "codec_def.h"

 /* Constants */

 #define MAX_TEMPORAL_LAYER_NUM		4

 #define MAX_SPATIAL_LAYER_NUM		4

@@ -243,6 +242,19 @@

   WELS_LOG_DEFAULT	= WELS_LOG_DEBUG	// Default log iLevel in Wels codec

 };

+typedef enum{

+  FRAMEIDC_IDR              = 0x00,

+  FRAMEIDC_I                = 0x04,

+  FRAMEIDC_LTR              = 0x08,

+  FRAMEIDC_T0               = 0x10,

+  FRAMEIDC_T1               = 0x11,

+  FRAMEIDC_T2               = 0x12,

+  FRAMEIDC_T3               = 0x13,

+  FRAMEIDC_T4               = 0x14,

+  FRAMEIDC_UNKNOWN          = 0x20,

+  FRAMEIDC_INVALID          = 0xFF,

+}EFrameIDC;

+

 typedef struct {

   SliceModeEnum uiSliceMode; //by default, uiSliceMode will be SM_SINGLE_SLICE

   SSliceArgument sSliceArgument;

@@ -371,12 +383,12 @@

 typedef struct {

   int		iTemporalId;	// Temporal ID

-  unsigned char	uiFrameType;

+  EFrameIDC	eFrameIdc;

   int		iLayerNum;

   SLayerBSInfo	sLayerInfo[MAX_LAYER_NUM_OF_FRAME];

-  int eOutputFrameType;

+  EVideoFrameType eOutputFrameType;

   long long uiTimeStamp;

 } SFrameBSInfo, *PFrameBSInfo;