From 672d2a530b4f321ec989918deff1ddc8b092bd97 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Fri, 22 Jul 2022 11:24:43 +0800 Subject: [PATCH 1/8] test --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..e69de29 From 796d25e0e6ffaaa7b6cc3af10163c9553413049c Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Fri, 22 Jul 2022 11:29:46 +0800 Subject: [PATCH 2/8] test --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index e69de29..0000000 From 9bf536aec1dffcf2533d959adf63708d35e9d972 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Sat, 30 Jul 2022 13:53:13 +0800 Subject: [PATCH 3/8] ffmpeg pushes RTMP with error conversion failed --- .../ffmpeg_canaan/0031-buildroot-ffmpeg.patch | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package/ffmpeg_canaan/0031-buildroot-ffmpeg.patch diff --git a/package/ffmpeg_canaan/0031-buildroot-ffmpeg.patch b/package/ffmpeg_canaan/0031-buildroot-ffmpeg.patch new file mode 100644 index 0000000..b8ed7f9 --- /dev/null +++ b/package/ffmpeg_canaan/0031-buildroot-ffmpeg.patch @@ -0,0 +1,21 @@ +Index: b/libavformat/librtmp.c +=================================================================== +--- a/libavformat/librtmp.c ++++ b/libavformat/librtmp.c +@@ -263,7 +263,15 @@ static int rtmp_write(URLContext *s, con + + int ret = RTMP_Write(r, buf, size); + if (!ret) +- return AVERROR_EOF; ++ { ++ //In the internal implementation of function RTMP_Write, when size<11, it returns false ++ if (size < 11) ++ { ++ return size; ++ } ++ return AVERROR_EOF; ++ } ++ + return ret; + } + From 4af138ced14b2832879152b7efc361048d2f8824 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Tue, 9 Aug 2022 17:28:55 +0800 Subject: [PATCH 4/8] encod JPEG, QP exceeds 51 coredump --- package/encode_app/src/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/package/encode_app/src/main.cpp b/package/encode_app/src/main.cpp index 439cac5..9665f51 100755 --- a/package/encode_app/src/main.cpp +++ b/package/encode_app/src/main.cpp @@ -2382,6 +2382,7 @@ int main(int argc, char *argv[]) printf("slice qp error\n"); return -1; } + pCtx->Cfg[i].MaxQP = pCtx->Cfg[i].SliceQP; } else { From b92fab180e621f29e47e1fea4cae425fd90af350 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Tue, 9 Aug 2022 17:56:48 +0800 Subject: [PATCH 5/8] modify jpeg maxqp value --- package/encode_app/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/encode_app/src/main.cpp b/package/encode_app/src/main.cpp index 9665f51..3076067 100755 --- a/package/encode_app/src/main.cpp +++ b/package/encode_app/src/main.cpp @@ -2382,7 +2382,7 @@ int main(int argc, char *argv[]) printf("slice qp error\n"); return -1; } - pCtx->Cfg[i].MaxQP = pCtx->Cfg[i].SliceQP; + pCtx->Cfg[i].MaxQP = 100; } else { From 4bc37bfb7c37a5f75d728337936ea00d8b384861 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Tue, 9 Aug 2022 18:05:30 +0800 Subject: [PATCH 6/8] modify maxqp --- package/encode_app/src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/encode_app/src/main.cpp b/package/encode_app/src/main.cpp index 3076067..b242e1c 100755 --- a/package/encode_app/src/main.cpp +++ b/package/encode_app/src/main.cpp @@ -2382,7 +2382,8 @@ int main(int argc, char *argv[]) printf("slice qp error\n"); return -1; } - pCtx->Cfg[i].MaxQP = 100; + if (pCtx->Cfg[i].SliceQP > pCtx->Cfg[i].MaxQP) + pCtx->Cfg[i].MaxQP = pCtx->Cfg[i].SliceQP; } else { From 026676502b9d4730b0bf6780e198db97b456e8a9 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Sun, 28 Aug 2022 14:37:27 +0800 Subject: [PATCH 7/8] DAC output error, left and right channels reversed --- .../linux/0026-DAC-channel-reversed.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 package/patches/linux/0026-DAC-channel-reversed.patch diff --git a/package/patches/linux/0026-DAC-channel-reversed.patch b/package/patches/linux/0026-DAC-channel-reversed.patch new file mode 100644 index 0000000..2f67112 --- /dev/null +++ b/package/patches/linux/0026-DAC-channel-reversed.patch @@ -0,0 +1,25 @@ +From f1cc881b652a0b003d7d447dd7e578667b87e4b0 Mon Sep 17 00:00:00 2001 +From: gh-sxp +Date: Sun, 28 Aug 2022 14:27:15 +0800 +Subject: [PATCH] modify nau8822 + +--- + sound/soc/codecs/nau8822.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/codecs/nau8822.c b/sound/soc/codecs/nau8822.c +index bb061740..0086a471 100644 +--- a/sound/soc/codecs/nau8822.c ++++ b/sound/soc/codecs/nau8822.c +@@ -40,7 +40,7 @@ static const struct reg_default nau8822_reg_defaults[] = { + { NAU8822_REG_POWER_MANAGEMENT_1, 0x0000 }, + { NAU8822_REG_POWER_MANAGEMENT_2, 0x0000 }, + { NAU8822_REG_POWER_MANAGEMENT_3, 0x0000 }, +- { NAU8822_REG_AUDIO_INTERFACE, 0x0050 }, ++ { NAU8822_REG_AUDIO_INTERFACE, 0x0054 }, + { NAU8822_REG_COMPANDING_CONTROL, 0x0000 }, + { NAU8822_REG_CLOCKING, 0x0140 }, + { NAU8822_REG_ADDITIONAL_CONTROL, 0x0000 }, +-- +2.36.1 + From f95de2971c0c2e0412e5cf4659f5e3c802d17ff5 Mon Sep 17 00:00:00 2001 From: gh-sxp Date: Sun, 4 Sep 2022 16:41:04 +0800 Subject: [PATCH 8/8] Multi channel RTSP audio push problem --- package/encode_app/src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/encode_app/src/main.cpp b/package/encode_app/src/main.cpp index c7f8907..7383b5f 100755 --- a/package/encode_app/src/main.cpp +++ b/package/encode_app/src/main.cpp @@ -1602,8 +1602,8 @@ static void *audio_process(void *arg) nG711Len = encode(pCtx->audio_buffer,(char*)sEncAudioBuf,pCtx->audio_size,G711_A_LAW); if(nG711Len > 0) { - //printf("=========audio g711 size:%d\n",nG711Len); - pCtx->pRtspServer[0]->PushAudioData(sEncAudioBuf, nG711Len, 0); + for(int i =0;i ch_cnt; i++) + pCtx->pRtspServer[i]->PushAudioData(sEncAudioBuf, nG711Len, 0); } if(received_sigterm == 1)