diff --git a/Buildit b/Buildit index 95a8f50..c72e0f5 100755 --- a/Buildit +++ b/Buildit @@ -32,8 +32,6 @@ build() make -f nbproject/Makefile-arm.mk QMAKE= SUBPROJECTS= .build-conf elif [ "$1" = "x64" ] ; then make -f nbproject/Makefile-x64.mk QMAKE= SUBPROJECTS= .build-conf - elif [ "$1" = "debug" ] ; then - make -f nbproject/Makefile-Debug.mk QMAKE= SUBPROJECTS= .build-conf elif [ "$1" = "i386" ] ; then make -f nbproject/Makefile-i386.mk QMAKE= SUBPROJECTS= .build-conf else diff --git a/EasyPusher_File/main.c b/EasyPusher_File/main.c index 4e23512..774ed27 100644 --- a/EasyPusher_File/main.c +++ b/EasyPusher_File/main.c @@ -8,22 +8,25 @@ #include "trace.h" #include +/* +*±¾KeyΪ3¸öÔÂÁÙʱÊÚȨLicense£¬ÈçÐèÉÌҵʹÓã¬ÇëÓʼþÖÁsupport@easydarwin.org×ÉѯÉÌÒµÊÚȨ·½°¸¡£ +*/ #ifdef _WIN32 #include "getopt.h" -#define KEY "6A34714D6C3469576B5A754158357059703257674A65784659584E355548567A6147567958305A4A544555755A58686C567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" +#define KEY "6A36334A743469576B5A73416343645A707469507065746C6432466B5A6D466D646D526E5A6D526E636E4E6B5A6D526E63694E58444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" #elif defined _ARM -#define KEY "6A36334A742F2B2B72624B41594C6459703069664A667868636D3158444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#define KEY "6A36334A742F2B2B726249416343645A7074695070653168636D317764584E6F5A584A6D5957527A5A6D566D65474F45567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" #include "unistd.h" #include #else //x86 linux #include "unistd.h" #include -#define KEY "6A34714D6C3469576B5A754158357059703257674A66426C59584E356348567A6147567958325A7062475658444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#define KEY "6A36334A74354F576B596F416343645A7074695070664E325A47646E656E5A6C5A336836646D4F2B567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" #endif -char* ConfigIP = "127.0.0.1"; //Default EasyDarwin Address 183.220.236.189 +char* ConfigIP = "www.easydarwin.org"; //Default EasyDarwin Address 183.220.236.189 char* ConfigPort= "554"; //Default EasyDarwin Port121.40.50.44 -char* ConfigName= "easypusher_file.sdp"; //Default RTSP Push StreamName +char* ConfigName= "easypusher_file_linux.sdp"; //Default RTSP Push StreamName char* ProgName; //Program Name int __EasyPusher_Callback(int _id, EASY_PUSH_STATE_T _state, EASY_AV_Frame *_frame, void *_userptr) @@ -100,7 +103,7 @@ int main(int argc, char * argv[]) mediainfo.u32VideoCodec = EASY_SDK_VIDEO_CODEC_H264; mediainfo.u32VideoFps = 25; - fES = fopen("./EasyPusher.264", "rb"); + fES = fopen("./EasyDarwin.264", "rb"); if (NULL == fES) return 0; isActivated = EasyPusher_Activate(KEY); diff --git a/EasyPusher_File/nbproject/Makefile-i386.mk b/EasyPusher_File/nbproject/Makefile-i386.mk index 7a64073..3d1063f 100644 --- a/EasyPusher_File/nbproject/Makefile-i386.mk +++ b/EasyPusher_File/nbproject/Makefile-i386.mk @@ -52,7 +52,7 @@ FFLAGS= ASFLAGS= # Link Libraries and Options -LDLIBSOPTIONS=-L../Lib +LDLIBSOPTIONS=-L../Lib/i386 # Build Targets .build-conf: ${BUILD_SUBPROJECTS} @@ -62,7 +62,7 @@ LDLIBSOPTIONS=-L../Lib ${MKDIR} -p ../${CND_CONF} ${LINK.c} -o ../${CND_CONF}/easypusher_file ${OBJECTFILES} ${LDLIBSOPTIONS} -leasypusher -lpthread -${OBJECTDIR}/main.o: main.c +${OBJECTDIR}/main.o: main.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.c) -O2 -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.c diff --git a/EasyPusher_File/nbproject/Makefile-x64.mk b/EasyPusher_File/nbproject/Makefile-x64.mk index 8a7fe76..38850e9 100644 --- a/EasyPusher_File/nbproject/Makefile-x64.mk +++ b/EasyPusher_File/nbproject/Makefile-x64.mk @@ -62,7 +62,7 @@ LDLIBSOPTIONS=-L../Lib/x64 ${MKDIR} -p ../${CND_CONF} ${LINK.c} -o ../${CND_CONF}/easypusher_file ${OBJECTFILES} ${LDLIBSOPTIONS} -leasypusher -lpthread -${OBJECTDIR}/main.o: main.c +${OBJECTDIR}/main.o: main.c ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.c) -O2 -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.c diff --git a/EasyPusher_RTSP/libEasyRTSPClient/Lib/i386/libeasyrtspclient.a b/EasyPusher_RTSP/libEasyRTSPClient/Lib/i386/libeasyrtspclient.a index cac9767..33177f6 100644 Binary files a/EasyPusher_RTSP/libEasyRTSPClient/Lib/i386/libeasyrtspclient.a and b/EasyPusher_RTSP/libEasyRTSPClient/Lib/i386/libeasyrtspclient.a differ diff --git a/EasyPusher_RTSP/libEasyRTSPClient/Lib/x64/libeasyrtspclient.a b/EasyPusher_RTSP/libEasyRTSPClient/Lib/x64/libeasyrtspclient.a index d2fb783..ee86116 100644 Binary files a/EasyPusher_RTSP/libEasyRTSPClient/Lib/x64/libeasyrtspclient.a and b/EasyPusher_RTSP/libEasyRTSPClient/Lib/x64/libeasyrtspclient.a differ diff --git a/EasyPusher_RTSP/main.cpp b/EasyPusher_RTSP/main.cpp index 8c48dc0..217825e 100644 --- a/EasyPusher_RTSP/main.cpp +++ b/EasyPusher_RTSP/main.cpp @@ -7,18 +7,22 @@ #include #include #include + +/* +*±¾KeyΪ3¸öÔÂÁÙʱÊÚȨLicense£¬ÈçÐèÉÌҵʹÓã¬ÇëÓʼþÖÁsupport@easydarwin.org×ÉѯÉÌÒµÊÚȨ·½°¸¡£ +*/ #ifdef _WIN32 -#define KEY "6A36334A743469576B5A754142665259707776364A65784659584E355548567A6147567958305A4A544555755A58686C567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" -#define EasyRTSPClient_KEY "79393674363469576B5A754142665259707776364A65784659584E355548567A6147567958314A55553141755A58686C567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" +#define KEY "6A36334A743469576B5A73416343645A707469507065746C6432466B5A6D466D646D526E5A6D526E636E4E6B5A6D526E63694E58444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#define EasyRTSPClient_KEY "79393674363469576B5A73416343645A707469507065784659584E355548567A6147567958314A55553141755A58686C567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" #include "getopt.h" #elif defined _ARM -#define KEY "6A36334A742F2B2B7262494174504A597077314C7066426C59584E355548567A6147567958325A7062475658444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" -#define EasyRTSPClient_KEY "79393674362F2B2B72624B4142665259707776364A66426C59584E356348567A6147567958334A3063334258444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#define KEY "6A36334A742F2B2B726249416343645A7074695070653168636D317764584E6F5A584A6D5957527A5A6D566D65474F45567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" +#define EasyRTSPClient_KEY "79393674362F2B2B726249416343645A707469507066426C59584E356348567A6147567958334A3063334258444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" #include "unistd.h" #include #else //x86 linux -#define KEY "6A36334A74354F576B59714142665259707776364A66424659584E355548567A6147567958325A7062475658444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" -#define EasyRTSPClient_KEY "7939367436354F576B596F4174504A597077314C7066426C59584E356348567A6147567958334A3063334258444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#define KEY "6A36334A74354F576B596F416343645A7074695070664E325A47646E656E5A6C5A336836646D4F2B567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" +#define EasyRTSPClient_KEY "7939367436354F576B596F416343645A707469507066426C59584E356348567A6147567958334A3063334258444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" #include "unistd.h" #include #endif diff --git a/EasyPusher_RTSP/nbproject/Makefile-i386.mk b/EasyPusher_RTSP/nbproject/Makefile-i386.mk index 5889973..eb11422 100644 --- a/EasyPusher_RTSP/nbproject/Makefile-i386.mk +++ b/EasyPusher_RTSP/nbproject/Makefile-i386.mk @@ -52,7 +52,7 @@ FFLAGS= ASFLAGS= # Link Libraries and Options -LDLIBSOPTIONS=-LlibEasyRTSPClient/Lib -L../Lib +LDLIBSOPTIONS=-LlibEasyRTSPClient/Lib/${CND_CONF} -L../Lib/${CND_CONF} # Build Targets .build-conf: ${BUILD_SUBPROJECTS} @@ -60,9 +60,9 @@ LDLIBSOPTIONS=-LlibEasyRTSPClient/Lib -L../Lib ../${CND_CONF}/easypusher_rtsp: ${OBJECTFILES} ${MKDIR} -p ../${CND_CONF} - ${LINK.cc} -o ../${CND_CONF}/easypusher_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasypusher -leasyrtspclient -lpthread + ${LINK.cc} -o ../${CND_CONF}/easypusher_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasypusher -leasyrtspclient -lpthread -lrt -${OBJECTDIR}/main.o: main.cpp +${OBJECTDIR}/main.o: main.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp diff --git a/EasyPusher_RTSP/nbproject/Makefile-x64.mk b/EasyPusher_RTSP/nbproject/Makefile-x64.mk index 566488c..7c82e60 100644 --- a/EasyPusher_RTSP/nbproject/Makefile-x64.mk +++ b/EasyPusher_RTSP/nbproject/Makefile-x64.mk @@ -60,9 +60,9 @@ LDLIBSOPTIONS=-LlibEasyRTSPClient/Lib/x64 -L../Lib/x64 ../${CND_CONF}/easypusher_rtsp: ${OBJECTFILES} ${MKDIR} -p ../${CND_CONF} - ${LINK.cc} -o ../${CND_CONF}/easypusher_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasypusher -leasyrtspclient -lpthread + ${LINK.cc} -o ../${CND_CONF}/easypusher_rtsp ${OBJECTFILES} ${LDLIBSOPTIONS} -leasypusher -leasyrtspclient -lpthread -lrt -${OBJECTDIR}/main.o: main.cpp +${OBJECTDIR}/main.o: main.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -O2 -IlibEasyRTSPClient/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp diff --git a/EasyPusher_RTSP/nbproject/configurations.xml b/EasyPusher_RTSP/nbproject/configurations.xml index 5450f8b..b06ec7b 100644 --- a/EasyPusher_RTSP/nbproject/configurations.xml +++ b/EasyPusher_RTSP/nbproject/configurations.xml @@ -1,5 +1,5 @@ - + @@ -74,10 +74,10 @@ ../${CND_CONF}/easypusher_rtsp - libEasyRTSPClient/Lib - ../Lib + libEasyRTSPClient/Lib/${CND_CONF} + ../Lib/${CND_CONF} - -leasypusher -leasyrtspclient -lpthread + -leasypusher -leasyrtspclient -lpthread -lrt @@ -116,7 +116,7 @@ libEasyRTSPClient/Lib/x64 ../Lib/x64 - -leasypusher -leasyrtspclient -lpthread + -leasypusher -leasyrtspclient -lpthread -lrt diff --git a/EasyPusher_SDK/main.cpp b/EasyPusher_SDK/main.cpp index 5c18891..32e03ef 100644 --- a/EasyPusher_SDK/main.cpp +++ b/EasyPusher_SDK/main.cpp @@ -7,17 +7,20 @@ #include #include #include "EasyPusherAPI.h" +/* +*±¾KeyΪ3¸öÔÂÁÙʱÊÚȨLicense£¬ÈçÐèÉÌҵʹÓã¬ÇëÓʼþÖÁsupport@easydarwin.org×ÉѯÉÌÒµÊÚȨ·½°¸¡£ +*/ #ifdef _WIN32 -#define KEY "6A36334A743469576B5A754142665259707776364A65784659584E355548567A6147567958305A4A544555755A58686C567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" #include "getopt.h" -#elif define _ARM -#define KEY "6A36334A742F2B2B7262494174504A597077314C7066426C59584E355548567A6147567958325A7062475658444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#define KEY "6A36334A743469576B5A73416343645A707469507065746C6432466B5A6D466D646D526E5A6D526E636E4E6B5A6D526E63694E58444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" +#elif defined _ARM +#define KEY "6A36334A742F2B2B726249416343645A7074695070653168636D317764584E6F5A584A6D5957527A5A6D566D65474F45567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" #include "unistd.h" #include #else //x86 linux -#define KEY "6A36334A74354F576B59714142665259707776364A66424659584E355548567A6147567958325A7062475658444661672F365867523246326157346D516D466962334E68514449774D545A4659584E355247467964326C75564756686257566863336B3D" #include "unistd.h" #include +#define KEY "6A36334A74354F576B596F416343645A7074695070664E325A47646E656E5A6C5A336836646D4F2B567778576F502B6C34456468646D6C754A6B4A68596D397A595541794D4445325257467A65555268636E6470626C526C5957316C59584E35" #endif #include #include "hi_type.h" diff --git a/EasyPusher_SDK/nbproject/Makefile-i386.mk b/EasyPusher_SDK/nbproject/Makefile-i386.mk index ed0a807..bc692f9 100644 --- a/EasyPusher_SDK/nbproject/Makefile-i386.mk +++ b/EasyPusher_SDK/nbproject/Makefile-i386.mk @@ -52,7 +52,7 @@ FFLAGS= ASFLAGS= # Link Libraries and Options -LDLIBSOPTIONS=-L../Lib -LSDK/Lib +LDLIBSOPTIONS=-L../Lib/i386 -LSDK/Lib # Build Targets .build-conf: ${BUILD_SUBPROJECTS} @@ -62,7 +62,7 @@ LDLIBSOPTIONS=-L../Lib -LSDK/Lib ${MKDIR} -p ../${CND_CONF} ${LINK.cc} -o ../${CND_CONF}/easypusher_sdk ${OBJECTFILES} ${LDLIBSOPTIONS} -lNetLib -leasypusher -${OBJECTDIR}/main.o: main.cpp +${OBJECTDIR}/main.o: main.cpp ${MKDIR} -p ${OBJECTDIR} ${RM} "$@.d" $(COMPILE.cc) -O2 -DHI_OS_LINUX -ISDK/Include -I../Include -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/main.o main.cpp diff --git a/EasyPusher_SDK/nbproject/configurations.xml b/EasyPusher_SDK/nbproject/configurations.xml index 34816ef..eb40557 100644 --- a/EasyPusher_SDK/nbproject/configurations.xml +++ b/EasyPusher_SDK/nbproject/configurations.xml @@ -1,5 +1,5 @@ - + @@ -83,7 +83,7 @@ ../${CND_CONF}/easypusher_sdk - ../Lib + ../Lib/i386 SDK/Lib -lNetLib -leasypusher diff --git a/EasyPusher_Win/EasyPusher/SourceManager.h b/EasyPusher_Win/EasyPusher/SourceManager.h index 29a8ab0..6d41ed6 100644 --- a/EasyPusher_Win/EasyPusher/SourceManager.h +++ b/EasyPusher_Win/EasyPusher/SourceManager.h @@ -8,7 +8,7 @@ // Add by SwordTwelve #pragma once -#define EasyPusher_VersionInfo _T("Version:1.0.1.3 Powered By SwordTwelve/Gavin/Arno") +#define EasyPusher_VersionInfo _T("Version:1.3.17.0524 Powered By SwordTwelve/Gavin/Arno") // //±¾µØÒôƵ²¶»ñ #include "AudioSource\DirectSound.h" diff --git a/Lib/i386/libeasypusher.a b/Lib/i386/libeasypusher.a index 89e3212..16c0207 100644 Binary files a/Lib/i386/libeasypusher.a and b/Lib/i386/libeasypusher.a differ diff --git a/Lib/x64/libeasypusher.a b/Lib/x64/libeasypusher.a index 8f92653..3f4990c 100644 Binary files a/Lib/x64/libeasypusher.a and b/Lib/x64/libeasypusher.a differ