Commit 4df678f1 authored by luo's avatar luo

[UPDATE]SDK 2.7.0.4.6

parent aa7cde83
......@@ -171,9 +171,14 @@
};
};
&spi2 {
status = "disabled";
status = "okay";
spi_mobile_4g@0 {
compatible = "acme-spinet";
reg = <0>;
spi-max-frequency = <8000000>;
spi_irq=<41>;
};
};
&i2s0_clk {
......@@ -249,3 +254,11 @@
status = "okay";
};
};
/{
rpmsg-i2c{
compatible="i2c-rpbus";
proc-id = "rpmsg_i2c";
status = "okay";
};
};
\ No newline at end of file
......@@ -1388,9 +1388,11 @@ static int sa6920_pinctrl_pinconf_set(struct pinctrl_dev *pctldev,
break;
case PIN_CONFIG_BIAS_PULL_UP:
val |= SA6920_PINCONF_PULLUP;
val |= SA6920_PINCONF_BIAS_PULLUP_DOWN_DISABLE;
break;
case PIN_CONFIG_BIAS_PULL_DOWN:
val &= ~SA6920_PINCONF_PULLUP;
val |= SA6920_PINCONF_BIAS_PULLUP_DOWN_DISABLE;
break;
case PIN_CONFIG_BIAS_DISABLE:
val &= ~SA6920_PINCONF_BIAS_PULLUP_DOWN_DISABLE;
......
......@@ -19,7 +19,7 @@
#include "uvc_queue.h"
#include "uvc_video.h"
#define SRAM_ADDR 0x20618000 //0x20617FFF
#define SRAM_ADDR 0x205A8000
/* --------------------------------------------------------------------------
* Video codecs
*/
......
......@@ -37,12 +37,6 @@ menu "sa692x ext Config"
bool "Enable NonCache heap"
default n
if RT_USING_NONCACHE_HEAP
config RT_HW_NONCACHE_HEAP_SIZE
int "Set NonCache heap size"
range 4096 67108864
default 32768
endif
config SA_USEING_LISTENING_PROCEE
bool "Listening procee"
default y
......
......@@ -26,12 +26,12 @@ extern unsigned char __nocache_bss_end;
#define RT_HW_HEAP_BEGIN (void*)&__bss_end
#define RT_HW_HEAP_END (void*)(0x20020000)
//#define RT_HW_NONCACHE_HEAP_SIZE (2*1024*1024)//(128*1024)//(3*1024*1024) // 2M
#define RT_HW_NONCACHE_BEGIN (0x20023000ul)//(0x203A0000ul)//(0x205D0000ul)//(0x201D0000ul)
#define RT_HW_NONCACHE_HEAP_SIZE (792*1024)//(128*1024)//(3*1024*1024) // 2M
#define RT_HW_NONCACHE_BEGIN (0x2005A000ul)//(0x203A0000ul)//(0x205D0000ul)//(0x201D0000ul)
#define RT_HW_NONCACHE_END ((void*)(RT_HW_NONCACHE_BEGIN + RT_HW_NONCACHE_HEAP_SIZE))
// -- noncache scope when in trigger wakeup step, 1M bytes (20020000~20120000)
#define RT_HW_NONCACHE_IN_TRIGGER_BEGIN (0x20023000ul)
#define RT_HW_NONCACHE_IN_TRIGGER_BEGIN (0x2005A000ul)
#define RT_HW_NONCACHE_IN_TRIGGER_END ((void*)(RT_HW_NONCACHE_IN_TRIGGER_BEGIN + RT_HW_NONCACHE_HEAP_SIZE))
......
......@@ -68,7 +68,7 @@
#define FINSH_USING_MSH
#define FINSH_THREAD_NAME "tshell"
#define FINSH_THREAD_PRIORITY 20
#define FINSH_THREAD_STACK_SIZE 4096
#define FINSH_THREAD_STACK_SIZE 2048
#define FINSH_USING_HISTORY
#define FINSH_HISTORY_LINES 5
#define FINSH_USING_SYMTAB
......@@ -287,12 +287,11 @@
#define BSP_USING_PWM5
#define BSP_USING_PWM6
#define BSP_USING_PWM7
#define BSP_USING_PWM10
#define BSP_USING_PWM11
#define BSP_USING_I2C
#define BSP_USING_I2C0
#define BSP_USING_I2C1
#define BSP_USING_I2C2
#define BSP_USING_I2C3
#define SA_I2C_TEST
#define BSP_USING_STAR
#define BSP_USING_WDT
#define BSP_MOUDLE_WITHIN_WDT
......@@ -301,31 +300,26 @@
#define BSP_USING_NANO_FILTER
#define PWM_ID_WL 10
#define PWM_ID_IR 11
#define IRCUT_DRV_EN_PIN -1
#define IRCUT_DRV_SPI_CSN_PIN -1
#define IRCUT_DRV_EN_PIN 89
#define IRCUT_DRV_SPI_CSN_PIN 86
#define SNS_OS04D10
#define BSP_USING_SNS_RST_PIN 5
#define BSP_USING_SNS_RST_PIN 27
#define BSP_USING_SNS_SEL_PIN 36
#define BSP_USING_SPI
#define BSP_USING_PIN
#define BSP_USE_TESTMODULE
/* Board extended module Drivers */
#define BSP_USING_RPMSG
#define BSP_USING_PMIC
#define PMIC_SA9710
#define BSP_TEST_PMIC
#define DEFAULT_SELECT
/* sa692x ext Config */
#define RT_USING_NONCACHE_HEAP
#define RT_HW_NONCACHE_HEAP_SIZE 1036288
#define SA_USEING_LISTENING_PROCEE
#define RT_USING_CPU_USAGE
#define BSP_USING_SIMPLE_CMD
#define BOARD_PLATFORM 1
#define BOARD_PLATFORM 2
#define BOOT_FROM_SFC
#endif
......@@ -1098,8 +1098,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=2097152
#CONFIG_RT_HW_NONCACHE_HEAP_SIZE=65536
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1105,7 +1105,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1111,7 +1111,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1113,7 +1113,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1108,7 +1108,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1114,7 +1114,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1107,7 +1107,7 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
# CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1107,7 +1107,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1115,7 +1115,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1113,7 +1113,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1111,7 +1111,7 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
# CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1108,7 +1108,7 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
# CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1108,7 +1108,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -1115,7 +1115,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=1036288
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_RT_USING_CPU_USAGE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
......
......@@ -768,7 +768,6 @@ CONFIG_DEFAULT_SELECT=y
# sa692x ext Config
#
CONFIG_RT_USING_NONCACHE_HEAP=y
CONFIG_RT_HW_NONCACHE_HEAP_SIZE=32768
CONFIG_SA_USEING_LISTENING_PROCEE=y
CONFIG_BSP_USING_SIMPLE_CMD=y
# CONFIG_BSP_USING_ASIC_TEST is not set
......
# 2.7.0.4.6版本0.0
## 发布日期:2025年03月31日
### 更新内容
1. 修复快起死机问题
2. 修复缩略图旋转失效问题
3. 支持 4D10 EV 抓图功能
# 2.7.0.4.5版本0.0
## 发布日期:2025年03月29日
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -139,6 +139,19 @@ check_file_size() {
fi
}
make_module() {
local path=$1
local mudule_name=$2
local target_path=$3
cd $1
set -e
make clean
make
set +e
cd -
cp $1/$2 $target_path
}
# Change directory to the 6920_bsp_release directory
cd 6920_bsp_release/ || exit
......@@ -187,6 +200,10 @@ copy_files "$1"
mkdir system_temp/lib/modules -p
mkdir system_temp/usr -p
# Get new controller
make_module tools/controller/ controller sdk/bin/
make_module tools/comm/ libtool_comm.so sdk/opensource/lib/
# Copy libraries and scripts
cp common/lib/libcrypto.so* system_temp/lib/
cp common/lib/libstdc++.so.* system_temp/lib/
......@@ -351,18 +368,18 @@ copy_files "$1"
source export.sh
sed -i 's|CROSS_COMPILE=arm-microbt-linux-uclibcgnueabihf-|#CROSS_COMPILE=arm-microbt-linux-uclibcgnueabihf-|g' mkconfig
cd -
# cd sdk/sample/source/sample_hapi_streamer/
# make clean
# make
# cd -
cd sdk/sample/source/sample_hapi_streamer/
make clean
make
cd -
cd sdk/sample/source/sample_hapi_media/
make clean
make
cd -
set +e
git checkout sdk/sample/source/mkconfig
# mv sdk/sample/source/sample_hapi_streamer/sample_hapi_streamer system_temp/bin/streamerlite_sample
cp sdk/sample/source/sample_hapi_media/sample_hapi_media system_temp/bin/streamer_media
cp sdk/sample/source/sample_hapi_streamer/sample_hapi_streamer system_temp/bin/streamer_ipc
cp sdk/sample/source/sample_hapi_media/streamer_media system_temp/bin/streamer_media
cp common/configs system_temp/ -r
cp common/usr/* system_temp/usr/ -rf
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
{
"doc": "lite",
"version": "1.0.1.2",
"#note": [
"workmode: trigger, deepsleep, aor, normal, hibernate",
"scene: record, play, talk, record_play, trigger",
"soundmode: mono, stereo",
"encoder/decoder: aac, g711a, g711u, pcm",
"sensor: 4d10, 4a10, 2n10, imx681, 5l10, sc535, 4j10, 4l10",
"imgmode: linear, hdr",
"format: h264, h265, jpeg",
"rcmode: cqp, cbr, vbr, avbr, fqp",
"osd: image, time",
"dual: 0 - one mipi one sns, 1 - one mipi two sns, 2 - two mipi two sns"
],
"workmode": "normal",
"dual": 2,
"audio": {
"enable": 0,
"scene": "record",
"input": { "samplerate": 16000, "soundmode": "mono", "encoder": "aac", "vqe": { "enable": 0, "paramfile": "" } },
"output": { "samplerate": 16000, "soundmode": "mono", "decoder": "aac", "vqe": { "enable": 0, "paramfile": "" } },
"sap": { "enable": 0, "samplerate": 16000, "abnormal": { "enable": 0, "sensitivity": 1 } }
},
"video": {
"enable": 1,
"vin": [
{
"enable": 1, "devid": 0, "sensor": "4d10", "snsid": 0,"subsnsid": -1 , "imgmode": "linear", "smartae": 1, "mirror": 0, "flip": 0, "dumpyuv": 0,
"maxfps": 15.0, "minfps": 5.0, "maxexptime": 200000, "rotation": 0,"eisMode": 0,"gdc": 0,
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin","/acme/conf/4d10/os04d10_4M_Color_Outdoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin" ],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
{
"enable": 1, "devid": 1, "sensor": "4d10", "snsid": 2, "subsnsid": -1, "imgmode": "linear", "smartae": 1, "mirror": 0, "flip": 0, "dumpyuv": 0,
"maxfps": 15.0, "minfps": 5.0, "maxexptime": 200000, "rotation": 0,"eisMode": 0,"gdc": 0,
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin","/acme/conf/4d10/os04d10_4M_Color_Outdoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin" ],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
}
],
"venc": [
{
"enable": 1, "devid": 0, "channel": 0, "smartrc": 0, "zoom" :0,"smartsei": 1,
"format": "h265", "width": 2560, "height": 1440, "rcmode": "avbr", "bitrate": 1024000,
"region": [
{
"enable": 1, "osd": "image",
"rect": { "x": 32, "y": 32, "width": 256, "height": 128 },
"color": [ 16777215, 6171602, 16745541 ],
"file": "/acme/bin/x_venc_logo_256_128.bgra"
},
{
"enable": 1, "osd": "time",
"rect": { "x": 1600, "y": 1000, "width": 800, "height": 64 },
"color": [ 16777215, 6171602, 16745541 ]
}
]
},
{
"enable": 1, "devid": 1, "channel": 1, "smartrc": 0, "zoom" :0, "smartsei": 1,
"format": "h265", "width": 2560, "height": 1440, "rcmode": "avbr", "bitrate": 1024000,
"region": [
{
"enable": 1, "osd": "image",
"rect": { "x": 32, "y": 32, "width": 256, "height": 128 },
"color": [ 16777215, 6171602, 16745541 ],
"file": "/acme/bin/x_venc_logo_256_128.bgra"
},
{
"enable": 1, "osd": "time",
"rect": { "x": 1600, "y": 1000, "width": 800, "height": 64 },
"color": [ 16777215, 6171602, 16745541 ]
}
]
}
],
"svp": [
{
"enable": 1, "devid": 0, "detectfps": 15, "structfps": 1, "threshold": 0.65, "rows": 5, "cols": 5,
"modelfile": "/acme/conf/yolox_nano_PersonVehicleNonvehicle_800x480.hir",
"postprocesslib": "/acme/lib/libsvp_npu_od.so",
"motordetect": { "enable": 1, "threshold": 0.25 },
"nonmotordetect": { "enable": 0, "threshold": 0.25 },
"peopledetect": { "enable": 1, "threshold": 0.25 },
"facedetect": { "enable": 1, "threshold": 0.25 },
"facestruct": { "enable": 0, "modelfile": "" },
"motiondetect": { "enable": 1, "threshold": 0.5 }
},
{
"enable": 1, "devid": 1, "detectfps": 15, "structfps": 1, "threshold": 0.65, "rows": 5, "cols": 5,
"modelfile": "/acme/conf/yolox_nano_PersonVehicleNonvehicle_800x480.hir",
"postprocesslib": "/acme/lib/libsvp_npu_od.so",
"motordetect": { "enable": 1, "threshold": 0.25 },
"nonmotordetect": { "enable": 0, "threshold": 0.25 },
"peopledetect": { "enable": 1, "threshold": 0.25 },
"facedetect": { "enable": 1, "threshold": 0.25 },
"facestruct": { "enable": 0, "modelfile": "" },
"motiondetect": { "enable": 1, "threshold": 0.5 }
}
],
"trigger": [
{
"enable": 0,
"poweronmode": 0,
"updatestaticattr": 0,
"updatedynamicattr": 1,
"devname": "/dev/mtd4",
"offsetstatic": 0,
"offsetdynamic": 65536,
"crop": { "x": 0, "y": 0, "width": 2560, "height": 1440 },
"binning": { "width": 640, "height": 480 },
"scale": { "width": 416, "height": 416 },
"memlen": 50331648, "totaltime": 1000, "maxwaittime": 1000, "tolerance": 5,
"nightMode":0, "sensitivity":1, "firstlevel": 0, "secondlevel": 0,
"lampdownfreqlimit":10, "lampupfreqlimit":10,
"exptime": 20000, "again": 1024, "dgain": 1024, "ispgain": 1024,
"autotarget": 1, "target": 64, "range": 10,
"isotarget": [ 64, 64, 64, 64, 65, 66, 69, 72, 75, 75, 75, 75, 75, 75, 75, 75 ]
}
]
}
}
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
{
"doc": "user",
"version": "2.0.16.0",
"version": "2.0.15.0",
"#module": "ENUM: 0 - isp, 1 - filter",
"#alwayson": "ENUM: 0 - disable, 1 - AOR, 2 - DEEP",
"module": 0,
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/681/imx681_capture_Color_Outdoor.bin", "/acme/conf/681/imx681_capture_Color_Indoor_diff.bin","/acme/conf/681/imx681_capture_Color_Outdoor_diff.bin","","","","","","/acme/conf/681/imx681_capture_Color_Blc_diff.bin"],
"ispfile": [ "/acme/conf/681/12M_linear_Outdoor.bin","/acme/conf/681/imx681_12M_Color_Outdoor_diff.bin", "/acme/conf/681/12M_linear_Indoor_diff.bin","/acme/conf/681/imx681_capture_Color_Outdoor_diff.bin","","","","","","/acme/conf/681/imx681_capture_Color_Blc_diff.bin"],
"algfile": "/acme/conf/681/imx681_v01_001_800_rtl.bin"
},
"filter": {
......@@ -32,14 +32,14 @@
"ispd_fps": 15,
"jpeg_depth": 3,
"vnne_depth": 3,
"crop": { "x": 96, "y": 144, "width": 3840, "height": 2736 },
"crop": { "x": 96, "y": 144, "width": 3648, "height": 2736 },
"binning": { "width": 1920, "height": 1080 },
"scale": { "width": 960, "height": 540 }
},
"vi": {
"src_fps": 15, "dst_fps": 15, "depth": 0, "mdscale": 1, "rotation": 0,
"gating": { "enable": 0, "vi": 1, "isp": 1, "vpu": 1 },
"crop": { "x": 96, "y": 144, "width": 3840, "height": 2736 },
"crop": { "x": 96, "y": 144, "width": 3648, "height": 2736 },
"pipe": { "bayer": "RGGB" },
"tpg": { "enable": 0, "pattern": "V", "bayer": "BGGR", "motion": 0 },
"record": { "enable": 0, "frames": 0, "size": 100, "segment": 0 }
......@@ -101,14 +101,12 @@
"mode": 1, "memlen": 50331648,
"totaltime": 1000, "maxtime": 600,
"lerance": 20, "firstlevel": 0, "secondlevel": 0,
"lampdownfreqlimit":10, "lampupfreqlimit":10,
"exptime": 20000, "again": 1024, "dgain": 1024, "ispgain": 1024,
"autotarget": 1, "target": 64, "range": 10,
"isotarget": [ 64, 64, 64, 64, 65, 66, 69, 72, 75, 75, 75, 75, 75, 75, 75, 75 ]
},
"#format": "1 - aac(frmlen=1024,bitrate=32000), 2 - g711(frmlen=160,bitrate=8000)",
"audio": {
"devid": 0,
"ai": { "enable": 0, "frmlen": 160, "samplerate": 16000, "bitwidth": 16, "soundmode": 1 },
"ao": { "enable": 0, "frmlen": 160, "samplerate": 16000, "bitwidth": 16, "soundmode": 1 },
"aenc": { "enable": 0, "rtsp": 1, "format": 2, "ps": 0, "samplerate": 16000, "bitwidth": 16, "soundmode": 1, "bitrate": 8000 },
......@@ -124,9 +122,9 @@
],
"h264": [
{
"enable": 0, "rtsp": 0, "sei": 0, "ps": 0,
"enable": 0, "rtsp": 0, "sei": 0, "roisei": 0, "ps": 0, "eisEn": 0,
"source": { "mode": 2, "channel": 1, "sync": 0 }, "#source/mode": "0 - online, 1 - manual, 2 - offline",
"encode": { "profile": 2, "width": 3840, "height": 2736, "skip_enable": 0, "forceIDR": 0 }, "#encode/profile": "0 - BaseLine, 1 - MP, 2 - HP",
"encode": { "profile": 2, "width": 3648, "height": 2736, "skip_enable": 0, "forceIDR": 0 }, "#encode/profile": "0 - BaseLine, 1 - MP, 2 - HP",
"gop": { "mode": 0, "numb": 0, "length": 60, "layer": 2, "drop": 2, "ltrc": 0 }, "#gop/mode": "0 - default, 1 - pyramidal, 2 - lowdelayP, 3 - lowdelayB, 4 - adaptive, 5 - svc-t(effect on layer & drop)",
"#bitrate/mode": "0 - constQP, 1 - CBR, 2 - VBR, 5 - AVBR",
"bitrate": {
......@@ -139,7 +137,7 @@
],
"h265": [
{
"enable": 0, "rtsp": 1, "sei": 0, "ps": 0,
"enable": 0, "rtsp": 1, "sei": 0, "roisei": 0, "ps": 0, "eisEn": 0,
"source": { "mode": 2, "channel": 1, "sync": 0 }, "#source/mode": "0 - online, 1 - manual, 2 - offline",
"encode": { "profile": 0, "width": 4032, "height": 3024, "skip_enable": 0, "forceIDR": 0 }, "#encode/profile": "0 - MP",
"gop": { "mode": 0, "numb": 0, "length": 60, "layer": 2, "drop": 2, "ltrc": 0 }, "#gop/mode": "0 - default, 1 - pyramidal, 2 - lowdelayP, 3 - lowdelayB, 4 - adaptive, 5 - svc-t(effect on layer & drop)",
......@@ -153,11 +151,19 @@
}
],
"vpss": [
{ "channel": 0, "src_fps": 15, "dest_fps": 15, "depth": 2, "crop": { "x": 96, "y": 144, "width": 3840, "height": 2736 } },
{ "channel": 1, "src_fps": 15, "dest_fps": 15, "depth": 2, "scale": { "width": 3840, "height": 2736 } },
{ "channel": 2, "src_fps": 15, "dest_fps": 15, "depth": 2, "scale": { "width": 3840, "height": 2736 } },
{ "channel": 0, "src_fps": 15, "dest_fps": 15, "depth": 2, "crop": { "x": 96, "y": 144, "width": 3648, "height": 2736 } },
{ "channel": 1, "src_fps": 15, "dest_fps": 15, "depth": 2, "scale": { "width": 3648, "height": 2736 } },
{ "channel": 2, "src_fps": 15, "dest_fps": 15, "depth": 2, "scale": { "width": 3648, "height": 2736 } },
{ "channel": 3, "src_fps": 15, "dest_fps": 15, "depth": 2, "scale": { "width": 640, "height": 384 } }
],
"storage": {
"enable": 0,
"#partition_size": "1--1GB, 2--2GB",
"#playback maximum default search range": "1 - 24h (default), 2 - 48h, etc.",
"partitionsize": 1, "format": 0, "path": "/mnt/sdcard",
"enablestorage": 0, "frames": 200,
"enablevod": 0, "playutcstarttime": 5, "playutcendtime": 1732180500, "searchrange": 1, "loop": 1
},
"app_isp": {
"sysmaxgain": [2457600, 2457600, 2457600, 2457600, 38, 36],
"aetarget": [46, 46, 43, 41, 39, 38, 36, 34, 32, 32, 32, 32, 30, 30, 30, 30],
......@@ -373,8 +379,6 @@
"lightFrqIR":100,
"lightDownFrqWl":0,
"lightDownFrqIR":0,
"lightDownFrqWl":0,
"lightDownFrqIR":0,
"icrLampMode":0,
"icrEn":0,
"lampType":0,
......@@ -389,6 +393,7 @@
"debug": {
"hdr": 0,
"gdc": 0,
"eis": 0,
"#iso": "0 - AUTO, otherwise - Manual. Range 100 - 3276800",
"iso": 0,
"#ct": "0 - AUTO, otherwise - Manual. Range 1000 - 10000",
......
{
"doc": "user",
"version": "2.0.16.0",
"version": "2.0.15.0",
"#module": "ENUM: 0 - isp, 1 - filter",
"#alwayson": "ENUM: 0 - disable, 1 - AOR, 2 - DEEP",
"module": 0,
......@@ -19,13 +19,14 @@
"#img_mode": "ENUM: 0 - MIPI_LINEAR_MAXRES, 1 - MIPI_HDR_MAXRES, 2 - SPI_MAXRES, 3 - DVP_MAXRES, 4 - MIPI_LINEAR_BINNING, 5 - MODE_EXT1",
"#fps": "NUM: 0 - use default, otherwise - actual fps",
"support": [
{ "lib": "libsns_imx681_soc.so", "device": 0, "img_mode": 4, "fps": 30.0, "mirror": 0,"flip": 0, "obj": "g_stSnsImx681Obj" }
{ "lib": "libsns_imx681_soc.so", "device": 0, "img_mode": 1, "fps": 30.0, "mirror": 0,"flip": 0, "obj": "g_stSnsImx681Obj" }
]
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/681/imx681_capture_Color_Outdoor.bin", "/acme/conf/681/imx681_video_Color_Indoor_diff.bin", "/acme/conf/681/imx681_video_Color_Indoor_Aisp_diff.bin","","","","","","/acme/conf/681/imx681_video_Color_Blc_diff.bin"],
"algfile": "/acme/conf/681/imx681_v01_001_800_rtl.bin"
"ispfile": [ "/acme/conf/imx681/bin/3M_linear_Outdoor.bin",
"/acme/conf/imx681/bin/3M_linear_Indoor_diff.bin","","","",
"/acme/conf/imx681/bin/3M_linear_Blc_diff.bin"],
"algfile": "/acme/conf/imx681/imx681_v01_001_800_rtl.bin"
},
"filter": {
"ispm_fps": 15,
......@@ -101,7 +102,6 @@
"mode": 1, "memlen": 50331648,
"totaltime": 1000, "maxtime": 600,
"lerance": 20, "firstlevel": 0, "secondlevel": 0,
"lampdownfreqlimit":10, "lampupfreqlimit":10,
"exptime": 20000, "again": 1024, "dgain": 1024, "ispgain": 1024,
"autotarget": 1, "target": 64, "range": 10,
"isotarget": [ 64, 64, 64, 64, 65, 66, 69, 72, 75, 75, 75, 75, 75, 75, 75, 75 ]
......@@ -124,7 +124,7 @@
],
"h264": [
{
"enable": 0, "rtsp": 0, "sei": 0, "ps": 0,
"enable": 0, "rtsp": 0, "sei": 0, "roisei": 0, "ps": 0, "eisEn": 0,
"source": { "mode": 0, "channel": 1, "sync": 0 }, "#source/mode": "0 - online, 1 - manual, 2 - offline",
"encode": { "profile": 2, "width": 1512, "height": 2016, "skip_enable": 0, "forceIDR": 0 }, "#encode/profile": "0 - BaseLine, 1 - MP, 2 - HP",
"gop": { "mode": 0, "numb": 0, "length": 60, "layer": 2, "drop": 2, "ltrc": 0 }, "#gop/mode": "0 - default, 1 - pyramidal, 2 - lowdelayP, 3 - lowdelayB, 4 - adaptive, 5 - svc-t(effect on layer & drop)",
......@@ -139,7 +139,7 @@
],
"h265": [
{
"enable": 1, "rtsp": 1, "sei": 0, "ps": 0,
"enable": 0, "rtsp": 1, "sei": 0, "roisei": 0, "ps": 0, "eisEn": 0,
"source": { "mode": 0, "channel": 1, "sync": 0 }, "#source/mode": "0 - online, 1 - manual, 2 - offline",
"encode": { "profile": 0, "width": 1512, "height": 2016, "skip_enable": 0, "forceIDR": 0 }, "#encode/profile": "0 - MP",
"gop": { "mode": 0, "numb": 0, "length": 60, "layer": 2, "drop": 2, "ltrc": 0 }, "#gop/mode": "0 - default, 1 - pyramidal, 2 - lowdelayP, 3 - lowdelayB, 4 - adaptive, 5 - svc-t(effect on layer & drop)",
......@@ -158,6 +158,14 @@
{ "channel": 2, "src_fps": 30, "dest_fps": 30, "depth": 3, "scale": { "width": 1512, "height": 2016 } },
{ "channel": 3, "src_fps": 30, "dest_fps": 30, "depth": 3, "scale": { "width": 416, "height": 416 } }
],
"storage": {
"enable": 0,
"#partition_size": "1--1GB, 2--2GB",
"#playback maximum default search range": "1 - 24h (default), 2 - 48h, etc.",
"partitionsize": 1, "format": 0, "path": "/mnt/sdcard",
"enablestorage": 0, "frames": 200,
"enablevod": 0, "playutcstarttime": 5, "playutcendtime": 1732180500, "searchrange": 1, "loop": 1
},
"app_isp": {
"sysmaxgain": [2457600, 2457600, 2457600, 2457600, 38, 36],
"aetarget": [46, 46, 43, 41, 39, 38, 36, 34, 32, 32, 32, 32, 30, 30, 30, 30],
......@@ -373,8 +381,6 @@
"lightFrqIR":100,
"lightDownFrqWl":0,
"lightDownFrqIR":0,
"lightDownFrqWl":0,
"lightDownFrqIR":0,
"icrLampMode":0,
"icrEn":0,
"lampType":0,
......@@ -389,6 +395,7 @@
"debug": {
"hdr": 0,
"gdc": 0,
"eis": 0,
"#iso": "0 - AUTO, otherwise - Manual. Range 100 - 3276800",
"iso": 0,
"#ct": "0 - AUTO, otherwise - Manual. Range 1000 - 10000",
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin","/acme/conf/4d10/os04d10_4M_Color_Outdoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin","/acme/conf/4d10/os04d10_4M_Color_Outdoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin","/acme/conf/4d10/os04d10_4M_Color_Outdoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin","/acme/conf/4d10/os04d10_4M_Color_Outdoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
......@@ -24,7 +24,7 @@
},
"config": {
"#ispfile": "0: color_out; 1:color_in_diff; 2:aisp; 3: DN_out; 4:DN_in_diff; 5:DN_night;6:wdr_out; 7:wdr_in_diff;",
"ispfile": [ "/acme/conf/4d10/os04d10_base_Color.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"ispfile": [ "/acme/conf/4d10/os04d10_4M_Color_Outdoor.bin", "/acme/conf/4d10/os04d10_4M_Color_Indoor_diff.bin", "/acme/conf/4d10/os04d10_4M_Color_Aisp_diff.bin", "/acme/conf/4d10/os04d10_4M_Black_diff.bin","/acme/conf/4d10/os04d10_4M_Color_Aisp_diff_Light.bin"],
"algfile": "/acme/conf/4d10/aisp_4M.bin"
},
"filter": {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment