modify the interface for delivery info and add some comments

ruil2 committed 12 years ago

Commit b3dedb31 parent f49fa812 files · +9 −4Browse files

Unified · Split

2 files

codec/api/svc/codec_app_def.h +6 −1
codec/encoder/plus/src/welsEncoderExt.cpp +3 −3

codec/api/svc/codec_app_def.h+6−1

@@ -85,7 +85,7 @@ typedef enum { · 84 unmodified lines
85	85	ENCODER_OPTION_PROFILE,
86	86	ENCODER_OPTION_LEVEL,
87	87	ENCODER_OPTION_NUMBER_REF,
88		− ENCODER_OPTION_DROP_NUM,
	88	+ ENCODER_OPTION_DELIVERY_STATUS,
89	89
90	90	ENCODER_LTR_RECOVERY_REQUEST,
91	91	ENCODER_LTR_MARKING_FEEDBACK,
@@ -414,4 +414,9 @@ typedef struct TagLevelInfo { · 322 unmodified lines
414	414	ELevelIdc uiLevelIdc; //the level info
415	415	} SLevelInfo;
416	416
	417	+typedef struct TagDeliveryStatus{
	418	+ int iDropNum; //the number of video frames that are dropped continuously before delivery to encoder, which is used by screen content.
	419	+ int iDropFrameType; // the frame type that is dropped
	420	+ int iDropFrameSize; // the frame size that is dropped
	421	+}SDeliveryStatus;
417	422	#endif//WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__

codec/encoder/plus/src/welsEncoderExt.cpp+3−3

@@ -935,9 +935,9 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) { · 934 unmodified lines
935	935	CheckReferenceNumSetting (iValue);
936	936	}
937	937	break;
938		− case ENCODER_OPTION_DROP_NUM: {
939		− int32_t iValue = * ((int32_t*)pOption);
940		− m_pEncContext->iDropNumber = iValue;
	938	+ case ENCODER_OPTION_DELIVERY_STATUS: {
	939	+ SDeliveryStatus pValue = (static_cast<SDeliveryStatus>(pOption));
	940	+ m_pEncContext->iDropNumber = pValue->iDropNum;
941	941	}
942	942	break;
943	943	default: