Commit Graph

296 Commits

Author SHA1 Message Date
81136e7fd5 Merge "oem_uvcc: skip aiq initialization in AI process" 2020-04-29 13:53:22 +08:00
fd892c4ee0 oem_uvcc: skip aiq initialization in AI process
At this stage, aiq must be initialized by mediaserver only.

Change-Id: I55a4e4325c2f38344a69f99effab74dd397988cc
2020-04-29 12:04:17 +08:00
751c332ec5 oem: ipc: Use DFVS to modify NPU clock
We should adjust the frequency through dvfs instead of directly operating clk.

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I62c7983d4f32f58d687f20d4e453458e1ee4621b
2020-04-28 20:15:08 +08:00
7bd036261a Merge "oem_ipc: oem_ipc: update prebuilt web applicantion for v0.3.1.1" 2020-04-28 19:46:01 +08:00
c35ebcc38c oem_ipc: oem_ipc: update prebuilt web applicantion for v0.3.1.1
1.update translate for login
2.debug: put wrong info when sType=blacklist

Change-Id: I8e34063b629aa43b50a606a8576eea86827599ce
2020-04-28 18:45:57 +08:00
54741c8452 ipc: mediaserver default use ipc.conf
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Change-Id: I64f4369f498adee0743e5916863f01fc0e411b10
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2020-04-28 15:26:53 +08:00
4777834ef9 Merge "oem: ipc: set HDR_MODE=0" 2020-04-28 11:39:23 +08:00
2aa05ec678 oem: ipc: set HDR_MODE=0
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ic8cb055ace1d1b35fc4907f3911e25b51f98fdb5
2020-04-28 11:38:02 +08:00
85f2426837 Merge "oem_ipc: oem_ipc: update prebuilt web applicantion for v0.3.1" 2020-04-28 10:39:08 +08:00
a283612241 oem_ipc: oem_ipc: update prebuilt web applicantion for v0.3.1
1.when batch input, wait time of each pic 400ms -> 200ms
 after wait search interval 1000ms -> 2000ms
2.distinguish feature 0 and -1, set 0 wait and -1 fail
3.modify ntp function, now time will change with switching timezone

Change-Id: I7dd4878aee553f6d6f7c70362a1fcad02077ee9d
2020-04-28 10:33:46 +08:00
b4af5595f9 Merge "oem_uvcc:nn ddr burst set 64B,hdr mode set nomal default." 2020-04-27 16:02:06 +08:00
3ced2fabd7 Merge "oem_uvcc:update for eptz script" 2020-04-27 16:01:42 +08:00
4953c41311 oem_uvcc:nn ddr burst set 64B,hdr mode set nomal default.
Change-Id: I23e2f80425eee38d1d9f8a9289a5dbe6ddd2ff0e
2020-04-27 12:44:28 +08:00
a772523e63 Merge "oem_ipc: oem_ipc: update prebuilt web applicantion for v0.3.0" 2020-04-26 19:06:55 +08:00
1623b1214c oem_ipc: oem_ipc: update prebuilt web applicantion for v0.3.0
1.imporve auto play function when switch nav
2.except in preview, resize player by setting of substream
3.add function waiting for device get Eigenvalue of face image when
  batch input
4.add column about image feature status in face:ManagementList

Change-Id: I4d7a4293db9e1576baac73535f1bf53db35b8a32
2020-04-26 17:59:29 +08:00
cc484da612 oem_uvcc:update for eptz script
Change-Id: Id3da7263970364da0ab19b3377cf66b2836fee36
2020-04-26 16:51:53 +08:00
d986f8f6b5 Merge "oem_ipc: update prebuilt web applicantion for v0.2.9" 2020-04-23 12:59:51 +08:00
1c81629d05 oem_ipc: update prebuilt web applicantion for v0.2.9
Change-Id: I6e3b43629e126a0c55ada14c3e4ad8992d6abd65
2020-04-22 20:13:41 +08:00
1a6f44170a oem_ipc: start ipc-daemon --no-mediaserver
ipc-daemon: support reboot/reset/update

Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Change-Id: Idd520a4788b914cd5937597852f5cd24b0bb60e2
2020-04-21 09:49:09 +08:00
ea10c0f1b6 oem_ipc: add ispp init script
This CL should be reverted if the v4l2 ctrls and links
are correctly set in mediaserver/rkmedia app

