* Re: [FFmpeg-devel] [PATCH] libavformat\file:Fix duplicate JNI symbols
2024-03-23 19:05 [FFmpeg-devel] [PATCH] libavformat\file:Fix duplicate JNI symbols admin
@ 2024-03-24 2:16 ` Zhao Zhili
2024-03-24 4:09 ` Zhao Zhili
2024-03-24 5:17 ` [FFmpeg-devel] [PATCH] avcodec, avformat/ffjni: fix " Leo Izen
2024-03-24 13:23 ` [FFmpeg-devel] [PATCH] libavformat\file:Fix " Andreas Rheinhardt
2 siblings, 1 reply; 7+ messages in thread
From: Zhao Zhili @ 2024-03-24 2:16 UTC (permalink / raw)
To: ffmpeg-devel
On 2024/3/24 03:05, admin@shaoxia.xyz wrote:
> From: 联盟少侠 <admin@shaoxia.xyz>
Could you configure git to avoid Chinese character?
>
> The errors indicate that there are multiple definitions of several JNI (Java Native Interface) symbols in the FFmpeg library. Specifically, the linker ld.lld has found duplicate definitions for the following symbols:
How to reproduce the error?
>
> - ff_jni_get_env
> - ff_jni_jstring_to_utf_chars
> - ff_jni_utf_chars_to_jstring
> - ff_jni_exception_get_summary
> - ff_jni_exception_check
> - ff_jni_init_jfields
> - ff_jni_reset_jfields
>
> These symbols are defined in both libavcodec.a and libavformat.a archives, leading to conflicts during the linking process. The duplicates are found in the same source file ffjni.c, but they are being compiled into two different static libraries.
>
> To resolve these errors, ensure that each symbol is defined only once across all linked libraries, or if these symbols are required in both libraries, they should be marked as weak symbols to allow the linker to handle them appropriately. Additionally, check for any build script misconfigurations that may be causing the same file to be included in multiple libraries.
> ---
> libavformat/file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/file.c b/libavformat/file.c
> index dd5819c..fa13ae9 100644
> --- a/libavformat/file.c
> +++ b/libavformat/file.c
> @@ -43,7 +43,7 @@
> #if CONFIG_ANDROID_CONTENT_PROTOCOL
> #include <jni.h>
> #include "libavcodec/jni.h"
> -#include "libavcodec/ffjni.c"
> +#include "libavcodec/ffjni.h"
> #endif
This just break --enable-shared, so NACK.
>
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread
* [FFmpeg-devel] [PATCH] avcodec, avformat/ffjni: fix duplicate JNI symbols
2024-03-23 19:05 [FFmpeg-devel] [PATCH] libavformat\file:Fix duplicate JNI symbols admin
2024-03-24 2:16 ` Zhao Zhili
@ 2024-03-24 5:17 ` Leo Izen
2024-03-24 13:19 ` Matthieu Bouron
2024-03-24 13:23 ` [FFmpeg-devel] [PATCH] libavformat\file:Fix " Andreas Rheinhardt
2 siblings, 1 reply; 7+ messages in thread
From: Leo Izen @ 2024-03-24 5:17 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Leo Izen
Use SHLIBOBJS and STLIBOBJS in the Makefiles for avcodec and avformat,
and add a stub ffjni.c to libavformat, which allows the symbols to be
duplicated for shared builds but not static builds.
Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
libavcodec/Makefile | 1 +
libavformat/Makefile | 1 +
libavformat/ffjni.c | 23 +++++++++++++++++++++++
libavformat/file.c | 2 +-
4 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 libavformat/ffjni.c
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7ef2e03ca6..2446db51fd 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1068,6 +1068,7 @@ STLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
STLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
+STLIBOBJS-$(CONFIG_JNI) += ffjni.o
STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
STLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 44aa485029..a89df7e9a3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -728,6 +728,7 @@ SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
+SHLIBOBJS-$(CONFIG_JNI) += ffjni.o
SHLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
diff --git a/libavformat/ffjni.c b/libavformat/ffjni.c
new file mode 100644
index 0000000000..2b1483cf42
--- /dev/null
+++ b/libavformat/ffjni.c
@@ -0,0 +1,23 @@
+/*
+ * JNI utility functions - included stub
+ *
+ * Copyright (c) 2024 Leo Izen <leo.izen@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavcodec/ffjni.c"
diff --git a/libavformat/file.c b/libavformat/file.c
index dd5819c06f..fa13ae9a6c 100644
--- a/libavformat/file.c
+++ b/libavformat/file.c
@@ -43,7 +43,7 @@
#if CONFIG_ANDROID_CONTENT_PROTOCOL
#include <jni.h>
#include "libavcodec/jni.h"
-#include "libavcodec/ffjni.c"
+#include "libavcodec/ffjni.h"
#endif
--
2.44.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec, avformat/ffjni: fix duplicate JNI symbols
2024-03-24 5:17 ` [FFmpeg-devel] [PATCH] avcodec, avformat/ffjni: fix " Leo Izen
@ 2024-03-24 13:19 ` Matthieu Bouron
0 siblings, 0 replies; 7+ messages in thread
From: Matthieu Bouron @ 2024-03-24 13:19 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Leo Izen
On Sun, Mar 24, 2024 at 01:17:41AM -0400, Leo Izen wrote:
> Use SHLIBOBJS and STLIBOBJS in the Makefiles for avcodec and avformat,
> and add a stub ffjni.c to libavformat, which allows the symbols to be
> duplicated for shared builds but not static builds.
>
> Signed-off-by: Leo Izen <leo.izen@gmail.com>
> ---
> libavcodec/Makefile | 1 +
> libavformat/Makefile | 1 +
> libavformat/ffjni.c | 23 +++++++++++++++++++++++
> libavformat/file.c | 2 +-
> 4 files changed, 26 insertions(+), 1 deletion(-)
> create mode 100644 libavformat/ffjni.c
>
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 7ef2e03ca6..2446db51fd 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -1068,6 +1068,7 @@ STLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
> STLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
> STLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
> STLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
> +STLIBOBJS-$(CONFIG_JNI) += ffjni.o
> STLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
> STLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
> STLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index 44aa485029..a89df7e9a3 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -728,6 +728,7 @@ SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
> SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
> SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
> SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o
> +SHLIBOBJS-$(CONFIG_JNI) += ffjni.o
> SHLIBOBJS-$(CONFIG_JPEGXL_ANIM_DEMUXER) += jpegxl_parse.o
> SHLIBOBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio_sample_rates.o
> SHLIBOBJS-$(CONFIG_MOV_DEMUXER) += ac3_channel_layout_tab.o
> diff --git a/libavformat/ffjni.c b/libavformat/ffjni.c
> new file mode 100644
> index 0000000000..2b1483cf42
> --- /dev/null
> +++ b/libavformat/ffjni.c
> @@ -0,0 +1,23 @@
> +/*
> + * JNI utility functions - included stub
> + *
> + * Copyright (c) 2024 Leo Izen <leo.izen@gmail.com>
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#include "libavcodec/ffjni.c"
> diff --git a/libavformat/file.c b/libavformat/file.c
> index dd5819c06f..fa13ae9a6c 100644
> --- a/libavformat/file.c
> +++ b/libavformat/file.c
> @@ -43,7 +43,7 @@
> #if CONFIG_ANDROID_CONTENT_PROTOCOL
> #include <jni.h>
> #include "libavcodec/jni.h"
> -#include "libavcodec/ffjni.c"
> +#include "libavcodec/ffjni.h"
> #endif
>
>
> --
> 2.44.0
LGTM. Sorry for the regression.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavformat\file:Fix duplicate JNI symbols
2024-03-23 19:05 [FFmpeg-devel] [PATCH] libavformat\file:Fix duplicate JNI symbols admin
2024-03-24 2:16 ` Zhao Zhili
2024-03-24 5:17 ` [FFmpeg-devel] [PATCH] avcodec, avformat/ffjni: fix " Leo Izen
@ 2024-03-24 13:23 ` Andreas Rheinhardt
2024-03-24 14:59 ` Zhao Zhili
2 siblings, 1 reply; 7+ messages in thread
From: Andreas Rheinhardt @ 2024-03-24 13:23 UTC (permalink / raw)
To: ffmpeg-devel
admin@shaoxia.xyz:
> From: 联盟少侠 <admin@shaoxia.xyz>
>
> The errors indicate that there are multiple definitions of several JNI (Java Native Interface) symbols in the FFmpeg library. Specifically, the linker ld.lld has found duplicate definitions for the following symbols:
>
> - ff_jni_get_env
> - ff_jni_jstring_to_utf_chars
> - ff_jni_utf_chars_to_jstring
> - ff_jni_exception_get_summary
> - ff_jni_exception_check
> - ff_jni_init_jfields
> - ff_jni_reset_jfields
>
> These symbols are defined in both libavcodec.a and libavformat.a archives, leading to conflicts during the linking process. The duplicates are found in the same source file ffjni.c, but they are being compiled into two different static libraries.
>
> To resolve these errors, ensure that each symbol is defined only once across all linked libraries, or if these symbols are required in both libraries, they should be marked as weak symbols to allow the linker to handle them appropriately. Additionally, check for any build script misconfigurations that may be causing the same file to be included in multiple libraries.
> ---
> libavformat/file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/file.c b/libavformat/file.c
> index dd5819c..fa13ae9 100644
> --- a/libavformat/file.c
> +++ b/libavformat/file.c
> @@ -43,7 +43,7 @@
> #if CONFIG_ANDROID_CONTENT_PROTOCOL
> #include <jni.h>
> #include "libavcodec/jni.h"
> -#include "libavcodec/ffjni.c"
> +#include "libavcodec/ffjni.h"
> #endif
>
>
How can this even happen? In case of static builds with the android
content protocol enabled, libavformat/file.o provides all the symbols
that libavcodec/ffjni.o also provides. Given that the former is part of
libavformat.a and this is linked before libavcodec.a, the stuff from the
former is used and the ffjni.o in libavcodec.a should not be pulled in
at all.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavformat\file:Fix duplicate JNI symbols
2024-03-24 13:23 ` [FFmpeg-devel] [PATCH] libavformat\file:Fix " Andreas Rheinhardt
@ 2024-03-24 14:59 ` Zhao Zhili
0 siblings, 0 replies; 7+ messages in thread
From: Zhao Zhili @ 2024-03-24 14:59 UTC (permalink / raw)
To: ffmpeg-devel
On 2024/3/24 21:23, Andreas Rheinhardt wrote:
> admin@shaoxia.xyz:
>> From: 联盟少侠 <admin@shaoxia.xyz>
>>
>> The errors indicate that there are multiple definitions of several JNI (Java Native Interface) symbols in the FFmpeg library. Specifically, the linker ld.lld has found duplicate definitions for the following symbols:
>>
>> - ff_jni_get_env
>> - ff_jni_jstring_to_utf_chars
>> - ff_jni_utf_chars_to_jstring
>> - ff_jni_exception_get_summary
>> - ff_jni_exception_check
>> - ff_jni_init_jfields
>> - ff_jni_reset_jfields
>>
>> These symbols are defined in both libavcodec.a and libavformat.a archives, leading to conflicts during the linking process. The duplicates are found in the same source file ffjni.c, but they are being compiled into two different static libraries.
>>
>> To resolve these errors, ensure that each symbol is defined only once across all linked libraries, or if these symbols are required in both libraries, they should be marked as weak symbols to allow the linker to handle them appropriately. Additionally, check for any build script misconfigurations that may be causing the same file to be included in multiple libraries.
>> ---
>> libavformat/file.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavformat/file.c b/libavformat/file.c
>> index dd5819c..fa13ae9 100644
>> --- a/libavformat/file.c
>> +++ b/libavformat/file.c
>> @@ -43,7 +43,7 @@
>> #if CONFIG_ANDROID_CONTENT_PROTOCOL
>> #include <jni.h>
>> #include "libavcodec/jni.h"
>> -#include "libavcodec/ffjni.c"
>> +#include "libavcodec/ffjni.h"
>> #endif
>>
>>
> How can this even happen? In case of static builds with the android
> content protocol enabled, libavformat/file.o provides all the symbols
> that libavcodec/ffjni.o also provides. Given that the former is part of
> libavformat.a and this is linked before libavcodec.a, the stuff from the
> former is used and the ffjni.o in libavcodec.a should not be pulled in
> at all.
I guess the error is triggered by creating a shared library from combine
all static libraries
via -Wl,--whole-archive. It's a common practice to reduce the number of
shared libraries
in mobile app.
>
> - Andreas
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 7+ messages in thread