Commit cc1d0432 authored by hebohua's avatar hebohua

improve arc qpmap

parent c8984e1f
......@@ -362,7 +362,7 @@ copy_files "$1"
git checkout sdk/sample/source/mkconfig
mv sdk/sample/source/sample_hapi_streamer/sample_hapi_streamer system_temp/bin/streamer_ipc
# cp sdk/sample/source/sample_hapi_media/sample_hapi_media system_temp/bin/streamer_media
cp sdk/sample/source/lib/libArcEncCam*.so system_temp/lib/
cp sdk/bin/ipc_*.json system_temp/bin/
cp system/configs system_temp/ -r
......
......@@ -35,7 +35,7 @@
"venc": [
{
"enable": 1, "devid": 0, "channel": 0, "smartrc": 1, "smartsei": 1,
"format": "h265", "width": 2560, "height": 1440, "rcmode": "arcbr", "bitrate": 1024000,
"format": "h265", "width": 1920, "height": 1080, "rcmode": "arcbr", "bitrate": 1024000,
"region": [
{
"enable": 0, "osd": "image",
......@@ -50,19 +50,19 @@
}
]
},
{
"enable": 0, "devid": 0, "channel": 1, "smartrc": 1, "smartsei": 1,
"format": "h265", "width": 1280, "height": 720, "rcmode": "cbr", "bitrate": 1024000,
{
"enable": 1, "devid": 0, "channel": 1, "smartrc": 1, "smartsei": 1,
"format": "h265", "width": 1920, "height": 1080, "rcmode": "avbr", "bitrate": 1024000,
"region": [
{
"enable": 1, "osd": "image",
{
"enable": 0, "osd": "image",
"rect": { "x": 32, "y": 32, "width": 256, "height": 128 },
"color": [ 16777215, 6171602, 16745541 ],
"file": "/acme/bin/logo256x128.2bpp"
},
{
"enable": 1, "osd": "time",
"rect": { "x": 448, "y": 624, "width": 800, "height": 64 },
{
"enable": 0, "osd": "time",
"rect": { "x": 448, "y": 624, "width": 800, "height": 64 },
"color": [ 16777215, 6171602, 16745541 ]
}
]
......
......@@ -141,6 +141,10 @@ typedef struct saVENC_RC_MIN_BR_S {
SA_U32 u32MaxBitRate; /* RW; maximum bitrare in bps; Range:[2000, 50000000] */
} VENC_RC_MIN_BR_S;
typedef struct saVENC_RC_BYPASS_S {
SA_U8 u8FrameRate; /* fps the input frame rate of the venc chnnel, default = 15 */
} VENC_RC_BYPASS_S;
/* the attribute of JPEG constant quality factor */
typedef struct saVENC_RC_JPEG_FIXQP_S {
SA_U8 u8Qfactor; /* RW; quality factor, higher --> better image qulity; Range:[1, 100] */
......@@ -160,6 +164,7 @@ typedef struct saVENC_RC_ATTR_S {
VENC_RC_CAPPED_VBR_S stCvbr;
VENC_RC_ADAPTIVE_VBR_S stAvbr;
VENC_RC_MIN_BR_S stMinBr;
VENC_RC_BYPASS_S stBypass;
VENC_RC_JPEG_FIXQP_S stJpegFixQp;
};
} VENC_RC_ATTR_S;
......
libispalg.so.2.5.0.9.6
\ No newline at end of file
libive.so.2.5.0.9.6
\ No newline at end of file
liblapi.so.2.5.0.9.6
\ No newline at end of file
libmapi.so.2.5.0.9.6
\ No newline at end of file
libvqe.so.2.5.0.9.6
\ No newline at end of file
......@@ -543,10 +543,10 @@ SA_S32 SA_INNER_HAPI_VENC_GetChnConfig(SA_U32 u32Chn, SA_VIDEO_SCENE_E enScene,
memcpy(pstChnAttr->stChnAttr.stRcAttr.stAvbr.u8BrCoef, au8BrCoef, VENC_AVBR_COEF_NUM);
break;
case VENC_RC_MODE_BYPASS:
#ifdef XIANGSU_RC
pstChnAttr->stChnAttr.stRcAttr.stBypass.u8FrameRate = s32Fps;
pstChnAttr->u32Bitrate = pstSceneChn->astVencConfig[u32Chn].u32Bitrate;
break;
#endif
/* todo: code */
break;
default:
......
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