Change-Id: Id27ab0ba272c33e98619abfc72309cc4be7fa181
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2020-04-20 20:53:03 +08:00
97a15f1274 Merge "oem_ipc: update prebuilt web applicantion for v0.2.8" 2020-04-20 20:16:30 +08:00
d6703b7e8a add oem_uvcc
Signed-off-by: huangjc <huangjc@rock-chips.com>
Change-Id: Iea7038371fe007c3eca270a8300e43fc931fa8de
2020-04-20 11:23:34 +08:00
80bfdd3e4e oem_ipc: update prebuilt web applicantion for v0.2.8
Change-Id: Icac02eed1a76aa41fa8b8259f5dfd0f20bc91fcb
2020-04-20 09:13:13 +08:00
9d1ac9e73b oem_ipc: update prebuilt web applicantion for v0.2.7.1
Change-Id: I3cbf6603271409e9b7a404f356f76fd152703610
2020-04-15 18:08:40 +08:00
f5e6b1ab07 oem_ipc: update prebuilt web applicantion for v0.2.7
Change-Id: I32a47a6059bf988e5b530d7098b45fbf870939a6
2020-04-14 10:29:55 +08:00
eccae8abba oem_ipc: update prebuilt web applicantion for v0.2.6
Change-Id: Iafd88f5a785b9e4dc61f0b32b4690b06a9e5aa36
2020-04-10 17:14:02 +08:00
f0578f5c0b oem_ipc: update prebuilt web applicantion for v0.2.5
Change-Id: I82efab334d49a467ea44a5f64b794bd83aa036b5
2020-04-02 18:13:07 +08:00
97f99c616a oem: ipc: add kill ipc-daemon
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I23e0c0a9b210b9f7c4d47539c685826660197132
2020-03-31 15:54:34 +08:00
3977379a39 oem_ipc: update prebuilt web applicantion for v0.2.4
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Ib61f222ec56113ecc35605ef4f0ea5f99f2de42d
2020-03-25 15:34:20 +08:00
d0d8195793 use ipc-daemon run
Change-Id: I1cc61c399227e15533a155807a56ace92dd79a61
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2020-03-20 11:53:00 +08:00
78e6bf6c30 oem_ipc: update prebuilt web applicantion for v0.2.3
deleted: /www/cgi-bin/entry.cgi

Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: I39476edc05347c90c85718763858e5e0744c43c1
2020-03-19 19:11:30 +08:00
28391e74e0 oem_ipc: update prebuilt web applicantion and fix bug
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Iaa05d0b54d25c42fbee9d54dbe492b182f4c5fc2
2020-03-13 16:27:16 +08:00
f26a61059a oem_ipc: update prebuilt web applicantion again
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Iaf0be5dc645cc858e7224df295fd8cbc2523b34e
2020-03-13 09:47:24 +08:00
c055a1a00f oem: ipc: remove mediaserver conf to /oem
Change-Id: I269388426e44e7aeacfee099ab659b3d3cd5c1d4
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2020-03-09 18:25:10 +08:00
61fa76cf18 oem: add deinit lunch script for ipc
Change-Id: Icc7422a8616e0395d630283b9262a0c916d3c831
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2020-03-04 18:52:48 +08:00
3b7d0faeb1 oem_ipc: update prebuilt web applicantion
support Lan/port/audio/video/image config

Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
Change-Id: I44ac1c2a1c8b4969c0336fd37b4cb1f9c92ad6c4
2020-02-28 00:00:05 +08:00
cbfb517be4 oem: add lunch script for ipc
Change-Id: I721359b67b902c9b49b9089747f9c62516d2f46e
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
2020-02-25 09:23:26 +08:00
481c6f8990 oem: Add prebuilt IP camera web applications
Change-Id: Ic16cf034039696f279f9c53c4356b81bf9bdfc5a
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2019-11-14 14:55:17 +08:00
62dc3fdbbc rk3308: optimize directory structure and remove unuse files
Change-Id: I11eaf882a76507da8eaef2fa03cdc2b7b97e37a1
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2018-08-23 21:38:32 +08:00
1135f6f1ce aispeech: 6mic: change record device to hw:0,0 from 6mic_loopback
Change-Id: I04045db073bf0b43484c65d971956212ad9f0656
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
2018-08-23 09:03:18 +08:00
0f8ecfd871 add .oem directory for temporary copy
Change-Id: If93d0e1260d3e217cb50c2daa5f1f34da446cb73
Signed-off-by: tony.zheng <tony.zheng@rock-chips.com>
2018-08-20 14:23:15 +08:00
9ea7e376e1 oem: Add empty oem folder
Change-Id: I22e1fffdcfc035b708d9aecac56f16fb7c578eeb
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-08-20 10:58:08 +08:00
a9b1646861 rk3308: move aispeech and dueros to oem directory
Change-Id: I05b909636d54cb75ff1e4382ade3de8088066d3e
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 21:01:53 +08:00
4ceb5692f4 move h264 sample file to oem normal
Change-Id: Ia2b42b5407019bb0d9d6e585410efff3ae07ed3b
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-18 08:45:33 +08:00
5e0c628960 add 264 raw stream for test
Change-Id: I04c057e66aaa2721c12db2657692c4b0a33fc809
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-08-08 09:29:42 +08:00
f99ae2793d add oem_normal
Change-Id: I38b73033697890791199bd527d2124a17bd69627
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
2018-07-16 15:21:23 +08:00