Skip to content

Commit

Permalink
增加配置文件配置输入文件和输出rtmp路径
Browse files Browse the repository at this point in the history
  • Loading branch information
SwordTwelve committed Aug 30, 2019
1 parent fb19f42 commit 01b7a14
Show file tree
Hide file tree
Showing 15 changed files with 254 additions and 57 deletions.
5 changes: 5 additions & 0 deletions EasyRTMP_Demo/.dep.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This code depends on make tool being used
DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES} ${TESTOBJECTFILES}))
ifneq (${DEPFILES},)
include ${DEPFILES}
endif
Binary file removed EasyRTMP_Demo/EasyRTMP.264
Binary file not shown.
18 changes: 10 additions & 8 deletions EasyRTMP_Demo/EasyRTMP_Demo.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="getopt.h" />
<ClInclude Include="ini.h" />
<ClInclude Include="trace.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="getopt.c" />
<ClCompile Include="ini.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="trace.cpp" />
</ItemGroup>
Expand Down Expand Up @@ -79,25 +81,25 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;./Include/;../Include/;../../Include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../Include/;../../Include/</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>../Lib/x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../Lib/x86;../../Lib/x86</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;winmm.lib;libEasyRTMP.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>./;./Include/;../Include/;../../Include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../Include/;../../Include/</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>../Lib/x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../Lib/x64;../../Lib/x64</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;winmm.lib;libEasyRTMP.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
Expand All @@ -107,14 +109,14 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>./;./Include/;../Include/;../../Include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../Include/;../../Include/</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>../Lib/x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../Lib/x86;../../Lib/x86</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;winmm.lib;libEasyRTMP.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
Expand All @@ -124,14 +126,14 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>./;./Include/;../Include/;../../Include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../Include/;../../Include/</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>../Lib/x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>../Lib/x64;../../Lib/x64</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;wsock32.lib;winmm.lib;libeasyrtmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
Expand Down
6 changes: 6 additions & 0 deletions EasyRTMP_Demo/EasyRTMP_Demo.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<ClInclude Include="trace.h">
<Filter>头文件</Filter>
</ClInclude>
<ClInclude Include="ini.h">
<Filter>头文件</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
Expand All @@ -32,5 +35,8 @@
<ClCompile Include="trace.cpp">
<Filter>源文件</Filter>
</ClCompile>
<ClCompile Include="ini.cpp">
<Filter>源文件</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions EasyRTMP_Demo/easyrtmp.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[config]

file=./EasyDarwin.264
rtmp=rtmp://demo.easydss.com:3388/live/swordtest
118 changes: 118 additions & 0 deletions EasyRTMP_Demo/ini.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@

#include <string.h>

#ifdef _WIN32
#include <Windows.h>
#include <stdio.h>
#else

#include <unistd.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#endif

#include "ini.h"

/*
下边是配置文件:
[CAT]
age=2
name=Tom
*/

//从INI文件读取字符串类型数据
char *GetIniKeyString(char *title,char *key,char *filename)
{
FILE *fp;
char szLine[1024];
static char tmpstr[1024];
int rtnval;
int i = 0;
int flag = 0;
char *tmp;

if((fp = fopen(filename, "r")) == NULL)
{
printf("have no such file \n");
return "";
}
while(!feof(fp))
{
rtnval = fgetc(fp);
if(rtnval == EOF)
{
break;
}
else
{
szLine[i++] = rtnval;
}
if(rtnval == '\n' || rtnval == '\r')
{
#ifndef WIN32
//i--;
#endif
szLine[--i] = '\0';
i = 0;
tmp = strchr(szLine, '=');

if(( tmp != NULL )&&(flag == 1))
{
if(strstr(szLine,key)!=NULL)
{
//注释行
if ('#' == szLine[0])
{
}
else if ( '\/' == szLine[0] && '\/' == szLine[1] )
{

}
else
{
//找打key对应变量
strcpy(tmpstr,tmp+1);
fclose(fp);

while(tmpstr[strlen(tmpstr) - 1] == ' ' || tmpstr[strlen(tmpstr) - 1] == '\t')
tmpstr[strlen(tmpstr) - 1] = '\0';

return tmpstr;
}
}
}
else
{
strcpy(tmpstr,"[");
strcat(tmpstr,title);
strcat(tmpstr,"]");
if( strncmp(tmpstr,szLine,strlen(tmpstr)) == 0 )
{
//找到title
flag = 1;
}
}
}
}
fclose(fp);
return "";
}

//从INI文件读取整类型数据
int GetIniKeyInt(char *title,char *key,char *filename)
{
int ret = 0;
char* strValue = GetIniKeyString(title,key,filename);
if(strlen(strValue) <= 0)
{
return ret;
}
else
{
ret = atoi(strValue);
}

return ret;
}
17 changes: 17 additions & 0 deletions EasyRTMP_Demo/ini.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifndef __INI_H__
#define __INI_H__

#ifdef __cplusplus
extern "C" {
#endif
//从INI文件读取字符串类型数据
extern char *GetIniKeyString(char *title,char *key,char *filename);

//从INI文件读取整类型数据
extern int GetIniKeyInt(char *title,char *key,char *filename);

#ifdef __cplusplus
}
#endif

#endif//__INI_H__
Binary file added EasyRTMP_Demo/libeasyrtmp.dll
Binary file not shown.
Loading

0 comments on commit 01b7a14

Please sign in to comment.