Skip to content

Commit

Permalink
Modularize presets for FFmpeg (pull #669)
Browse files Browse the repository at this point in the history
  • Loading branch information
HGuillemet authored and saudet committed Jan 19, 2019
1 parent c406ff2 commit 5c03601
Show file tree
Hide file tree
Showing 139 changed files with 18,077 additions and 15,789 deletions.
8 changes: 4 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ environment:
OS: windows-x86
# - PROJ: "artoolkitplus,chilitags,flandmark"
# OS: windows-x86
# - PROJ: "ffmpeg"
# OS: windows-x86
- PROJ: "ffmpeg"
OS: windows-x86
# - PROJ: "flycapture,spinnaker,libdc1394,libfreenect,librealsense,videoinput"
# OS: windows-x86
# - PROJ: "hdf5"
Expand All @@ -39,8 +39,8 @@ environment:
OS: windows-x86_64
# - PROJ: "artoolkitplus,chilitags,flandmark"
# OS: windows-x86_64
# - PROJ: "ffmpeg"
# OS: windows-x86_64
- PROJ: "ffmpeg"
OS: windows-x86_64
# - PROJ: "flycapture,spinnaker,libdc1394,libfreenect,libfreenect2,librealsense,videoinput"
# OS: windows-x86_64
# - PROJ: "hdf5"
Expand Down
74 changes: 37 additions & 37 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=android-arm
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=android-arm
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=android-arm
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=openblas OS=android-arm
# install: true
Expand All @@ -55,10 +55,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=android-arm64
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=android-arm64
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=android-arm64
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=openblas OS=android-arm64
# install: true
Expand All @@ -84,10 +84,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=android-x86
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=android-x86
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=android-x86
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=openblas OS=android-x86
# install: true
Expand All @@ -113,10 +113,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=android-x86_64
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=android-x86_64
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=android-x86_64
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=openblas OS=android-x86_64
# install: true
Expand Down Expand Up @@ -174,10 +174,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=linux-armhf
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=linux-armhf
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=linux-armhf
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=flycapture,libdc1394,libfreenect OS=linux-armhf
# install: true
Expand Down Expand Up @@ -207,10 +207,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=linux-ppc64le
# install: true
# script: ./ci/install-ppc.sh
# - os: linux
# env: PROJ=ffmpeg OS=linux-ppc64le
# install: true
# script: ./ci/install-ppc.sh
- os: linux
env: PROJ=ffmpeg OS=linux-ppc64le
install: true
script: ./ci/install-ppc.sh
# - os: linux
# env: PROJ=libdc1394,libfreenect OS=linux-ppc64le
# install: true
Expand Down Expand Up @@ -248,10 +248,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=linux-x86
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=linux-x86
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=linux-x86
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=flycapture,libdc1394,libfreenect,libfreenect2,librealsense OS=linux-x86
# install: true
Expand Down Expand Up @@ -317,10 +317,10 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=linux-x86_64
# install: true
# script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=ffmpeg OS=linux-x86_64
# install: true
# script: ./ci/install-travis.sh
- os: linux
env: PROJ=ffmpeg OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
# - os: linux
# env: PROJ=flycapture,spinnaker,libdc1394,libfreenect,libfreenect2,librealsense OS=linux-x86_64
# install: true
Expand Down Expand Up @@ -412,11 +412,11 @@ matrix:
# env: PROJ=artoolkitplus,chilitags,flandmark OS=macosx-x86_64
# install: true
# script: ./ci/install-travis.sh
# - os: osx
# osx_image: xcode7.3
# env: PROJ=ffmpeg OS=macosx-x86_64
# install: true
# script: ./ci/install-travis.sh
- os: osx
osx_image: xcode7.3
env: PROJ=ffmpeg OS=macosx-x86_64
install: true
script: ./ci/install-travis.sh
# - os: osx
# osx_image: xcode7.3
# env: PROJ=libdc1394,libfreenect,libfreenect2,librealsense OS=macosx-x86_64
Expand Down
88 changes: 88 additions & 0 deletions ffmpeg/src/gen/java/org/bytedeco/javacpp/avcodec/AVBSFContext.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// Targeted by JavaCPP version 1.5-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp.avcodec;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import org.bytedeco.javacpp.avutil.*;
import static org.bytedeco.javacpp.avutil.avutil.*;
import org.bytedeco.javacpp.swresample.*;
import static org.bytedeco.javacpp.swresample.swresample.*;

import static org.bytedeco.javacpp.avcodec.avcodec.*;


/**
* The bitstream filter state.
*
* This struct must be allocated with av_bsf_alloc() and freed with
* av_bsf_free().
*
* The fields in the struct will only be changed (by the caller or by the
* filter) as described in their documentation, and are to be considered
* immutable otherwise.
*/
@Properties(inherit = org.bytedeco.javacpp.avcodec.avcodec_presets.class)
public class AVBSFContext extends Pointer {
static { Loader.load(); }
/** Default native constructor. */
public AVBSFContext() { super((Pointer)null); allocate(); }
/** Native array allocator. Access with {@link Pointer#position(long)}. */
public AVBSFContext(long size) { super((Pointer)null); allocateArray(size); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public AVBSFContext(Pointer p) { super(p); }
private native void allocate();
private native void allocateArray(long size);
@Override public AVBSFContext position(long position) {
return (AVBSFContext)super.position(position);
}

/**
* A class for logging and AVOptions
*/
@MemberGetter public native @Const AVClass av_class();

/**
* The bitstream filter this context is an instance of.
*/
@MemberGetter public native @Const AVBitStreamFilter filter();

/**
* Opaque libavcodec internal data. Must not be touched by the caller in any
* way.
*/
public native AVBSFInternal internal(); public native AVBSFContext internal(AVBSFInternal internal);

/**
* Opaque filter-specific private data. If filter->priv_class is non-NULL,
* this is an AVOptions-enabled struct.
*/
public native Pointer priv_data(); public native AVBSFContext priv_data(Pointer priv_data);

/**
* Parameters of the input stream. This field is allocated in
* av_bsf_alloc(), it needs to be filled by the caller before
* av_bsf_init().
*/
public native AVCodecParameters par_in(); public native AVBSFContext par_in(AVCodecParameters par_in);

/**
* Parameters of the output stream. This field is allocated in
* av_bsf_alloc(), it is set by the filter in av_bsf_init().
*/
public native AVCodecParameters par_out(); public native AVBSFContext par_out(AVCodecParameters par_out);

/**
* The timebase used for the timestamps of the input packets. Set by the
* caller before av_bsf_init().
*/
public native @ByRef AVRational time_base_in(); public native AVBSFContext time_base_in(AVRational time_base_in);

/**
* The timebase used for the timestamps of the output packets. Set by the
* filter in av_bsf_init().
*/
public native @ByRef AVRational time_base_out(); public native AVBSFContext time_base_out(AVRational time_base_out);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Targeted by JavaCPP version 1.5-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp.avcodec;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import org.bytedeco.javacpp.avutil.*;
import static org.bytedeco.javacpp.avutil.avutil.*;
import org.bytedeco.javacpp.swresample.*;
import static org.bytedeco.javacpp.swresample.swresample.*;

import static org.bytedeco.javacpp.avcodec.avcodec.*;

// #endif

@Opaque @Properties(inherit = org.bytedeco.javacpp.avcodec.avcodec_presets.class)
public class AVBSFInternal extends Pointer {
/** Empty constructor. Calls {@code super((Pointer)null)}. */
public AVBSFInternal() { super((Pointer)null); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public AVBSFInternal(Pointer p) { super(p); }
}
27 changes: 27 additions & 0 deletions ffmpeg/src/gen/java/org/bytedeco/javacpp/avcodec/AVBSFList.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Targeted by JavaCPP version 1.5-SNAPSHOT: DO NOT EDIT THIS FILE

package org.bytedeco.javacpp.avcodec;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import org.bytedeco.javacpp.avutil.*;
import static org.bytedeco.javacpp.avutil.avutil.*;
import org.bytedeco.javacpp.swresample.*;
import static org.bytedeco.javacpp.swresample.swresample.*;

import static org.bytedeco.javacpp.avcodec.avcodec.*;


/**
* Structure for chain/list of bitstream filters.
* Empty list can be allocated by av_bsf_list_alloc().
*/
@Opaque @Properties(inherit = org.bytedeco.javacpp.avcodec.avcodec_presets.class)
public class AVBSFList extends Pointer {
/** Empty constructor. Calls {@code super((Pointer)null)}. */
public AVBSFList() { super((Pointer)null); }
/** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
public AVBSFList(Pointer p) { super(p); }
}
Loading

0 comments on commit 5c03601

Please sign in to comment.