Add -gpl extension to FFmpeg (#419) #950

tmurakam · 2020-09-20T14:57:03Z

add '-nogpl' extension.
cppbuild.sh: Disable GPL modules.
setup-source.sh: patch postproc.java.

- add '-nogpl' extension. - cppbuild.sh: Disable GPL modules. - setup-source.sh: patch postproc.java.

ffmpeg/cppbuild.sh

- Add -gpl extension and remove -nogpl extension. - Add more options for default (non-GPL) profile.

tmurakam · 2020-09-21T07:06:32Z

I had updated following points:

Add '-gpl' extension and remove '-nogpl' (Default is non-GPL)
Add more options for default profile.
Fix presets/*.java and add -gpl extension.

saudet · 2020-09-21T21:28:52Z

We only need to have one "extension" line like this in avutil and it should work:
https://github.com/bytedeco/javacpp-presets/blob/master/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_core.java#L72
Can you let me know what happens with that?

We can also do it like this for modules that are only available with extension like postproc:
https://github.com/bytedeco/javacpp-presets/blob/master/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_cudaarithm.java
That way, it doesn't get processed without extension.

tmurakam · 2020-09-22T00:28:14Z

We only need to have one "extension" line like this in avutil and it should work:

I've tried it, but it does not work for default (without) extension build. (It works for -gpl extension).
When remove the "extension" line for default, the source code is not generated (src/gen folder is empty), and no shared library are included in the jar file.

We can also do it like this for modules that are only available with extension like postproc:

It does not work, the compilation fails:

[ERROR] /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInOut.java:[18,1] package org.bytedeco.ffmpeg.postproc does not exist

Any ideas?

saudet · 2020-09-22T00:48:17Z

It works for OpenCV, it'll work with FFmpeg for sure. Show me what you tried exactly.

tmurakam · 2020-09-22T01:14:28Z

It works for OpenCV, it'll work with FFmpeg for sure. Show me what you tried exactly.

Here is my reproduce steps.

First clone my repo from https://github.com/javacpp-nogpl/javacpp-presets on CentOS 7 machine, then:

# checkout working branch. The branch has only have one extension for presets/*.java (except for postproc).
git checkout ffmpeg-nogpl-extension-work

# Build ffmpeg for default (without extension)
mvn -pl ffmpeg install

The generated ffmpeg/target/ffmpeg-linux-x86_64.jar does not contains *.so files.

It seems that the presets/*.java file is not processed in javacpp:parse goal.

[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java                                                        
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java                                             
[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avdevice.java                                                       
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avdevice.java                                            
[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avfilter.java                                                       
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avfilter.java                                            
[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avformat.java                                                       
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avformat.java                                            
[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java                                                         
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java                                              
[WARNING] Could not load platform properties for class org.bytedeco.ffmpeg.presets.postproc                                                                            
[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swresample.java                                                     
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swresample.java                                          
[INFO] Targeting /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swscale.java                                                        
[INFO] Nothing targeted for /home/tmurakam/dev/javacpp-presets/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swscale.java

saudet · 2020-09-22T01:41:50Z

I don't see a @Platform(extension = "-gpl") line in avutil anywhere.

tmurakam · 2020-09-22T02:38:57Z

I understood how to write extension line.
I had updated the presets/*.java except for postprocess.

But I don't understand how to fix the postprocess.java, because the postprocess.h does not exist when --disable-gpl mode...

saudet · 2020-09-22T02:54:30Z

Check the CUDA module for OpenCV above. If there are includes given only for an extension, they'll get ignored without extension.

tmurakam · 2020-09-22T03:02:15Z

Check the CUDA module for OpenCV above. If there are includes given only for an extension, they'll get ignored without extension.

It seems it does not work for FFmpeg, because avfilter inherits postproc:

@Properties(
    inherit = {avformat.class, postproc.class, swresample.class, swscale.class},

Can we remove the inheritance?

saudet · 2020-09-22T03:17:17Z

That should still be fine.

- avfilter: do not inherit postproc. - postproc: merge default/gpl code.

tmurakam · 2020-09-22T04:01:40Z

Ok, I had fixed the postproc and avfilter.

saudet · 2020-09-22T05:49:04Z

We should only need @Platform(extension = "-gpl") in avutil because it gets inherited.

tmurakam · 2020-09-22T07:30:28Z

I had removed unnecessary @Platform(extension = "-gpl") lines.

ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avfilter.java

tmurakam · 2020-09-22T09:20:58Z

I had push the commit which revert the avfilter.java to inherit postproc.

saudet

Let's also update the pom.xml file in README.md and the samples subdirectory with something like this:

<project>
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.bytedeco.ffmpeg</groupId>
    <artifactId>readfewframe</artifactId>
    <version>1.5.5-SNAPSHOT</version>
    <properties>
        <exec.mainClass>ReadFewFrame</exec.mainClass>
    </properties>
    <dependencies>
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>ffmpeg-platform</artifactId>
            <version>4.3.1-1.5.5-SNAPSHOT</version>
        </dependency>

        <!-- Optional GPL builds with (almost) everything enabled -->
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>ffmpeg-platform-gpl</artifactId>
            <version>4.3.1-1.5.5-SNAPSHOT</version>
        </dependency>
    </dependencies>
    <build>
        <sourceDirectory>.</sourceDirectory>
    </build>
</project>

ffmpeg/cppbuild.sh

ffmpeg/platform/gpl/pom.xml

ffmpeg/pom.xml

ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avcodec.java

tmurakam · 2020-09-23T03:20:50Z

I had updated the README.
I think "ffmpeg-platform" and "ffmpeg-platform-gpl" are exclusive, so we can use only one of them.

        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>ffmpeg-platform</artifactId>
            <version>4.3.1-1.5.5-SNAPSHOT</version>
        </dependency>

        <!-- Optional GPL builds with (almost) everything enabled -->
        <dependency>
            <groupId>org.bytedeco</groupId>
            <artifactId>ffmpeg-platform-gpl</artifactId>
            <version>4.3.1-1.5.5-SNAPSHOT</version>
        </dependency>

saudet · 2020-09-23T03:23:04Z

I had updated the README.
I think "ffmpeg-platform" and "ffmpeg-platform-gpl" are exclusive, so we can use only one of them.

No, they are not mutually exclusive. The extension can be given at runtime. Also update sample/pom.xml, thanks!

tmurakam · 2020-09-23T03:31:09Z

No, they are not mutually exclusive. The extension can be given at runtime. Also update sample/pom.xml, thanks!

Ok, I understood. I fixed the README and samples/pom.xml.

ffmpeg/platform/gpl/pom.xml

saudet · 2020-09-23T03:45:57Z

One last thing is that we'll need to add -gpl builds to .travis.yml and .appveyor.yml like this:

...
      - os: linux
        env: PROJ=ffmpeg OS=android-arm
        install: true
        script: ./ci/install-travis.sh
      - os: linux
        env: PROJ=ffmpeg OS=android-arm EXT=-gpl
        install: true
        script: ./ci/install-travis.sh
etc...

tmurakam · 2020-09-23T04:04:48Z

I had updated the .travis.yml and .appveyor.yml.

.appveyor.yml

…(pull bytedeco/javacpp-presets#950)

tmurakam added 2 commits September 20, 2020 23:54

Add nogpl extention to FFmpeg (bytedeco#419)

1280511

- add '-nogpl' extension. - cppbuild.sh: Disable GPL modules. - setup-source.sh: patch postproc.java.

Fix: add -nogpl extension to ffmpeg

6665a2f

tmurakam force-pushed the ffmpeg-nogpl-extension branch from d1a354a to 6665a2f Compare September 20, 2020 16:54

saudet reviewed Sep 20, 2020

View reviewed changes

ffmpeg/cppbuild.sh Outdated Show resolved Hide resolved

Add -gpl extension to FFmpeg instead of -nogpl

2e2675c

- Add -gpl extension and remove -nogpl extension. - Add more options for default (non-GPL) profile.

Fix: replace postproc.java of FFmpeg for non-gpl version.

c89ddcc

tmurakam force-pushed the ffmpeg-nogpl-extension branch from da03bde to c89ddcc Compare September 22, 2020 02:32

Update: update extension line of FFmpeg

8a149af

Update: update postproc of FFmpeg

8c2a8d4

- avfilter: do not inherit postproc. - postproc: merge default/gpl code.

tmurakam changed the title ~~Add -nogpl extension to FFmpeg (#419)~~ Add -gpl extension to FFmpeg (#419) Sep 22, 2020

Add ffmpeg -gpl platform pom.xml

bc1db66

Remove unnecessary -gpl extension of FFmpeg

3239293

saudet reviewed Sep 22, 2020

View reviewed changes

ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avfilter.java Outdated Show resolved Hide resolved

Revert: revert avfilter to inherit postproc in FFmpeg

0f62187

saudet requested changes Sep 23, 2020

View reviewed changes

ffmpeg/cppbuild.sh Show resolved Hide resolved

ffmpeg/platform/gpl/pom.xml Outdated Show resolved Hide resolved

ffmpeg/pom.xml Outdated Show resolved Hide resolved

ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avcodec.java Outdated Show resolved Hide resolved

Update: update pom.xml, README, etc of FFmpeg

31fb823

Update: simplify cppbuild.sh of FFmpeg

98d459e

Update: README, samples/pom.xml of FFmpeg

e7f5c9c

saudet requested changes Sep 23, 2020

View reviewed changes

ffmpeg/platform/gpl/pom.xml Outdated Show resolved Hide resolved

tmurakam added 2 commits September 23, 2020 12:55

Fix: platform/gpl/pom.xml of FFmpet

f61a04b

Update .travis.yml / .appveyor.yml to build FFmpeg "-gpl" extension

ab568d4

saudet requested changes Sep 23, 2020

View reviewed changes

.appveyor.yml Outdated Show resolved Hide resolved

Fix .appveyor.yml for FFmpeg -gpl build

436e5e1

saudet approved these changes Sep 24, 2020

View reviewed changes

saudet merged commit cc6e41b into bytedeco:master Sep 24, 2020

saudet mentioned this pull request Sep 29, 2020

jniavcodec.dll: Can't find dependent libraries #940

Closed

saudet added a commit to bytedeco/javacv that referenced this pull request Oct 8, 2020

* Update unit tests to use codecs available in FFmpeg under LGPL v3 …

624cc87

…(pull bytedeco/javacpp-presets#950)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add -gpl extension to FFmpeg (#419) #950

Add -gpl extension to FFmpeg (#419) #950

tmurakam commented Sep 20, 2020

tmurakam commented Sep 21, 2020 •

edited

Loading

saudet commented Sep 21, 2020

tmurakam commented Sep 22, 2020 •

edited

Loading

saudet commented Sep 22, 2020

tmurakam commented Sep 22, 2020 •

edited

Loading

saudet commented Sep 22, 2020

tmurakam commented Sep 22, 2020

saudet commented Sep 22, 2020 via email

tmurakam commented Sep 22, 2020 •

edited

Loading

saudet commented Sep 22, 2020 via email

tmurakam commented Sep 22, 2020 •

edited

Loading

saudet commented Sep 22, 2020

tmurakam commented Sep 22, 2020

tmurakam commented Sep 22, 2020

saudet left a comment •

edited

Loading

tmurakam commented Sep 23, 2020

saudet commented Sep 23, 2020

tmurakam commented Sep 23, 2020

saudet commented Sep 23, 2020

tmurakam commented Sep 23, 2020

Add -gpl extension to FFmpeg (#419) #950

Add -gpl extension to FFmpeg (#419) #950

Conversation

tmurakam commented Sep 20, 2020

tmurakam commented Sep 21, 2020 • edited Loading

saudet commented Sep 21, 2020

tmurakam commented Sep 22, 2020 • edited Loading

saudet commented Sep 22, 2020

tmurakam commented Sep 22, 2020 • edited Loading

saudet commented Sep 22, 2020

tmurakam commented Sep 22, 2020

saudet commented Sep 22, 2020 via email

tmurakam commented Sep 22, 2020 • edited Loading

saudet commented Sep 22, 2020 via email

tmurakam commented Sep 22, 2020 • edited Loading

saudet commented Sep 22, 2020

tmurakam commented Sep 22, 2020

tmurakam commented Sep 22, 2020

saudet left a comment • edited Loading

Choose a reason for hiding this comment

tmurakam commented Sep 23, 2020

saudet commented Sep 23, 2020

tmurakam commented Sep 23, 2020

saudet commented Sep 23, 2020

tmurakam commented Sep 23, 2020

tmurakam commented Sep 21, 2020 •

edited

Loading

tmurakam commented Sep 22, 2020 •

edited

Loading

tmurakam commented Sep 22, 2020 •

edited

Loading

tmurakam commented Sep 22, 2020 •

edited

Loading

tmurakam commented Sep 22, 2020 •

edited

Loading

saudet left a comment •

edited

Loading