Skip to content

Commit de456da

Browse files
author
Alexander Matveev
committed
8317508: Provide media support for libavcodec version 60
Reviewed-by: sykora, arapte
1 parent 27594f0 commit de456da

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -2945,6 +2945,7 @@ project(":media") {
29452945
media name: "ffmpeg-3.3.3", ext: "tar.gz"
29462946
media name: "ffmpeg-4.0.2", ext: "tar.gz"
29472947
media name: "ffmpeg-5.1.2", ext: "tar.gz"
2948+
media name: "ffmpeg-6.0", ext: "tar.gz"
29482949
}
29492950
implementation project(":base")
29502951
implementation project(":graphics")
@@ -3087,7 +3088,7 @@ project(":media") {
30873088
if (t.name == "linux") {
30883089
// Pre-defined command line arguments
30893090
def cfgCMDArgs = ["sh", "configure"]
3090-
def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-yasm", "--disable-doc", "--disable-programs", "--disable-everything"]
3091+
def commonCfgArgs = ["--enable-shared", "--disable-debug", "--disable-static", "--disable-asm", "--disable-doc", "--disable-programs", "--disable-everything"]
30913092
def codecsCfgArgs = ["--enable-decoder=aac,mp3,mp3float,h264,hevc", "--enable-parser=aac,h264,hevc", "--enable-demuxer=aac,h264,hevc,mpegts,mpegtsraw"]
30923093

30933094
def copyLibAVStubs = {String fromDir, String toDir ->
@@ -3291,8 +3292,8 @@ project(":media") {
32913292
doLast {
32923293
project.ext.libav = [:]
32933294
project.ext.libav.basedir = "${buildDir}/native/linux/ffmpeg"
3294-
project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2" ]
3295-
project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59" ]
3295+
project.ext.libav.versions = [ "3.3.3", "4.0.2", "5.1.2", "6.0" ]
3296+
project.ext.libav.versionmap = [ "3.3.3" : "57", "4.0.2" : "58", "5.1.2" : "59", "6.0" : "60" ]
32963297

32973298
libav.versions.each { version ->
32983299
def libavDir = "${libav.basedir}/ffmpeg-${version}"
@@ -3372,7 +3373,7 @@ project(":media") {
33723373
project.ext.libav.libavffmpeg.versions = [ "56" ]
33733374
project.ext.libav.ffmpeg = [:]
33743375
project.ext.libav.ffmpeg.basedir = "${buildDir}/native/linux/ffmpeg/ffmpeg"
3375-
project.ext.libav.ffmpeg.versions = [ "57", "58", "59" ]
3376+
project.ext.libav.ffmpeg.versions = [ "57", "58", "59", "60" ]
33763377

33773378
project.ext.libav.versions.each { version ->
33783379
def libavDir = "${project.ext.libav.basedir}-${version}"

gradle/verification-metadata.xml

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
<sha256 value="87fe8defa37ce5f7449e36047171fed5e4c3f4bb73eaccea8c954ee81393581c" origin="Generated by Gradle"/>
2424
</artifact>
2525
</component>
26+
<component group="" name="ffmpeg-6.0" version="">
27+
<artifact name="ffmpeg-6.0-.tar.gz">
28+
<sha256 value="f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656" origin="Generated by Gradle"/>
29+
</artifact>
30+
</component>
2631
<component group="" name="icu4c-73_1-data-bin-l" version="">
2732
<artifact name="icu4c-73_1-data-bin-l-.zip">
2833
<sha256 value="4038298ee02a0c38917185ef8ff4ebde9c8b552c777fd03e4df6c6b4b1825e20" origin="Generated by Gradle"/>

modules/javafx.media/src/main/java/com/sun/media/jfxmediaimpl/NativeMediaManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ protected NativeMediaManager() {
126126
dependencies.add("avplugin-ffmpeg-57");
127127
dependencies.add("avplugin-ffmpeg-58");
128128
dependencies.add("avplugin-ffmpeg-59");
129+
dependencies.add("avplugin-ffmpeg-60");
129130
}
130131
if (PlatformUtil.isMac()) {
131132
dependencies.add("fxplugins");

modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gstreamer/gst/gstregistry.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static const int AVCODEC_LIBAV_EXPLICIT_VERSIONS[] = { 54, 56 };
146146
// For ffmpeg (libavcodec-ffmpeg.so)
147147
static const int AVCODEC_FFMPEG_EXPLICIT_VERSIONS[] = { 56 };
148148
// For libav or ffmpeg (libavcodec.so)
149-
static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59 };
149+
static const int AVCODEC_EXPLICIT_VERSIONS[] = { 57, 58, 59, 60 };
150150

151151
/*
152152
* Callback passed to dl_iterate_phdr(): finds the path of

0 commit comments

Comments
 (0)