Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
feihengli committed Jan 29, 2018
1 parent fcba49c commit e261c42
Show file tree
Hide file tree
Showing 12 changed files with 2,618 additions and 40 deletions.
16 changes: 7 additions & 9 deletions Rules.make
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@

#¶ÔÓ¦ hi_comm.h enum sample_vi_mode_e
#SENSOR_TYPE=OMNIVISION_OV9732_MIPI_720P_30FPS
SENSOR_TYPE=OMNIVISION_OV2710_MIPI_1080P_30FPS
#SENSOR_TYPE=OMNIVISION_OV2710_MIPI_1080P_30FPS
#SENSOR_TYPE=APTINA_AR0130_DC_720P_30FPS
#SENSOR_TYPE=SONY_IMX291_LVDS_1080P_30FPS
#SENSOR_TYPE=SONY_IMX323_DC_1080P_30FPS
#SENSOR_TYPE=SMARTSENS_SC1135_DC_960P_30FPS
#SENSOR_TYPE=APTINA_AR0237_DC_1080P_30FPS
#SENSOR_TYPE=OMNIVISION_OV4689_MIPI_4M_30FPS
#SENSOR_TYPE=SMARTSENS_SC2135_DC_1080P_30FPS
#SENSOR_TYPE=SONY_IMX226_LVDS_12M_30FPS
SENSOR_TYPE=SONY_IMX226_LVDS_12M_30FPS
export SENSOR_TYPE

HIARCH=hi3518ev200
HIARCH=hi3516av200
export HIARCH

CROSS_COMPILE=arm-hisiv300-linux-
PLATFORM=$(TOP_DIR)/soc/hi3518ev200
CROSS_COMPILE=arm-hisiv600-linux-
PLATFORM=$(TOP_DIR)/soc/hi3516av200
export PLATFORM


ifeq ($(SENSOR_TYPE), APTINA_AR0130_DC_720P_30FPS)
SENSOR_PATH := $(PLATFORM)/sensor/ar0130
else ifeq ($(SENSOR_TYPE), OMNIVISION_OV9732_MIPI_720P_30FPS)
SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov9732_mipi
else ifeq ($(SENSOR_TYPE), OMNIVISION_OV2710_MIPI_1080P_30FPS)
SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov2710_mipi
SENSOR_LIB=$(PLATFORM)/sensor/omnivision_ov2710_mipi/libsns_ov2710.a
else ifeq ($(SENSOR_TYPE), SONY_IMX291_LVDS_1080P_30FPS)
SENSOR_PATH := $(PLATFORM)/sensor/sony_imx291
else ifeq ($(SENSOR_TYPE), SONY_IMX323_DC_1080P_30FPS)
Expand Down Expand Up @@ -63,12 +61,12 @@ LIBS+=$(PLATFORM)/common_lib/libdigest.a
LIBS+=$(PLATFORM)/common_lib/libixml.a
LIBS+=$(PLATFORM)/common_lib/libmd5.a
LIBS+=$(PLATFORM)/common_lib/libtinyxml.a
#LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
export LIBS

CFLAGS += -g -Wall
CFLAGS += -DSENSOR_TYPE=$(SENSOR_TYPE)
CFLAGS += -DHIARCH=$(HIARCH)
CFLAGS += -D$(HIARCH)
CFLAGS += -I$(TOP_DIR)
CFLAGS += -I$(TOP_DIR)/common_include
CFLAGS += -I$(PLATFORM)
Expand Down
2 changes: 1 addition & 1 deletion app/rtsp_server/rtsp_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ int main(int argc, char** argv)
handle hndRtsps = rtsps_init(554);
CHECK(hndRtsps, -1, "Error with: %#x\n", hndRtsps);

bmp_demo();
//bmp_demo();

while (!test_exit)
{
Expand Down
32 changes: 32 additions & 0 deletions personal.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "personal", "personal.vcproj", "{91D43CC6-96C3-4951-9E5F-2AADDA62355C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hi3516av200", "soc\hi3516av200\hi3516av200.vcproj", "{797E5075-09CE-42A9-B78B-6A73AD2D841D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hi3518ev200", "soc\hi3518ev200\hi3518ev200.vcproj", "{6C6DACED-2B73-4C11-993E-BDD8F8F51AFF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{91D43CC6-96C3-4951-9E5F-2AADDA62355C}.Debug|Win32.ActiveCfg = Debug|Win32
{91D43CC6-96C3-4951-9E5F-2AADDA62355C}.Debug|Win32.Build.0 = Debug|Win32
{91D43CC6-96C3-4951-9E5F-2AADDA62355C}.Release|Win32.ActiveCfg = Release|Win32
{91D43CC6-96C3-4951-9E5F-2AADDA62355C}.Release|Win32.Build.0 = Release|Win32
{797E5075-09CE-42A9-B78B-6A73AD2D841D}.Debug|Win32.ActiveCfg = Debug|Win32
{797E5075-09CE-42A9-B78B-6A73AD2D841D}.Debug|Win32.Build.0 = Debug|Win32
{797E5075-09CE-42A9-B78B-6A73AD2D841D}.Release|Win32.ActiveCfg = Release|Win32
{797E5075-09CE-42A9-B78B-6A73AD2D841D}.Release|Win32.Build.0 = Release|Win32
{6C6DACED-2B73-4C11-993E-BDD8F8F51AFF}.Debug|Win32.ActiveCfg = Debug|Win32
{6C6DACED-2B73-4C11-993E-BDD8F8F51AFF}.Debug|Win32.Build.0 = Debug|Win32
{6C6DACED-2B73-4C11-993E-BDD8F8F51AFF}.Release|Win32.ActiveCfg = Release|Win32
{6C6DACED-2B73-4C11-993E-BDD8F8F51AFF}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading

0 comments on commit e261c42

Please sign in to comment.