From ea4d8b903c974a04baa823fc7a767ed2b30a2cb3 Mon Sep 17 00:00:00 2001 From: Samuel Audet Date: Sat, 20 Apr 2024 09:58:19 +0900 Subject: [PATCH] * Upgrade presets for FFmpeg 7.0 and its dependencies --- CHANGELOG.md | 2 +- ffmpeg/README.md | 8 +- ffmpeg/cppbuild.sh | 126 +- ffmpeg/ffmpeg.patch | 31 +- ffmpeg/platform/gpl/pom.xml | 2 +- ffmpeg/platform/pom.xml | 2 +- ffmpeg/pom.xml | 2 +- ffmpeg/samples/pom.xml | 4 +- .../bytedeco/ffmpeg/avcodec/AVBSFContext.java | 2 +- .../bytedeco/ffmpeg/avcodec/AVBSFList.java | 2 +- .../ffmpeg/avcodec/AVBitStreamFilter.java | 2 +- .../ffmpeg/avcodec/AVCPBProperties.java | 2 +- .../org/bytedeco/ffmpeg/avcodec/AVCodec.java | 9 +- .../ffmpeg/avcodec/AVCodecContext.java | 725 ++++---- .../ffmpeg/avcodec/AVCodecDescriptor.java | 2 +- .../ffmpeg/avcodec/AVCodecHWConfig.java | 2 +- .../ffmpeg/avcodec/AVCodecParameters.java | 68 +- .../ffmpeg/avcodec/AVCodecParser.java | 2 +- .../ffmpeg/avcodec/AVCodecParserContext.java | 2 +- .../bytedeco/ffmpeg/avcodec/AVHWAccel.java | 2 +- .../org/bytedeco/ffmpeg/avcodec/AVPacket.java | 2 +- .../bytedeco/ffmpeg/avcodec/AVPacketList.java | 2 +- .../ffmpeg/avcodec/AVPacketSideData.java | 2 +- .../bytedeco/ffmpeg/avcodec/AVPanScan.java | 2 +- .../avcodec/AVProducerReferenceTime.java | 2 +- .../bytedeco/ffmpeg/avcodec/AVProfile.java | 2 +- .../bytedeco/ffmpeg/avcodec/AVSubtitle.java | 2 +- .../ffmpeg/avcodec/AVSubtitleRect.java | 5 +- .../bytedeco/ffmpeg/avcodec/DCTContext.java | 2 +- .../bytedeco/ffmpeg/avcodec/FFTComplex.java | 2 +- .../bytedeco/ffmpeg/avcodec/FFTContext.java | 2 +- .../avcodec/Func_AVCodecContext_Pointer.java | 2 +- .../Func_AVCodecContext_Pointer_int_int.java | 2 +- .../bytedeco/ffmpeg/avcodec/RDFTContext.java | 2 +- .../bytedeco/ffmpeg/avcodec/RcOverride.java | 3 +- .../ffmpeg/avdevice/AVDeviceInfo.java | 2 +- .../ffmpeg/avdevice/AVDeviceInfoList.java | 2 +- .../ffmpeg/avdevice/AVDeviceRect.java | 2 +- .../avfilter/AVBufferSrcParameters.java | 12 +- .../bytedeco/ffmpeg/avfilter/AVFilter.java | 14 +- .../ffmpeg/avfilter/AVFilterChain.java | 2 +- .../ffmpeg/avfilter/AVFilterContext.java | 15 +- .../ffmpeg/avfilter/AVFilterFormats.java | 2 +- .../avfilter/AVFilterFormatsConfig.java | 10 +- .../ffmpeg/avfilter/AVFilterGraph.java | 20 +- .../ffmpeg/avfilter/AVFilterGraphSegment.java | 2 +- .../ffmpeg/avfilter/AVFilterInOut.java | 2 +- .../ffmpeg/avfilter/AVFilterLink.java | 65 +- .../bytedeco/ffmpeg/avfilter/AVFilterPad.java | 2 +- .../ffmpeg/avfilter/AVFilterPadParams.java | 2 +- .../ffmpeg/avfilter/AVFilterParams.java | 2 +- .../ffmpeg/avfilter/avfilter_action_func.java | 2 +- .../avfilter/avfilter_execute_func.java | 2 +- .../bytedeco/ffmpeg/avformat/AVChapter.java | 2 +- .../bytedeco/ffmpeg/avformat/AVCodecTag.java | 2 +- .../ffmpeg/avformat/AVFormatContext.java | 232 ++- .../AVIAMFAudioElement.java} | 20 +- .../AVIAMFMixPresentation.java} | 21 +- .../bytedeco/ffmpeg/avformat/AVIOContext.java | 12 +- .../ffmpeg/avformat/AVIODirContext.java | 22 +- .../ffmpeg/avformat/AVIODirEntry.java | 2 +- .../ffmpeg/avformat/AVIOInterruptCB.java | 2 +- .../ffmpeg/avformat/AVIndexEntry.java | 2 +- .../ffmpeg/avformat/AVInputFormat.java | 179 +- .../ffmpeg/avformat/AVOpenCallback.java | 2 +- .../ffmpeg/avformat/AVOutputFormat.java | 2 +- .../bytedeco/ffmpeg/avformat/AVProbeData.java | 2 +- .../bytedeco/ffmpeg/avformat/AVProgram.java | 2 +- .../bytedeco/ffmpeg/avformat/AVStream.java | 2 +- .../ffmpeg/avformat/AVStreamGroup.java | 113 ++ .../avformat/AVStreamGroupTileGrid.java | 193 ++ .../Read_packet_Pointer_ByteBuffer_int.java | 2 +- .../Read_packet_Pointer_BytePointer_int.java | 2 +- .../Read_packet_Pointer_byte___int.java | 2 +- .../avformat/Seek_Pointer_long_int.java | 2 +- .../Write_packet_Pointer_ByteBuffer_int.java | 4 +- .../Write_packet_Pointer_BytePointer_int.java | 4 +- .../Write_packet_Pointer_byte___int.java | 4 +- .../avformat/av_format_control_message.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVAES.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVAESCTR.java | 2 +- .../bytedeco/ffmpeg/avutil/AVAudioFifo.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVBPrint.java | 2 +- .../bytedeco/ffmpeg/avutil/AVBlowfish.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVBuffer.java | 2 +- .../bytedeco/ffmpeg/avutil/AVBufferPool.java | 2 +- .../bytedeco/ffmpeg/avutil/AVBufferRef.java | 2 +- .../bytedeco/ffmpeg/avutil/AVCAMELLIA.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVCAST5.java | 2 +- .../ffmpeg/avutil/AVChannelCustom.java | 2 +- .../ffmpeg/avutil/AVChannelLayout.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVClass.java | 2 +- .../ffmpeg/avutil/AVComplexDouble.java | 2 +- .../ffmpeg/avutil/AVComplexFloat.java | 2 +- .../ffmpeg/avutil/AVComplexInt32.java | 2 +- .../ffmpeg/avutil/AVComponentDescriptor.java | 2 +- .../ffmpeg/avutil/AVContentLightMetadata.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVDES.java | 2 +- .../bytedeco/ffmpeg/avutil/AVDictionary.java | 2 +- .../ffmpeg/avutil/AVDictionaryEntry.java | 2 +- .../bytedeco/ffmpeg/avutil/AVDownmixInfo.java | 2 +- .../ffmpeg/avutil/AVDynamicHDRPlus.java | 2 +- .../ffmpeg/avutil/AVEncryptionInfo.java | 2 +- .../ffmpeg/avutil/AVEncryptionInitInfo.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVExpr.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVFifo.java | 2 +- .../bytedeco/ffmpeg/avutil/AVFifoBuffer.java | 40 - .../org/bytedeco/ffmpeg/avutil/AVFifoCB.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVFrame.java | 57 +- .../ffmpeg/avutil/AVFrameSideData.java | 2 +- .../avutil/AVHDRPlusColorTransformParams.java | 2 +- .../ffmpeg/avutil/AVHDRPlusPercentile.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVHMAC.java | 2 +- .../ffmpeg/avutil/AVHWDeviceContext.java | 8 +- .../ffmpeg/avutil/AVHWDeviceInternal.java | 20 - .../ffmpeg/avutil/AVHWFramesConstraints.java | 2 +- .../ffmpeg/avutil/AVHWFramesContext.java | 17 +- .../ffmpeg/avutil/AVHWFramesInternal.java | 20 - .../bytedeco/ffmpeg/avutil/AVHashContext.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVLFG.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVMD5.java | 2 +- .../avutil/AVMasteringDisplayMetadata.java | 2 +- .../ffmpeg/avutil/AVMotionVector.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVOption.java | 43 +- .../ffmpeg/avutil/AVOptionArrayDef.java | 63 + .../bytedeco/ffmpeg/avutil/AVOptionRange.java | 2 +- .../ffmpeg/avutil/AVOptionRanges.java | 2 +- .../ffmpeg/avutil/AVPixFmtDescriptor.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVRC4.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVRIPEMD.java | 2 +- .../bytedeco/ffmpeg/avutil/AVRational.java | 2 +- .../ffmpeg/avutil/AVRegionOfInterest.java | 2 +- .../bytedeco/ffmpeg/avutil/AVReplayGain.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVSHA.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVSHA512.java | 2 +- .../ffmpeg/avutil/AVSphericalMapping.java | 2 +- .../bytedeco/ffmpeg/avutil/AVStereo3D.java | 2 +- .../avutil/AVSubsampleEncryptionInfo.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVTEA.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVTWOFISH.java | 2 +- .../bytedeco/ffmpeg/avutil/AVTXContext.java | 2 +- .../ffmpeg/avutil/AVThreadMessageQueue.java | 2 +- .../bytedeco/ffmpeg/avutil/AVTimecode.java | 2 +- .../bytedeco/ffmpeg/avutil/AVTreeNode.java | 2 +- .../org/bytedeco/ffmpeg/avutil/AVXTEA.java | 2 +- .../ffmpeg/avutil/Alloc_Pointer_long.java | 2 +- .../bytedeco/ffmpeg/avutil/Alloc_long.java | 2 +- ...lback_Pointer_int_BytePointer_Pointer.java | 2 +- .../Callback_Pointer_int_String_Pointer.java | 2 +- .../Cmp_Const_Pointer_Const_Pointer.java | 2 +- .../ffmpeg/avutil/Cmp_Pointer_Pointer.java | 2 +- .../ffmpeg/avutil/Enu_Pointer_Pointer.java | 2 +- .../avutil/Free_Pointer_ByteBuffer.java | 2 +- .../avutil/Free_Pointer_BytePointer.java | 2 +- .../ffmpeg/avutil/Free_Pointer_byte__.java | 2 +- .../ffmpeg/avutil/Free_func_Pointer.java | 2 +- .../avutil/Func_Pointer_Pointer_int.java | 36 - .../ffmpeg/avutil/Funcs1_Pointer_double.java | 2 +- .../avutil/Funcs2_Pointer_double_double.java | 2 +- .../avutil/Int_func_Pointer_Pointer_int.java | 38 - .../bytedeco/ffmpeg/avutil/LogCallback.java | 2 +- .../ffmpeg/avutil/Pool_free_Pointer.java | 2 +- .../bytedeco/ffmpeg/avutil/av_alias16.java | 2 +- .../bytedeco/ffmpeg/avutil/av_alias32.java | 2 +- .../bytedeco/ffmpeg/avutil/av_alias64.java | 2 +- .../bytedeco/ffmpeg/avutil/av_intfloat32.java | 2 +- .../bytedeco/ffmpeg/avutil/av_intfloat64.java | 2 +- .../ffmpeg/avutil/av_pixelutils_sad_fn.java | 2 +- .../org/bytedeco/ffmpeg/avutil/av_tx_fn.java | 2 +- .../ffmpeg/avutil/ff_pad_helper_AVBPrint.java | 2 +- .../java/org/bytedeco/ffmpeg/avutil/tm.java | 2 +- .../bytedeco/ffmpeg/avutil/unaligned_16.java | 2 +- .../bytedeco/ffmpeg/avutil/unaligned_32.java | 2 +- .../bytedeco/ffmpeg/avutil/unaligned_64.java | 2 +- .../org/bytedeco/ffmpeg/global/avcodec.java | 269 +-- .../org/bytedeco/ffmpeg/global/avdevice.java | 13 +- .../org/bytedeco/ffmpeg/global/avfilter.java | 36 +- .../org/bytedeco/ffmpeg/global/avformat.java | 132 +- .../org/bytedeco/ffmpeg/global/avutil.java | 1584 ++++++++--------- .../org/bytedeco/ffmpeg/global/postproc.java | 6 +- .../bytedeco/ffmpeg/global/swresample.java | 95 +- .../org/bytedeco/ffmpeg/global/swscale.java | 6 +- .../bytedeco/ffmpeg/postproc/pp_context.java | 2 +- .../org/bytedeco/ffmpeg/postproc/pp_mode.java | 2 +- .../ffmpeg/swresample/SwrContext.java | 2 +- .../bytedeco/ffmpeg/swscale/SwsContext.java | 2 +- .../bytedeco/ffmpeg/swscale/SwsFilter.java | 2 +- .../bytedeco/ffmpeg/swscale/SwsVector.java | 2 +- .../org/bytedeco/ffmpeg/presets/avcodec.java | 9 +- .../org/bytedeco/ffmpeg/presets/avdevice.java | 8 +- .../org/bytedeco/ffmpeg/presets/avfilter.java | 9 +- .../org/bytedeco/ffmpeg/presets/avformat.java | 8 +- .../org/bytedeco/ffmpeg/presets/avutil.java | 11 +- .../org/bytedeco/ffmpeg/presets/postproc.java | 6 +- .../bytedeco/ffmpeg/presets/swresample.java | 6 +- .../org/bytedeco/ffmpeg/presets/swscale.java | 6 +- platform/pom.xml | 2 +- 197 files changed, 2289 insertions(+), 2466 deletions(-) mode change 100644 => 100755 ffmpeg/cppbuild.sh rename ffmpeg/src/gen/java/org/bytedeco/ffmpeg/{avfilter/AVFilterInternal.java => avformat/AVIAMFAudioElement.java} (50%) rename ffmpeg/src/gen/java/org/bytedeco/ffmpeg/{avfilter/AVFilterGraphInternal.java => avformat/AVIAMFMixPresentation.java} (50%) create mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroup.java create mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroupTileGrid.java delete mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoBuffer.java delete mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceInternal.java delete mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesInternal.java create mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionArrayDef.java delete mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Func_Pointer_Pointer_int.java delete mode 100644 ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Int_func_Pointer_Pointer_int.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 185bc4098e5..43a90748a2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * Build FFmpeg with zimg to enable zscale filter ([pull #1481](https://github.com/bytedeco/javacpp-presets/pull/1481)) * Enable PulseAudio support for FFmpeg on Linux ([pull #1472](https://github.com/bytedeco/javacpp-presets/pull/1472)) * Virtualize `btCollisionWorld`, `btOverlapFilterCallback`, `btOverlapCallback` from Bullet Physics SDK ([pull #1475](https://github.com/bytedeco/javacpp-presets/pull/1475)) - * Upgrade presets for PyTorch 2.2.2 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)) + * Upgrade presets for FFmpeg 7.0, PyTorch 2.2.2 ([pull #1466](https://github.com/bytedeco/javacpp-presets/pull/1466)) ### January 29, 2024 version 1.5.10 * Introduce `macosx-arm64` builds for PyTorch ([pull #1463](https://github.com/bytedeco/javacpp-presets/pull/1463)) diff --git a/ffmpeg/README.md b/ffmpeg/README.md index a2c2de514b2..aa73720a121 100644 --- a/ffmpeg/README.md +++ b/ffmpeg/README.md @@ -9,7 +9,7 @@ Introduction ------------ This directory contains the JavaCPP Presets module for: - * FFmpeg 6.1.1 http://ffmpeg.org/ + * FFmpeg 7.0 http://ffmpeg.org/ Please refer to the parent README.md file for more detailed information about the JavaCPP Presets. @@ -38,7 +38,7 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic 4.0.0 org.bytedeco.ffmpeg readfewframe - 1.5.10 + 1.5.11-SNAPSHOT ReadFewFrame @@ -46,14 +46,14 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic org.bytedeco ffmpeg-platform - 6.1.1-1.5.10 + 7.0-1.5.11-SNAPSHOT org.bytedeco ffmpeg-platform-gpl - 6.1.1-1.5.10 + 7.0-1.5.11-SNAPSHOT diff --git a/ffmpeg/cppbuild.sh b/ffmpeg/cppbuild.sh old mode 100644 new mode 100755 index 0b22be442bb..55fa3596449 --- a/ffmpeg/cppbuild.sh +++ b/ffmpeg/cppbuild.sh @@ -33,22 +33,22 @@ SPEEX=speex-1.2.1 OPUS=opus-1.3.1 OPENCORE_AMR=opencore-amr-0.1.6 VO_AMRWBENC=vo-amrwbenc-0.1.3 -OPENSSL=openssl-3.2.0 -OPENH264_VERSION=2.4.0 +OPENSSL=openssl-3.3.0 +OPENH264_VERSION=2.4.1 X264=x264-stable X265=3.4 -VPX_VERSION=1.13.1 -ALSA_VERSION=1.2.10 +VPX_VERSION=1.14.0 +ALSA_VERSION=1.2.11 FREETYPE_VERSION=2.13.2 MFX_VERSION=1.35.1 -NVCODEC_VERSION=12.1.14.0 +NVCODEC_VERSION=12.2.72.0 XML2=libxml2-2.9.12 LIBSRT_VERSION=1.5.3 -WEBP_VERSION=1.3.2 -AOMAV1_VERSION=3.8.0 -SVTAV1_VERSION=1.8.0 +WEBP_VERSION=1.4.0 +AOMAV1_VERSION=3.8.2 +SVTAV1_VERSION=2.0.0 ZIMG_VERSION=3.0.5 -FFMPEG_VERSION=6.1.1 +FFMPEG_VERSION=7.0 download https://download.videolan.org/contrib/nasm/nasm-$NASM_VERSION.tar.gz nasm-$NASM_VERSION.tar.gz download http://zlib.net/$ZLIB.tar.gz $ZLIB.tar.gz download http://downloads.sourceforge.net/project/lame/lame/3.100/$LAME.tar.gz $LAME.tar.gz @@ -139,10 +139,10 @@ case $PLATFORM in echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=arm-linux - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=arm-linux + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -295,10 +295,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=aarch64-linux - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=aarch64-linux + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -450,10 +450,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=i686-linux - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=i686-linux + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -602,10 +602,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=x86_64-linux - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=x86_64-linux + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -749,10 +749,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --host=i686-linux - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -898,10 +898,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --host=x86_64-linux - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=x86_64-linux + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -1062,10 +1062,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=arm-linux-gnueabihf - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=arm-linux-gnueabihf + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -1270,10 +1270,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=aarch64-linux-gnu - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-frontend --disable-shared --with-pic --host=aarch64-linux-gnu + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -1417,14 +1417,14 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - if [[ "$MACHINE_TYPE" =~ ppc64 ]]; then - CC="gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH + autoreconf -iv + if [[ "$MACHINE_TYPE" =~ ppc64 ]]; then + CC="gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic else - CC="powerpc64le-linux-gnu-gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH --host=powerpc64le-linux-gnu + CC="powerpc64le-linux-gnu-gcc -m64 -fPIC" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=powerpc64le-linux-gnu fi - make -j $MAKEJ V=0 - make install + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -1646,10 +1646,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH --host=aarch64-apple-darwin - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-apple-darwin + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -1781,10 +1781,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -1914,10 +1914,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=i686-w64-mingw32 + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" @@ -2055,10 +2055,10 @@ EOF echo "--------------------" echo "" cd zimg-release-$ZIMG_VERSION - autoreconf -iv - ./configure --prefix=$INSTALL_PATH - make -j $MAKEJ V=0 - make install + autoreconf -iv + ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --build=x86_64-w64-mingw32 + make -j $MAKEJ V=0 + make install echo "" echo "--------------------" echo "Building zlib" diff --git a/ffmpeg/ffmpeg.patch b/ffmpeg/ffmpeg.patch index 6a2f5ae710b..b802c7a06e1 100644 --- a/ffmpeg/ffmpeg.patch +++ b/ffmpeg/ffmpeg.patch @@ -1,7 +1,7 @@ -diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure ---- ffmpeg-6.1/configure 2023-11-11 09:25:17.000000000 +0900 -+++ ffmpeg-6.1-patch/configure 2023-11-11 19:18:26.388930944 +0900 -@@ -6675,7 +6675,7 @@ enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gn +diff -ruN ffmpeg-7.0/configure ffmpeg-7.0-patch/configure +--- ffmpeg-7.0/configure 2024-04-05 08:22:59.000000000 +0900 ++++ ffmpeg-7.0-patch/configure 2024-04-20 00:59:06.473315424 +0900 +@@ -6823,7 +6823,7 @@ enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; } enabled ladspa && require_headers "ladspa.h dlfcn.h" enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext @@ -10,7 +10,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new || { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } || die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; } -@@ -6701,7 +6701,7 @@ flite_extralibs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lfl +@@ -6851,7 +6851,7 @@ enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs enabled fontconfig && enable libfontconfig enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit @@ -19,7 +19,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \ -@@ -6731,15 +6731,7 @@ if enabled libmfx && enabled libvpl; then +@@ -6881,15 +6881,7 @@ # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. elif enabled libmfx; then @@ -36,11 +36,11 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure warn "libmfx is deprecated. Please run configure with --enable-libvpl to use libvpl instead." elif enabled libvpl; then # Consider pkg-config only. The name of libmfx is still passed to check_pkg_config function for --enable-libvpl option -@@ -6766,21 +6758,14 @@ enabled libopencv && { check_headers opencv2/core/core_c.h && +@@ -6917,21 +6909,14 @@ { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader || require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } || require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; } --enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion +-enabled libopenh264 && require_pkg_config libopenh264 "openh264 >= 1.3.0" wels/codec_api.h WelsGetCodecVersion +enabled libopenh264 && require libopenh264 wels/codec_api.h WelsGetCodecVersion -lopenh264 $pthreads_extralibs enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version || { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } } @@ -59,8 +59,8 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure +enabled libopus && add_cppflags -I ../include/opus/ && require libopus opus_multistream.h opus_multistream_decoder_create -lopus enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new - enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection -@@ -6796,9 +6781,9 @@ enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbcli + enabled libqrencode && require_pkg_config libqrencode libqrencode qrencode.h QRcode_encodeString +@@ -6949,9 +6934,9 @@ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init @@ -73,7 +73,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg -@@ -6817,19 +6802,15 @@ enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h +@@ -6971,19 +6956,15 @@ enabled libvpx && { enabled libvpx_vp8_decoder && { @@ -93,7 +93,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs" } if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then -@@ -6838,24 +6819,24 @@ enabled libvpx && { +@@ -6992,27 +6973,27 @@ } enabled libwebp && { @@ -106,15 +106,18 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && { [ "$toolchain" != "msvc" ] || require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } && + check_cpp_condition libx264_hdr10 x264.h "X264_BUILD >= 163" && check_cpp_condition libx262 x264.h "X264_MPEG2" -enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get && +enabled libx265 && require libx265 x265.h x265_encoder_encode -lx265 $pthreads_extralibs && require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get + enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.1" "xevd.h" xevd_decode + enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.3" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore -enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version -+enabled libzimg && require libzimg zimg.h zimg_get_api_version -lzimg -lstdc++ ++enabled libzimg && require libzimg zimg.h zimg_get_api_version -lzimg -lstdc++ enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new enabled libzvbi && require_pkg_config libzvbi zvbi-0.2 libzvbi.h vbi_decoder_new && { test_cpp_condition libzvbi.h "VBI_VERSION_MAJOR > 0 || VBI_VERSION_MINOR > 2 || VBI_VERSION_MINOR == 2 && VBI_VERSION_MICRO >= 28" || @@ -124,7 +127,7 @@ diff -ruN ffmpeg-6.1/configure ffmpeg-6.1-patch/configure enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init || check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init || check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto || -@@ -6894,15 +6875,13 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR +@@ -7051,15 +7032,13 @@ die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } && enable omx enabled omx && require_headers OMX_Core.h diff --git a/ffmpeg/platform/gpl/pom.xml b/ffmpeg/platform/gpl/pom.xml index 2643276e848..1edfb3041dc 100644 --- a/ffmpeg/platform/gpl/pom.xml +++ b/ffmpeg/platform/gpl/pom.xml @@ -12,7 +12,7 @@ org.bytedeco ffmpeg-platform-gpl - 6.1.1-${project.parent.version} + 7.0-${project.parent.version} JavaCPP Presets Platform for FFmpeg (GPL enabled) diff --git a/ffmpeg/platform/pom.xml b/ffmpeg/platform/pom.xml index 9f4274f32bc..aaf84f02f5e 100644 --- a/ffmpeg/platform/pom.xml +++ b/ffmpeg/platform/pom.xml @@ -12,7 +12,7 @@ org.bytedeco ffmpeg-platform - 6.1.1-${project.parent.version} + 7.0-${project.parent.version} JavaCPP Presets Platform for FFmpeg diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml index 7159bdba7f3..87811e794bf 100644 --- a/ffmpeg/pom.xml +++ b/ffmpeg/pom.xml @@ -11,7 +11,7 @@ org.bytedeco ffmpeg - 6.1.1-${project.parent.version} + 7.0-${project.parent.version} JavaCPP Presets for FFmpeg diff --git a/ffmpeg/samples/pom.xml b/ffmpeg/samples/pom.xml index 102931de72a..ddf92a543a1 100644 --- a/ffmpeg/samples/pom.xml +++ b/ffmpeg/samples/pom.xml @@ -12,14 +12,14 @@ org.bytedeco ffmpeg-platform - 6.1.1-1.5.11-SNAPSHOT + 7.0-1.5.11-SNAPSHOT org.bytedeco ffmpeg-platform-gpl - 6.1.1-1.5.11-SNAPSHOT + 7.0-1.5.11-SNAPSHOT diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFContext.java index 1510e61f3c3..9ab4f0be6dc 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFList.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFList.java index 36016e504b5..271e385d3b1 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFList.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFList.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBitStreamFilter.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBitStreamFilter.java index 3e9a96a2a0a..71138cc0950 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBitStreamFilter.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBitStreamFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCPBProperties.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCPBProperties.java index f842b7d7389..2fdc3412c02 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCPBProperties.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCPBProperties.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodec.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodec.java index b832f8820f3..85d60aaffb1 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodec.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodec.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; @@ -65,13 +65,6 @@ public class AVCodec extends Pointer { public native @Const IntPointer supported_samplerates(); public native AVCodec supported_samplerates(IntPointer setter); /** array of supported sample formats, or NULL if unknown, array is terminated by -1 */ public native @Cast("const AVSampleFormat*") IntPointer sample_fmts(); public native AVCodec sample_fmts(IntPointer setter); -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * @deprecated use ch_layouts instead - */ - /** array of support channel layouts, or NULL if unknown. array is terminated by 0 */ - public native @Cast("const uint64_t*") @Deprecated LongPointer channel_layouts(); public native AVCodec channel_layouts(LongPointer setter); -// #endif /** AVClass for the private context */ public native @Const AVClass priv_class(); public native AVCodec priv_class(AVClass setter); /** array of recognized profiles, or NULL if unknown, array is terminated by {AV_PROFILE_UNKNOWN} */ diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecContext.java index 98c03d5ac2b..d0c6ea0a692 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; @@ -97,29 +97,6 @@ public class AVCodecContext extends Pointer { */ public native @Cast("int64_t") long bit_rate(); public native AVCodecContext bit_rate(long setter); - /** - * number of bits the bitstream is allowed to diverge from the reference. - * the reference can be CBR (for CBR pass1) or VBR (for pass2) - * - encoding: Set by user; unused for constant quantizer encoding. - * - decoding: unused - */ - public native int bit_rate_tolerance(); public native AVCodecContext bit_rate_tolerance(int setter); - - /** - * Global quality for codecs which cannot change it per frame. - * This should be proportional to MPEG-1/2/4 qscale. - * - encoding: Set by user. - * - decoding: unused - */ - public native int global_quality(); public native AVCodecContext global_quality(int setter); - - /** - * - encoding: Set by user. - * - decoding: unused - */ - public native int compression_level(); public native AVCodecContext compression_level(int setter); -public static final int FF_COMPRESSION_DEFAULT = -1; - /** * AV_CODEC_FLAG_*. * - encoding: Set by user. @@ -169,6 +146,22 @@ public class AVCodecContext extends Pointer { */ public native @ByRef AVRational time_base(); public native AVCodecContext time_base(AVRational setter); + /** + * Timebase in which pkt_dts/pts and AVPacket.dts/pts are expressed. + * - encoding: unused. + * - decoding: set by user. + */ + public native @ByRef AVRational pkt_timebase(); public native AVCodecContext pkt_timebase(AVRational setter); + + /** + * - decoding: For codecs that store a framerate value in the compressed + * bitstream, the decoder may export it here. { 0, 1} when + * unknown. + * - encoding: May be used to signal the framerate of CFR content to an + * encoder. + */ + public native @ByRef AVRational framerate(); public native AVCodecContext framerate(AVRational setter); + // #if FF_API_TICKS_PER_FRAME /** * For some codecs, the time base is closer to the field rate than the frame rate. @@ -244,11 +237,13 @@ public class AVCodecContext extends Pointer { public native int coded_height(); public native AVCodecContext coded_height(int setter); /** - * the number of pictures in a group of pictures, or 0 for intra_only + * sample aspect ratio (0 if unknown) + * That is the width of a pixel divided by the height of the pixel. + * Numerator and denominator must be relatively prime and smaller than 256 for some video standards. * - encoding: Set by user. - * - decoding: unused + * - decoding: Set by libavcodec. */ - public native int gop_size(); public native AVCodecContext gop_size(int setter); + public native @ByRef AVRational sample_aspect_ratio(); public native AVCodecContext sample_aspect_ratio(AVRational setter); /** * Pixel format, see AV_PIX_FMT_xxx. @@ -265,6 +260,85 @@ public class AVCodecContext extends Pointer { */ public native @Cast("AVPixelFormat") int pix_fmt(); public native AVCodecContext pix_fmt(int setter); + /** + * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx. + * - encoding: unused. + * - decoding: Set by libavcodec before calling get_format() + */ + public native @Cast("AVPixelFormat") int sw_pix_fmt(); public native AVCodecContext sw_pix_fmt(int setter); + + /** + * Chromaticity coordinates of the source primaries. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + public native @Cast("AVColorPrimaries") int color_primaries(); public native AVCodecContext color_primaries(int setter); + + /** + * Color Transfer Characteristic. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + public native @Cast("AVColorTransferCharacteristic") int color_trc(); public native AVCodecContext color_trc(int setter); + + /** + * YUV colorspace type. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + public native @Cast("AVColorSpace") int colorspace(); public native AVCodecContext colorspace(int setter); + + /** + * MPEG vs JPEG YUV range. + * - encoding: Set by user to override the default output color range value, + * If not specified, libavcodec sets the color range depending on the + * output format. + * - decoding: Set by libavcodec, can be set by the user to propagate the + * color range to components reading from the decoder context. + */ + public native @Cast("AVColorRange") int color_range(); public native AVCodecContext color_range(int setter); + + /** + * This defines the location of chroma samples. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + public native @Cast("AVChromaLocation") int chroma_sample_location(); public native AVCodecContext chroma_sample_location(int setter); + + /** Field order + * - encoding: set by libavcodec + * - decoding: Set by user. + */ + public native @Cast("AVFieldOrder") int field_order(); public native AVCodecContext field_order(int setter); + + /** + * number of reference frames + * - encoding: Set by user. + * - decoding: Set by lavc. + */ + public native int refs(); public native AVCodecContext refs(int setter); + + /** + * Size of the frame reordering buffer in the decoder. + * For MPEG-2 it is 1 IPB or 0 low delay IP. + * - encoding: Set by libavcodec. + * - decoding: Set by libavcodec. + */ + public native int has_b_frames(); public native AVCodecContext has_b_frames(int setter); + + /** + * slice flags + * - encoding: unused + * - decoding: Set by user. + */ + public native int slice_flags(); public native AVCodecContext slice_flags(int setter); +/** draw_horiz_band() is called in coded order instead of display */ +public static final int SLICE_FLAG_CODED_ORDER = 0x0001; +/** allow draw_horiz_band() with field slices (MPEG-2 field pics) */ +public static final int SLICE_FLAG_ALLOW_FIELD = 0x0002; +/** allow draw_horiz_band() with 1 component at a time (SVQ1) */ +public static final int SLICE_FLAG_ALLOW_PLANE = 0x0004; + /** * If non NULL, 'draw_horiz_band' is called by the libavcodec * decoder to draw a horizontal band. It improves cache usage. Not @@ -359,14 +433,6 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native float b_quant_offset(); public native AVCodecContext b_quant_offset(float setter); - /** - * Size of the frame reordering buffer in the decoder. - * For MPEG-2 it is 1 IPB or 0 low delay IP. - * - encoding: Set by libavcodec. - * - decoding: Set by libavcodec. - */ - public native int has_b_frames(); public native AVCodecContext has_b_frames(int setter); - /** * qscale factor between P- and I-frames * If > 0 then the last P-frame quantizer will be used (q = lastp_q * factor + offset). @@ -418,30 +484,12 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native float dark_masking(); public native AVCodecContext dark_masking(float setter); -// #if FF_API_SLICE_OFFSET - /** - * slice count - * - encoding: Set by libavcodec. - * - decoding: Set by user (or 0). - */ - public native @Deprecated int slice_count(); public native AVCodecContext slice_count(int setter); - - /** - * slice offsets in the frame in bytes - * - encoding: Set/allocated by libavcodec. - * - decoding: Set/allocated by user (or NULL). - */ - public native @Deprecated IntPointer slice_offset(); public native AVCodecContext slice_offset(IntPointer setter); -// #endif - /** - * sample aspect ratio (0 if unknown) - * That is the width of a pixel divided by the height of the pixel. - * Numerator and denominator must be relatively prime and smaller than 256 for some video standards. + * noise vs. sse weight for the nsse comparison function * - encoding: Set by user. - * - decoding: Set by libavcodec. + * - decoding: unused */ - public native @ByRef AVRational sample_aspect_ratio(); public native AVCodecContext sample_aspect_ratio(AVRational setter); + public native int nsse_weight(); public native AVCodecContext nsse_weight(int setter); /** * motion estimation comparison function @@ -529,19 +577,6 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native int me_range(); public native AVCodecContext me_range(int setter); - /** - * slice flags - * - encoding: unused - * - decoding: Set by user. - */ - public native int slice_flags(); public native AVCodecContext slice_flags(int setter); -/** draw_horiz_band() is called in coded order instead of display */ -public static final int SLICE_FLAG_CODED_ORDER = 0x0001; -/** allow draw_horiz_band() with field slices (MPEG-2 field pics) */ -public static final int SLICE_FLAG_ALLOW_FIELD = 0x0002; -/** allow draw_horiz_band() with 1 component at a time (SVQ1) */ -public static final int SLICE_FLAG_ALLOW_PLANE = 0x0004; - /** * macroblock decision mode * - encoding: Set by user. @@ -573,6 +608,13 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native @Cast("uint16_t*") ShortPointer inter_matrix(); public native AVCodecContext inter_matrix(ShortPointer setter); + /** + * custom intra quantization matrix + * - encoding: Set by user, can be NULL. + * - decoding: unused. + */ + public native @Cast("uint16_t*") ShortPointer chroma_intra_matrix(); public native AVCodecContext chroma_intra_matrix(ShortPointer setter); + /** * precision of the intra DC coefficient - 8 * - encoding: Set by user. @@ -580,20 +622,6 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native int intra_dc_precision(); public native AVCodecContext intra_dc_precision(int setter); - /** - * Number of macroblock rows at the top which are skipped. - * - encoding: unused - * - decoding: Set by user. - */ - public native int skip_top(); public native AVCodecContext skip_top(int setter); - - /** - * Number of macroblock rows at the bottom which are skipped. - * - encoding: unused - * - decoding: Set by user. - */ - public native int skip_bottom(); public native AVCodecContext skip_bottom(int setter); - /** * minimum MB Lagrange multiplier * - encoding: Set by user. @@ -622,11 +650,11 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer public native int keyint_min(); public native AVCodecContext keyint_min(int setter); /** - * number of reference frames + * the number of pictures in a group of pictures, or 0 for intra_only * - encoding: Set by user. - * - decoding: Set by lavc. + * - decoding: unused */ - public native int refs(); public native AVCodecContext refs(int setter); + public native int gop_size(); public native AVCodecContext gop_size(int setter); /** * Note: Value depends upon the compare function used for fullpel ME. @@ -635,44 +663,6 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native int mv0_threshold(); public native AVCodecContext mv0_threshold(int setter); - /** - * Chromaticity coordinates of the source primaries. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - public native @Cast("AVColorPrimaries") int color_primaries(); public native AVCodecContext color_primaries(int setter); - - /** - * Color Transfer Characteristic. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - public native @Cast("AVColorTransferCharacteristic") int color_trc(); public native AVCodecContext color_trc(int setter); - - /** - * YUV colorspace type. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - public native @Cast("AVColorSpace") int colorspace(); public native AVCodecContext colorspace(int setter); - - /** - * MPEG vs JPEG YUV range. - * - encoding: Set by user to override the default output color range value, - * If not specified, libavcodec sets the color range depending on the - * output format. - * - decoding: Set by libavcodec, can be set by the user to propagate the - * color range to components reading from the decoder context. - */ - public native @Cast("AVColorRange") int color_range(); public native AVCodecContext color_range(int setter); - - /** - * This defines the location of chroma samples. - * - encoding: Set by user - * - decoding: Set by libavcodec - */ - public native @Cast("AVChromaLocation") int chroma_sample_location(); public native AVCodecContext chroma_sample_location(int setter); - /** * Number of slices. * Indicates number of picture subdivisions. Used for parallelized @@ -682,24 +672,10 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native int slices(); public native AVCodecContext slices(int setter); - /** Field order - * - encoding: set by libavcodec - * - decoding: Set by user. - */ - public native @Cast("AVFieldOrder") int field_order(); public native AVCodecContext field_order(int setter); - /* audio only */ /** samples per second */ public native int sample_rate(); public native AVCodecContext sample_rate(int setter); -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * number of audio channels - * @deprecated use ch_layout.nb_channels - */ - public native @Deprecated int channels(); public native AVCodecContext channels(int setter); -// #endif - /** * audio sample format * - encoding: Set by user. @@ -708,6 +684,14 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer /** sample format */ public native @Cast("AVSampleFormat") int sample_fmt(); public native AVCodecContext sample_fmt(int setter); + /** + * Audio channel layout. + * - encoding: must be set by the caller, to one of AVCodec.ch_layouts. + * - decoding: may be set by the caller if known e.g. from the container. + * The decoder can then override during decoding as needed. + */ + public native @ByRef AVChannelLayout ch_layout(); public native AVCodecContext ch_layout(AVChannelLayout setter); + /* The following data should not be initialized. */ /** * Number of samples per channel in an audio frame. @@ -720,20 +704,6 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native int frame_size(); public native AVCodecContext frame_size(int setter); -// #if FF_API_AVCTX_FRAME_NUMBER - /** - * Frame counter, set by libavcodec. - * - * - decoding: total number of frames returned from the decoder so far. - * - encoding: total number of frames passed to the encoder so far. - * - * \note the counter is not incremented if encoding/decoding resulted in - * an error. - * @deprecated use frame_num instead - */ - public native @Deprecated int frame_number(); public native AVCodecContext frame_number(int setter); -// #endif - /** * number of bytes per packet if constant and known or 0 * Used by some WAV based audio codecs. @@ -747,24 +717,6 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native int cutoff(); public native AVCodecContext cutoff(int setter); -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * Audio channel layout. - * - encoding: set by user. - * - decoding: set by user, may be overwritten by libavcodec. - * @deprecated use ch_layout - */ - public native @Cast("uint64_t") @Deprecated long channel_layout(); public native AVCodecContext channel_layout(long setter); - - /** - * Request decoder to use this channel layout if it can (0 for default) - * - encoding: unused - * - decoding: Set by user. - * @deprecated use "downmix" codec private option - */ - public native @Cast("uint64_t") @Deprecated long request_channel_layout(); public native AVCodecContext request_channel_layout(long setter); -// #endif - /** * Type of service that the audio stream conveys. * - encoding: Set by user. @@ -780,6 +732,41 @@ public static class Get_format_AVCodecContext_IntPointer extends FunctionPointer */ public native @Cast("AVSampleFormat") int request_sample_fmt(); public native AVCodecContext request_sample_fmt(int setter); + /** + * Audio only. The number of "priming" samples (padding) inserted by the + * encoder at the beginning of the audio. I.e. this number of leading + * decoded samples must be discarded by the caller to get the original audio + * without leading padding. + * + * - decoding: unused + * - encoding: Set by libavcodec. The timestamps on the output packets are + * adjusted by the encoder so that they always refer to the + * first sample of the data actually contained in the packet, + * including any added padding. E.g. if the timebase is + * 1/samplerate and the timestamp of the first input sample is + * 0, the timestamp of the first output packet will be + * -initial_padding. + */ + public native int initial_padding(); public native AVCodecContext initial_padding(int setter); + + /** + * Audio only. The amount of padding (in samples) appended by the encoder to + * the end of the audio. I.e. this number of decoded samples must be + * discarded by the caller from the end of the stream to get the original + * audio without any trailing padding. + * + * - decoding: unused + * - encoding: unused + */ + public native int trailing_padding(); public native AVCodecContext trailing_padding(int setter); + + /** + * Number of samples to skip after a discontinuity + * - decoding: unused + * - encoding: set by libavcodec + */ + public native int seek_preroll(); public native AVCodecContext seek_preroll(int setter); + /** * This callback is called at the beginning of each frame to get data * buffer(s) for it. There may be one contiguous buffer for all the data or @@ -871,6 +858,29 @@ public static class Get_buffer2_AVCodecContext_AVFrame_int extends FunctionPoint public native Get_buffer2_AVCodecContext_AVFrame_int get_buffer2(); public native AVCodecContext get_buffer2(Get_buffer2_AVCodecContext_AVFrame_int setter); /* - encoding parameters */ + /** + * number of bits the bitstream is allowed to diverge from the reference. + * the reference can be CBR (for CBR pass1) or VBR (for pass2) + * - encoding: Set by user; unused for constant quantizer encoding. + * - decoding: unused + */ + public native int bit_rate_tolerance(); public native AVCodecContext bit_rate_tolerance(int setter); + + /** + * Global quality for codecs which cannot change it per frame. + * This should be proportional to MPEG-1/2/4 qscale. + * - encoding: Set by user. + * - decoding: unused + */ + public native int global_quality(); public native AVCodecContext global_quality(int setter); + + /** + * - encoding: Set by user. + * - decoding: unused + */ + public native int compression_level(); public native AVCodecContext compression_level(int setter); +public static final int FF_COMPRESSION_DEFAULT = -1; + /** amount of qscale change between easy & hard scenes (0.0-1.0) */ public native float qcompress(); public native AVCodecContext qcompress(float setter); /** amount of qscale smoothing over time (0.0-1.0) */ @@ -1049,21 +1059,6 @@ public static class Get_buffer2_AVCodecContext_AVFrame_int extends FunctionPoint */ public native int err_recognition(); public native AVCodecContext err_recognition(int setter); -// #if FF_API_REORDERED_OPAQUE - /** - * opaque 64-bit number (generally a PTS) that will be reordered and - * output in AVFrame.reordered_opaque - * - encoding: Set by libavcodec to the reordered_opaque of the input - * frame corresponding to the last returned packet. Only - * supported by encoders with the - * AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability. - * - decoding: Set by user. - * - * @deprecated Use AV_CODEC_FLAG_COPY_OPAQUE instead - */ - public native @Cast("int64_t") @Deprecated long reordered_opaque(); public native AVCodecContext reordered_opaque(long setter); -// #endif - /** * Hardware accelerator in use * - encoding: unused. @@ -1093,7 +1088,76 @@ public static class Get_buffer2_AVCodecContext_AVFrame_int extends FunctionPoint * Must remain valid until the next get_format() call, * or avcodec_free_context() (whichever comes first). */ - public native Pointer hwaccel_context(); public native AVCodecContext hwaccel_context(Pointer setter); + public native Pointer hwaccel_context(); public native AVCodecContext hwaccel_context(Pointer setter); + + /** + * A reference to the AVHWFramesContext describing the input (for encoding) + * or output (decoding) frames. The reference is set by the caller and + * afterwards owned (and freed) by libavcodec - it should never be read by + * the caller after being set. + * + * - decoding: This field should be set by the caller from the get_format() + * callback. The previous reference (if any) will always be + * unreffed by libavcodec before the get_format() call. + * + * If the default get_buffer2() is used with a hwaccel pixel + * format, then this AVHWFramesContext will be used for + * allocating the frame buffers. + * + * - encoding: For hardware encoders configured to use a hwaccel pixel + * format, this field should be set by the caller to a reference + * to the AVHWFramesContext describing input frames. + * AVHWFramesContext.format must be equal to + * AVCodecContext.pix_fmt. + * + * This field should be set before avcodec_open2() is called. + */ + public native AVBufferRef hw_frames_ctx(); public native AVCodecContext hw_frames_ctx(AVBufferRef setter); + + /** + * A reference to the AVHWDeviceContext describing the device which will + * be used by a hardware encoder/decoder. The reference is set by the + * caller and afterwards owned (and freed) by libavcodec. + * + * This should be used if either the codec device does not require + * hardware frames or any that are used are to be allocated internally by + * libavcodec. If the user wishes to supply any of the frames used as + * encoder input or decoder output then hw_frames_ctx should be used + * instead. When hw_frames_ctx is set in get_format() for a decoder, this + * field will be ignored while decoding the associated stream segment, but + * may again be used on a following one after another get_format() call. + * + * For both encoders and decoders this field should be set before + * avcodec_open2() is called and must not be written to thereafter. + * + * Note that some decoders may require this field to be set initially in + * order to support hw_frames_ctx at all - in that case, all frames + * contexts used must be created on the same device. + */ + public native AVBufferRef hw_device_ctx(); public native AVCodecContext hw_device_ctx(AVBufferRef setter); + + /** + * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated + * decoding (if active). + * - encoding: unused + * - decoding: Set by user (either before avcodec_open2(), or in the + * AVCodecContext.get_format callback) + */ + public native int hwaccel_flags(); public native AVCodecContext hwaccel_flags(int setter); + + /** + * Video decoding only. Sets the number of extra hardware frames which + * the decoder will allocate for use by the caller. This must be set + * before avcodec_open2() is called. + * + * Some hardware decoders require all frames that they will use for + * output to be defined in advance before decoding starts. For such + * decoders, the hardware frame pool must therefore be of a fixed size. + * The extra frames set here are on top of any number that the decoder + * needs internally in order to operate normally (for example, frames + * used as reference pictures). + */ + public native int extra_hw_frames(); public native AVCodecContext extra_hw_frames(int setter); /** * error @@ -1134,10 +1198,6 @@ public static class Get_buffer2_AVCodecContext_AVFrame_int extends FunctionPoint public static final int FF_IDCT_SIMPLEARMV6 = 17; public static final int FF_IDCT_FAAN = 20; public static final int FF_IDCT_SIMPLENEON = 22; -// #if FF_API_IDCT_NONE -// formerly used by xvmc -public static final int FF_IDCT_NONE = 24; -// #endif public static final int FF_IDCT_SIMPLEAUTO = 128; /** @@ -1154,13 +1214,6 @@ public static class Get_buffer2_AVCodecContext_AVFrame_int extends FunctionPoint */ public native int bits_per_raw_sample(); public native AVCodecContext bits_per_raw_sample(int setter); - /** - * low resolution decoding, 1-> 1/2 size, 2->1/4 size - * - encoding: unused - * - decoding: Set by user. - */ - public native int lowres(); public native AVCodecContext lowres(int setter); - /** * thread count * is used to decide how many independent tasks should be passed to execute() @@ -1252,13 +1305,6 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ } public native Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_Pointer_IntPointer_int execute2(); public native AVCodecContext execute2(Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_Pointer_IntPointer_int setter); - /** - * noise vs. sse weight for the nsse comparison function - * - encoding: Set by user. - * - decoding: unused - */ - public native int nsse_weight(); public native AVCodecContext nsse_weight(int setter); - /** * profile * - encoding: Set by user. @@ -1416,6 +1462,16 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ public static final int FF_LEVEL_UNKNOWN = -99; // #endif + /** + * Properties of the stream that gets decoded + * - encoding: unused + * - decoding: set by libavcodec + */ + public native @Cast("unsigned") int properties(); public native AVCodecContext properties(int setter); +public static final int FF_CODEC_PROPERTY_LOSSLESS = 0x00000001; +public static final int FF_CODEC_PROPERTY_CLOSED_CAPTIONS = 0x00000002; +public static final int FF_CODEC_PROPERTY_FILM_GRAIN = 0x00000004; + /** * Skip loop filtering for selected frames. * - encoding: unused @@ -1438,55 +1494,39 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ public native @Cast("AVDiscard") int skip_frame(); public native AVCodecContext skip_frame(int setter); /** - * Header containing style information for text subtitles. - * For SUBTITLE_ASS subtitle type, it should contain the whole ASS - * [Script Info] and [V4+ Styles] section, plus the [Events] line and - * the Format line following. It shouldn't include any Dialogue line. - * - encoding: Set/allocated/freed by user (before avcodec_open2()) - * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2()) - */ - public native @Cast("uint8_t*") BytePointer subtitle_header(); public native AVCodecContext subtitle_header(BytePointer setter); - public native int subtitle_header_size(); public native AVCodecContext subtitle_header_size(int setter); - - /** - * Audio only. The number of "priming" samples (padding) inserted by the - * encoder at the beginning of the audio. I.e. this number of leading - * decoded samples must be discarded by the caller to get the original audio - * without leading padding. + * Skip processing alpha if supported by codec. + * Note that if the format uses pre-multiplied alpha (common with VP6, + * and recommended due to better video quality/compression) + * the image will look as if alpha-blended onto a black background. + * However for formats that do not use pre-multiplied alpha + * there might be serious artefacts (though e.g. libswscale currently + * assumes pre-multiplied alpha anyway). * - * - decoding: unused - * - encoding: Set by libavcodec. The timestamps on the output packets are - * adjusted by the encoder so that they always refer to the - * first sample of the data actually contained in the packet, - * including any added padding. E.g. if the timebase is - * 1/samplerate and the timestamp of the first input sample is - * 0, the timestamp of the first output packet will be - * -initial_padding. + * - decoding: set by user + * - encoding: unused */ - public native int initial_padding(); public native AVCodecContext initial_padding(int setter); + public native int skip_alpha(); public native AVCodecContext skip_alpha(int setter); /** - * - decoding: For codecs that store a framerate value in the compressed - * bitstream, the decoder may export it here. { 0, 1} when - * unknown. - * - encoding: May be used to signal the framerate of CFR content to an - * encoder. + * Number of macroblock rows at the top which are skipped. + * - encoding: unused + * - decoding: Set by user. */ - public native @ByRef AVRational framerate(); public native AVCodecContext framerate(AVRational setter); + public native int skip_top(); public native AVCodecContext skip_top(int setter); /** - * Nominal unaccelerated pixel format, see AV_PIX_FMT_xxx. - * - encoding: unused. - * - decoding: Set by libavcodec before calling get_format() + * Number of macroblock rows at the bottom which are skipped. + * - encoding: unused + * - decoding: Set by user. */ - public native @Cast("AVPixelFormat") int sw_pix_fmt(); public native AVCodecContext sw_pix_fmt(int setter); + public native int skip_bottom(); public native AVCodecContext skip_bottom(int setter); /** - * Timebase in which pkt_dts/pts and AVPacket.dts/pts are expressed. - * - encoding: unused. - * - decoding: set by user. + * low resolution decoding, 1-> 1/2 size, 2->1/4 size + * - encoding: unused + * - decoding: Set by user. */ - public native @ByRef AVRational pkt_timebase(); public native AVCodecContext pkt_timebase(AVRational setter); + public native int lowres(); public native AVCodecContext lowres(int setter); /** * AVCodecDescriptor @@ -1495,16 +1535,6 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ */ public native @Const AVCodecDescriptor codec_descriptor(); public native AVCodecContext codec_descriptor(AVCodecDescriptor setter); - /** - * Current statistics for PTS correction. - * - decoding: maintained and used by libavcodec, not intended to be used by user apps - * - encoding: unused - */ - public native @Cast("int64_t") long pts_correction_num_faulty_pts(); public native AVCodecContext pts_correction_num_faulty_pts(long setter); /** Number of incorrect PTS values so far */ - public native @Cast("int64_t") long pts_correction_num_faulty_dts(); public native AVCodecContext pts_correction_num_faulty_dts(long setter); /** Number of incorrect DTS values so far */ - public native @Cast("int64_t") long pts_correction_last_pts(); public native AVCodecContext pts_correction_last_pts(long setter); /** PTS of the last frame */ - public native @Cast("int64_t") long pts_correction_last_dts(); public native AVCodecContext pts_correction_last_dts(long setter); /** DTS of the last frame -

/** * Character encoding of the input subtitles file. * - decoding: set by user @@ -1529,32 +1559,15 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ public static final int FF_SUB_CHARENC_MODE_IGNORE = 2; /** - * Skip processing alpha if supported by codec. - * Note that if the format uses pre-multiplied alpha (common with VP6, - * and recommended due to better video quality/compression) - * the image will look as if alpha-blended onto a black background. - * However for formats that do not use pre-multiplied alpha - * there might be serious artefacts (though e.g. libswscale currently - * assumes pre-multiplied alpha anyway). - * - * - decoding: set by user - * - encoding: unused - */ - public native int skip_alpha(); public native AVCodecContext skip_alpha(int setter); - - /** - * Number of samples to skip after a discontinuity - * - decoding: unused - * - encoding: set by libavcodec - */ - public native int seek_preroll(); public native AVCodecContext seek_preroll(int setter); - - /** - * custom intra quantization matrix - * - encoding: Set by user, can be NULL. - * - decoding: unused. + * Header containing style information for text subtitles. + * For SUBTITLE_ASS subtitle type, it should contain the whole ASS + * [Script Info] and [V4+ Styles] section, plus the [Events] line and + * the Format line following. It shouldn't include any Dialogue line. + * - encoding: Set/allocated/freed by user (before avcodec_open2()) + * - decoding: Set/allocated/freed by libavcodec (by avcodec_open2()) */ - public native @Cast("uint16_t*") ShortPointer chroma_intra_matrix(); public native AVCodecContext chroma_intra_matrix(ShortPointer setter); + public native int subtitle_header_size(); public native AVCodecContext subtitle_header_size(int setter); + public native @Cast("uint8_t*") BytePointer subtitle_header(); public native AVCodecContext subtitle_header(BytePointer setter); /** * dump format separator. @@ -1572,16 +1585,6 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ */ public native @Cast("char*") BytePointer codec_whitelist(); public native AVCodecContext codec_whitelist(BytePointer setter); - /** - * Properties of the stream that gets decoded - * - encoding: unused - * - decoding: set by libavcodec - */ - public native @Cast("unsigned") int properties(); public native AVCodecContext properties(int setter); -public static final int FF_CODEC_PROPERTY_LOSSLESS = 0x00000001; -public static final int FF_CODEC_PROPERTY_CLOSED_CAPTIONS = 0x00000002; -public static final int FF_CODEC_PROPERTY_FILM_GRAIN = 0x00000004; - /** * Additional data associated with the entire coded stream. * @@ -1592,39 +1595,14 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ public native int nb_coded_side_data(); public native AVCodecContext nb_coded_side_data(int setter); /** - * A reference to the AVHWFramesContext describing the input (for encoding) - * or output (decoding) frames. The reference is set by the caller and - * afterwards owned (and freed) by libavcodec - it should never be read by - * the caller after being set. - * - * - decoding: This field should be set by the caller from the get_format() - * callback. The previous reference (if any) will always be - * unreffed by libavcodec before the get_format() call. - * - * If the default get_buffer2() is used with a hwaccel pixel - * format, then this AVHWFramesContext will be used for - * allocating the frame buffers. - * - * - encoding: For hardware encoders configured to use a hwaccel pixel - * format, this field should be set by the caller to a reference - * to the AVHWFramesContext describing input frames. - * AVHWFramesContext.format must be equal to - * AVCodecContext.pix_fmt. - * - * This field should be set before avcodec_open2() is called. - */ - public native AVBufferRef hw_frames_ctx(); public native AVCodecContext hw_frames_ctx(AVBufferRef setter); - - /** - * Audio only. The amount of padding (in samples) appended by the encoder to - * the end of the audio. I.e. this number of decoded samples must be - * discarded by the caller from the end of the stream to get the original - * audio without any trailing padding. + * Bit set of AV_CODEC_EXPORT_DATA_* flags, which affects the kind of + * metadata exported in frame, packet, or coded stream side data by + * decoders and encoders. * - * - decoding: unused - * - encoding: unused + * - decoding: set by user + * - encoding: set by user */ - public native int trailing_padding(); public native AVCodecContext trailing_padding(int setter); + public native int export_side_data(); public native AVCodecContext export_side_data(int setter); /** * The number of pixels per image to maximally accept. @@ -1634,37 +1612,6 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ */ public native @Cast("int64_t") long max_pixels(); public native AVCodecContext max_pixels(long setter); - /** - * A reference to the AVHWDeviceContext describing the device which will - * be used by a hardware encoder/decoder. The reference is set by the - * caller and afterwards owned (and freed) by libavcodec. - * - * This should be used if either the codec device does not require - * hardware frames or any that are used are to be allocated internally by - * libavcodec. If the user wishes to supply any of the frames used as - * encoder input or decoder output then hw_frames_ctx should be used - * instead. When hw_frames_ctx is set in get_format() for a decoder, this - * field will be ignored while decoding the associated stream segment, but - * may again be used on a following one after another get_format() call. - * - * For both encoders and decoders this field should be set before - * avcodec_open2() is called and must not be written to thereafter. - * - * Note that some decoders may require this field to be set initially in - * order to support hw_frames_ctx at all - in that case, all frames - * contexts used must be created on the same device. - */ - public native AVBufferRef hw_device_ctx(); public native AVCodecContext hw_device_ctx(AVBufferRef setter); - - /** - * Bit set of AV_HWACCEL_FLAG_* flags, which affect hardware accelerated - * decoding (if active). - * - encoding: unused - * - decoding: Set by user (either before avcodec_open2(), or in the - * AVCodecContext.get_format callback) - */ - public native int hwaccel_flags(); public native AVCodecContext hwaccel_flags(int setter); - /** * Video decoding only. Certain video codecs support cropping, meaning that * only a sub-rectangle of the decoded frame is intended for display. This @@ -1692,20 +1639,6 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ */ public native int apply_cropping(); public native AVCodecContext apply_cropping(int setter); - /* - * Video decoding only. Sets the number of extra hardware frames which - * the decoder will allocate for use by the caller. This must be set - * before avcodec_open2() is called. - * - * Some hardware decoders require all frames that they will use for - * output to be defined in advance before decoding starts. For such - * decoders, the hardware frame pool must therefore be of a fixed size. - * The extra frames set here are on top of any number that the decoder - * needs internally in order to operate normally (for example, frames - * used as reference pictures). - */ - public native int extra_hw_frames(); public native AVCodecContext extra_hw_frames(int setter); - /** * The percentage of damaged samples to discard a frame. * @@ -1722,16 +1655,6 @@ public static class Execute2_AVCodecContext_Func_AVCodecContext_Pointer_int_int_ */ public native @Cast("int64_t") long max_samples(); public native AVCodecContext max_samples(long setter); - /** - * Bit set of AV_CODEC_EXPORT_DATA_* flags, which affects the kind of - * metadata exported in frame, packet, or coded stream side data by - * decoders and encoders. - * - * - decoding: set by user - * - encoding: set by user - */ - public native int export_side_data(); public native AVCodecContext export_side_data(int setter); - /** * This callback is called at the beginning of each packet to get a data * buffer for it. @@ -1782,14 +1705,6 @@ public static class Get_encode_buffer_AVCodecContext_AVPacket_int extends Functi } public native Get_encode_buffer_AVCodecContext_AVPacket_int get_encode_buffer(); public native AVCodecContext get_encode_buffer(Get_encode_buffer_AVCodecContext_AVPacket_int setter); - /** - * Audio channel layout. - * - encoding: must be set by the caller, to one of AVCodec.ch_layouts. - * - decoding: may be set by the caller if known e.g. from the container. - * The decoder can then override during decoding as needed. - */ - public native @ByRef AVChannelLayout ch_layout(); public native AVCodecContext ch_layout(AVChannelLayout setter); - /** * Frame counter, set by libavcodec. * @@ -1800,4 +1715,52 @@ public static class Get_encode_buffer_AVCodecContext_AVPacket_int extends Functi * an error. */ public native @Cast("int64_t") long frame_num(); public native AVCodecContext frame_num(long setter); + + /** + * Decoding only. May be set by the caller before avcodec_open2() to an + * av_malloc()'ed array (or via AVOptions). Owned and freed by the decoder + * afterwards. + * + * Side data attached to decoded frames may come from several sources: + * 1. coded_side_data, which the decoder will for certain types translate + * from packet-type to frame-type and attach to frames; + * 2. side data attached to an AVPacket sent for decoding (same + * considerations as above); + * 3. extracted from the coded bytestream. + * The first two cases are supplied by the caller and typically come from a + * container. + * + * This array configures decoder behaviour in cases when side data of the + * same type is present both in the coded bytestream and in the + * user-supplied side data (items 1. and 2. above). In all cases, at most + * one instance of each side data type will be attached to output frames. By + * default it will be the bytestream side data. Adding an + * AVPacketSideDataType value to this array will flip the preference for + * this type, thus making the decoder prefer user-supplied side data over + * bytestream. In case side data of the same type is present both in + * coded_data and attacked to a packet, the packet instance always has + * priority. + * + * The array may also contain a single -1, in which case the preference is + * switched for all side data types. + */ + public native IntPointer side_data_prefer_packet(); public native AVCodecContext side_data_prefer_packet(IntPointer setter); + /** + * Number of entries in side_data_prefer_packet. + */ + public native @Cast("unsigned") int nb_side_data_prefer_packet(); public native AVCodecContext nb_side_data_prefer_packet(int setter); + + /** + * Array containing static side data, such as HDR10 CLL / MDCV structures. + * Side data entries should be allocated by usage of helpers defined in + * libavutil/frame.h. + * + * - encoding: may be set by user before calling avcodec_open2() for + * encoder configuration. Afterwards owned and freed by the + * encoder. + * - decoding: unused + */ + public native AVFrameSideData decoded_side_data(int i); public native AVCodecContext decoded_side_data(int i, AVFrameSideData setter); + public native @Cast("AVFrameSideData**") PointerPointer decoded_side_data(); public native AVCodecContext decoded_side_data(PointerPointer setter); + public native int nb_decoded_side_data(); public native AVCodecContext nb_decoded_side_data(int setter); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecDescriptor.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecDescriptor.java index 1a47522c407..ddc3b5c4cfb 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecDescriptor.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecDescriptor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecHWConfig.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecHWConfig.java index 4cb1a7a7e6a..0cf0f5f0154 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecHWConfig.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecHWConfig.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParameters.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParameters.java index 1461a44939c..2d51ef36a7a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParameters.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; @@ -72,6 +72,19 @@ public class AVCodecParameters extends Pointer { */ public native int extradata_size(); public native AVCodecParameters extradata_size(int setter); + /** + * Additional data associated with the entire stream. + * + * Should be allocated with av_packet_side_data_new() or + * av_packet_side_data_add(), and will be freed by avcodec_parameters_free(). + */ + public native AVPacketSideData coded_side_data(); public native AVCodecParameters coded_side_data(AVPacketSideData setter); + + /** + * Amount of entries in \ref coded_side_data. + */ + public native int nb_coded_side_data(); public native AVCodecParameters nb_coded_side_data(int setter); + /** * - video: the pixel format, the value corresponds to enum AVPixelFormat. * - audio: the sample format, the value corresponds to enum AVSampleFormat. @@ -130,6 +143,18 @@ public class AVCodecParameters extends Pointer { */ public native @ByRef AVRational sample_aspect_ratio(); public native AVCodecParameters sample_aspect_ratio(AVRational setter); + /** + * Video only. Number of frames per second, for streams with constant frame + * durations. Should be set to { 0, 1 } when some frames have differing + * durations or if the value is not known. + * + * \note This field correponds to values that are stored in codec-level + * headers and is typically overridden by container/transport-layer + * timestamps, when available. It should thus be used only as a last resort, + * when no higher-level timing information is available. + */ + public native @ByRef AVRational framerate(); public native AVCodecParameters framerate(AVRational setter); + /** * Video only. The order of the fields in interlaced video. */ @@ -149,20 +174,10 @@ public class AVCodecParameters extends Pointer { */ public native int video_delay(); public native AVCodecParameters video_delay(int setter); -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * Audio only. The channel layout bitmask. May be 0 if the channel layout is - * unknown or unspecified, otherwise the number of bits set must be equal to - * the channels field. - * @deprecated use ch_layout - */ - public native @Cast("uint64_t") @Deprecated long channel_layout(); public native AVCodecParameters channel_layout(long setter); /** - * Audio only. The number of audio channels. - * @deprecated use ch_layout.nb_channels + * Audio only. The channel layout and number of channels. */ - public native @Deprecated int channels(); public native AVCodecParameters channels(int setter); -// #endif + public native @ByRef AVChannelLayout ch_layout(); public native AVCodecParameters ch_layout(AVChannelLayout setter); /** * Audio only. The number of audio samples per second. */ @@ -197,31 +212,4 @@ public class AVCodecParameters extends Pointer { * Audio only. Number of samples to skip after a discontinuity. */ public native int seek_preroll(); public native AVCodecParameters seek_preroll(int setter); - - /** - * Audio only. The channel layout and number of channels. - */ - public native @ByRef AVChannelLayout ch_layout(); public native AVCodecParameters ch_layout(AVChannelLayout setter); - - /** - * Video only. Number of frames per second, for streams with constant frame - * durations. Should be set to { 0, 1 } when some frames have differing - * durations or if the value is not known. - * - * \note This field correponds to values that are stored in codec-level - * headers and is typically overridden by container/transport-layer - * timestamps, when available. It should thus be used only as a last resort, - * when no higher-level timing information is available. - */ - public native @ByRef AVRational framerate(); public native AVCodecParameters framerate(AVRational setter); - - /** - * Additional data associated with the entire stream. - */ - public native AVPacketSideData coded_side_data(); public native AVCodecParameters coded_side_data(AVPacketSideData setter); - - /** - * Amount of entries in \ref coded_side_data. - */ - public native int nb_coded_side_data(); public native AVCodecParameters nb_coded_side_data(int setter); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParser.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParser.java index 95d202bd350..27ff4c89f22 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParser.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParser.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParserContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParserContext.java index 1ca40f1f999..d0adbe1079c 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParserContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodecParserContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVHWAccel.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVHWAccel.java index 67fb472f95f..8901c2c8b59 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVHWAccel.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVHWAccel.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacket.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacket.java index 98bce4ef150..b975ddfb357 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacket.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacket.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketList.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketList.java index 8a7adb65311..9d9eef82c50 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketList.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketList.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketSideData.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketSideData.java index a16a1006957..4da46b9cac1 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketSideData.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPacketSideData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPanScan.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPanScan.java index 45e2e0f0a5e..a8c43f12c3a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPanScan.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVPanScan.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProducerReferenceTime.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProducerReferenceTime.java index d07792bef51..bac4cce2390 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProducerReferenceTime.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProducerReferenceTime.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProfile.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProfile.java index a17ffa44937..2ab0c3d27df 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProfile.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVProfile.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitle.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitle.java index 3ee8a4d22da..13708a4c03b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitle.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitle.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitleRect.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitleRect.java index 7816b6f31aa..d10315ad3e7 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitleRect.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVSubtitleRect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; @@ -53,6 +53,7 @@ public class AVSubtitleRect extends Pointer { public native int linesize(int i); public native AVSubtitleRect linesize(int i, int setter); @MemberGetter public native IntPointer linesize(); + public native int flags(); public native AVSubtitleRect flags(int setter); public native @Cast("AVSubtitleType") int type(); public native AVSubtitleRect type(int setter); /** 0 terminated plain UTF-8 text */ @@ -64,6 +65,4 @@ public class AVSubtitleRect extends Pointer { * struct. */ public native @Cast("char*") BytePointer ass(); public native AVSubtitleRect ass(BytePointer setter); - - public native int flags(); public native AVSubtitleRect flags(int setter); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/DCTContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/DCTContext.java index 5f6dd1b315e..0cc7c42d32c 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/DCTContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/DCTContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTComplex.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTComplex.java index fa8fc3f9fc0..626184b0865 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTComplex.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTComplex.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTContext.java index 237b2fcbe23..7a2d59098ab 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/FFTContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer.java index 805d1a14427..fcf36dee00b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer_int_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer_int_int.java index 61556b2290c..39dcbfc8080 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer_int_int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/Func_AVCodecContext_Pointer_int_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RDFTContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RDFTContext.java index 386c34b5b95..2bd9d1ba63b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RDFTContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RDFTContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RcOverride.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RcOverride.java index 49e060ca814..865b7f3ebc5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RcOverride.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/RcOverride.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avcodec; @@ -14,6 +14,7 @@ import static org.bytedeco.ffmpeg.global.avcodec.*; +// #endif /** * \ingroup lavc_encoding diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfo.java index 6ac7b896899..8139bce2ffa 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avdevice; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfoList.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfoList.java index 74cec18564c..b665e4d3d98 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfoList.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceInfoList.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avdevice; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceRect.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceRect.java index 5807a0ae234..4f325588f82 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceRect.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avdevice/AVDeviceRect.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avdevice; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVBufferSrcParameters.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVBufferSrcParameters.java index 4de979aa4bd..24895d6817d 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVBufferSrcParameters.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVBufferSrcParameters.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; @@ -88,16 +88,14 @@ public class AVBufferSrcParameters extends Pointer { */ public native int sample_rate(); public native AVBufferSrcParameters sample_rate(int setter); -// #if FF_API_OLD_CHANNEL_LAYOUT /** * Audio only, the audio channel layout - * @deprecated use ch_layout */ - public native @Cast("uint64_t") @Deprecated long channel_layout(); public native AVBufferSrcParameters channel_layout(long setter); -// #endif + public native @ByRef AVChannelLayout ch_layout(); public native AVBufferSrcParameters ch_layout(AVChannelLayout setter); /** - * Audio only, the audio channel layout + * Video only, the YUV colorspace and range. */ - public native @ByRef AVChannelLayout ch_layout(); public native AVBufferSrcParameters ch_layout(AVChannelLayout setter); + public native @Cast("AVColorSpace") int color_space(); public native AVBufferSrcParameters color_space(int setter); + public native @Cast("AVColorRange") int color_range(); public native AVBufferSrcParameters color_range(int setter); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilter.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilter.java index 20606160ab2..b681b8bb6b0 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilter.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; @@ -205,6 +205,14 @@ public static class Uninit_AVFilterContext extends FunctionPointer { * \ref AVFilterFormatsConfig.formats "incfg.formats" * on every output link to a list of pixel/sample formats that the filter * supports on that link. + * For video links, this filter may also set + * \ref AVFilterFormatsConfig.color_spaces "incfg.color_spaces" + * / + * \ref AVFilterFormatsConfig.color_spaces "outcfg.color_spaces" + * and \ref AVFilterFormatsConfig.color_ranges "incfg.color_ranges" + * / + * \ref AVFilterFormatsConfig.color_ranges "outcfg.color_ranges" + * analogously. * For audio links, this filter must also set * \ref AVFilterFormatsConfig.samplerates "incfg.samplerates" * / @@ -234,6 +242,10 @@ public static class Query_func_AVFilterContext extends FunctionPointer { * to indicate that this filter supports each of these pixel formats, * provided that all inputs and outputs use the same pixel format. * + * In addition to that the generic code will mark all inputs + * and all outputs as supporting all color spaces and ranges, as + * long as all inputs and outputs use the same color space/range. + * * This list must never be NULL if the union is in this state. * The type of all inputs and outputs of filters using this must * be AVMEDIA_TYPE_VIDEO. diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterChain.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterChain.java index d4343436daf..3b7bc808fda 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterChain.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterChain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterContext.java index ab58d0f604e..761f1b1e679 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; @@ -92,9 +92,11 @@ public class AVFilterContext extends Pointer { public native int thread_type(); public native AVFilterContext thread_type(int setter); /** - * An opaque struct for libavfilter internal use. + * Max number of threads allowed in this filter instance. + * If <= 0, its value is ignored. + * Overrides global number of threads set per filter graph. */ - public native AVFilterInternal internal(); public native AVFilterContext internal(AVFilterInternal setter); + public native int nb_threads(); public native AVFilterContext nb_threads(int setter); public native @Cast("AVFilterCommand*") Pointer command_queue(); public native AVFilterContext command_queue(Pointer setter); @@ -120,13 +122,6 @@ public class AVFilterContext extends Pointer { */ public native AVBufferRef hw_device_ctx(); public native AVFilterContext hw_device_ctx(AVBufferRef setter); - /** - * Max number of threads allowed in this filter instance. - * If <= 0, its value is ignored. - * Overrides global number of threads set per filter graph. - */ - public native int nb_threads(); public native AVFilterContext nb_threads(int setter); - /** * Ready status of the filter. * A non-0 value means that the filter needs activating; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormats.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormats.java index 96569a3cd89..b2d07857805 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormats.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormats.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormatsConfig.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormatsConfig.java index 6d5e835925a..a0124d3191f 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormatsConfig.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterFormatsConfig.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; @@ -67,4 +67,12 @@ public class AVFilterFormatsConfig extends Pointer { */ public native @Cast("AVFilterChannelLayouts*") Pointer channel_layouts(); public native AVFilterFormatsConfig channel_layouts(Pointer setter); + /** + * Lists of supported YUV color metadata, only for YUV video. + */ + /** AVColorSpace */ + public native AVFilterFormats color_spaces(); public native AVFilterFormatsConfig color_spaces(AVFilterFormats setter); + /** AVColorRange */ + public native AVFilterFormats color_ranges(); public native AVFilterFormatsConfig color_ranges(AVFilterFormats setter); + } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraph.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraph.java index 0d35ab036ac..d04959f1599 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraph.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraph.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; @@ -70,11 +70,6 @@ public class AVFilterGraph extends Pointer { */ public native int nb_threads(); public native AVFilterGraph nb_threads(int setter); - /** - * Opaque object for libavfilter internal use. - */ - public native AVFilterGraphInternal internal(); public native AVFilterGraph internal(AVFilterGraphInternal setter); - /** * Opaque user data. May be set by the caller to an arbitrary value, e.g. to * be used from callbacks like \ref AVFilterGraph.execute. @@ -98,17 +93,4 @@ public class AVFilterGraph extends Pointer { /** swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions */ public native @Cast("char*") BytePointer aresample_swr_opts(); public native AVFilterGraph aresample_swr_opts(BytePointer setter); - - /** - * Private fields - * - * The following fields are for internal use only. - * Their type, offset, number and semantic can change without notice. - */ - - public native AVFilterLink sink_links(int i); public native AVFilterGraph sink_links(int i, AVFilterLink setter); - public native @Cast("AVFilterLink**") PointerPointer sink_links(); public native AVFilterGraph sink_links(PointerPointer setter); - public native int sink_links_count(); public native AVFilterGraph sink_links_count(int setter); - - public native @Cast("unsigned") int disable_auto_convert(); public native AVFilterGraph disable_auto_convert(int setter); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphSegment.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphSegment.java index 21727d70f9b..533c6bec108 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphSegment.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphSegment.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInOut.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInOut.java index 88492d65a58..57507900c61 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInOut.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInOut.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterLink.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterLink.java index 15b6e1bb369..df6f2b86b10 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterLink.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterLink.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; @@ -66,6 +66,9 @@ public class AVFilterLink extends Pointer { /** filter media type */ public native @Cast("AVMediaType") int type(); public native AVFilterLink type(int setter); + /** agreed upon media format */ + public native int format(); public native AVFilterLink format(int setter); + /* These parameters apply only to video */ /** agreed upon image width */ public native int w(); public native AVFilterLink w(int setter); @@ -73,19 +76,23 @@ public class AVFilterLink extends Pointer { public native int h(); public native AVFilterLink h(int setter); /** agreed upon sample aspect ratio */ public native @ByRef AVRational sample_aspect_ratio(); public native AVFilterLink sample_aspect_ratio(AVRational setter); - /* These parameters apply only to audio */ -// #if FF_API_OLD_CHANNEL_LAYOUT /** - * channel layout of current buffer (see libavutil/channel_layout.h) - * @deprecated use ch_layout + * For non-YUV links, these are respectively set to fallback values (as + * appropriate for that colorspace). + * + * Note: This includes grayscale formats, as these are currently treated + * as forced full range always. */ - public native @Cast("uint64_t") @Deprecated long channel_layout(); public native AVFilterLink channel_layout(long setter); -// #endif + /** agreed upon YUV color space */ + public native @Cast("AVColorSpace") int colorspace(); public native AVFilterLink colorspace(int setter); + /** agreed upon YUV color range */ + public native @Cast("AVColorRange") int color_range(); public native AVFilterLink color_range(int setter); + + /* These parameters apply only to audio */ /** samples per second */ public native int sample_rate(); public native AVFilterLink sample_rate(int setter); - - /** agreed upon media format */ - public native int format(); public native AVFilterLink format(int setter); + /** channel layout of current buffer (see libavutil/channel_layout.h) */ + public native @ByRef AVChannelLayout ch_layout(); public native AVFilterLink ch_layout(AVChannelLayout setter); /** * Define the time base used by the PTS of the frames/samples @@ -96,9 +103,6 @@ public class AVFilterLink extends Pointer { */ public native @ByRef AVRational time_base(); public native AVFilterLink time_base(AVRational setter); - /** channel layout of current buffer (see libavutil/channel_layout.h) */ - public native @ByRef AVChannelLayout ch_layout(); public native AVFilterLink ch_layout(AVChannelLayout setter); - /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavfilter and can be changed and @@ -117,16 +121,6 @@ public class AVFilterLink extends Pointer { */ public native @ByRef AVFilterFormatsConfig outcfg(); public native AVFilterLink outcfg(AVFilterFormatsConfig setter); - /** stage of the initialization of the link properties (dimensions, etc) */ - /** enum AVFilterLink::init_state */ - public static final int - /** not started */ - AVLINK_UNINIT = 0, - /** started, but incomplete */ - AVLINK_STARTINIT = 1, - /** complete */ - AVLINK_INIT = 2; - /** * Graph the filter belongs to. */ @@ -144,11 +138,6 @@ public class AVFilterLink extends Pointer { */ public native @Cast("int64_t") long current_pts_us(); public native AVFilterLink current_pts_us(long setter); - /** - * Index in the age array. - */ - public native int age_index(); public native AVFilterLink age_index(int setter); - /** * Frame rate of the stream on the link, or 1/0 if unknown or variable; * if left to 0/0, will be automatically copied from the first input @@ -189,11 +178,6 @@ public class AVFilterLink extends Pointer { public native @Cast("int64_t") long sample_count_in(); public native AVFilterLink sample_count_in(long setter); public native @Cast("int64_t") long sample_count_out(); public native AVFilterLink sample_count_out(long setter); - /** - * A pointer to a FFFramePool struct. - */ - public native Pointer frame_pool(); public native AVFilterLink frame_pool(Pointer setter); - /** * True if a frame is currently wanted on the output of this filter. * Set when ff_request_frame() is called by the output, @@ -206,19 +190,4 @@ public class AVFilterLink extends Pointer { * AVHWFramesContext describing the frames. */ public native AVBufferRef hw_frames_ctx(); public native AVFilterLink hw_frames_ctx(AVBufferRef setter); - -// #ifndef FF_INTERNAL_FIELDS - - /** - * Internal structure members. - * The fields below this limit are internal for libavfilter's use - * and must in no way be accessed by applications. - */ - public native @Cast("char") byte reserved(int i); public native AVFilterLink reserved(int i, byte setter); - @MemberGetter public native @Cast("char*") BytePointer reserved(); - -// #else /* FF_INTERNAL_FIELDS */ - -// #endif /* FF_INTERNAL_FIELDS */ - } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPad.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPad.java index dd8c48323a6..1b921d9afd0 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPad.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPad.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPadParams.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPadParams.java index bb2fd5e0626..30ac0c89163 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPadParams.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterPadParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterParams.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterParams.java index 13412cad034..ea3f9036b0b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterParams.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_action_func.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_action_func.java index d145017f6c1..563df701490 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_action_func.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_action_func.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_execute_func.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_execute_func.java index 8b3a1d85bef..592c6313ad6 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_execute_func.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/avfilter_execute_func.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avfilter; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVChapter.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVChapter.java index 29cd570234b..4a2f1999ffe 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVChapter.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVChapter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVCodecTag.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVCodecTag.java index 928671721dc..baf83024834 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVCodecTag.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVCodecTag.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVFormatContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVFormatContext.java index 2b2a5a6eee6..9bf8232a643 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVFormatContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVFormatContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -119,6 +119,41 @@ public class AVFormatContext extends Pointer { public native AVStream streams(int i); public native AVFormatContext streams(int i, AVStream setter); public native @Cast("AVStream**") PointerPointer streams(); public native AVFormatContext streams(PointerPointer setter); + /** + * Number of elements in AVFormatContext.stream_groups. + * + * Set by avformat_stream_group_create(), must not be modified by any other code. + */ + public native @Cast("unsigned int") int nb_stream_groups(); public native AVFormatContext nb_stream_groups(int setter); + /** + * A list of all stream groups in the file. New groups are created with + * avformat_stream_group_create(), and filled with avformat_stream_group_add_stream(). + * + * - demuxing: groups may be created by libavformat in avformat_open_input(). + * If AVFMTCTX_NOHEADER is set in ctx_flags, then new groups may also + * appear in av_read_frame(). + * - muxing: groups may be created by the user before avformat_write_header(). + * + * Freed by libavformat in avformat_free_context(). + */ + public native AVStreamGroup stream_groups(int i); public native AVFormatContext stream_groups(int i, AVStreamGroup setter); + public native @Cast("AVStreamGroup**") PointerPointer stream_groups(); public native AVFormatContext stream_groups(PointerPointer setter); + + /** + * Number of chapters in AVChapter array. + * When muxing, chapters are normally written in the file header, + * so nb_chapters should normally be initialized before write_header + * is called. Some muxers (e.g. mov and mkv) can also write chapters + * in the trailer. To write chapters in the trailer, nb_chapters + * must be zero when write_header is called and non-zero when + * write_trailer is called. + * - muxing: set by user + * - demuxing: set by libavformat + */ + public native @Cast("unsigned int") int nb_chapters(); public native AVFormatContext nb_chapters(int setter); + public native AVChapter chapters(int i); public native AVFormatContext chapters(int i, AVChapter setter); + public native @Cast("AVChapter**") PointerPointer chapters(); public native AVFormatContext chapters(PointerPointer setter); + /** * input or output URL. Unlike the old filename field, this field has no * length restriction. @@ -253,37 +288,10 @@ public class AVFormatContext extends Pointer { public native @Cast("AVCodecID") int subtitle_codec_id(); public native AVFormatContext subtitle_codec_id(int setter); /** - * Maximum amount of memory in bytes to use for the index of each stream. - * If the index exceeds this size, entries will be discarded as - * needed to maintain a smaller size. This can lead to slower or less - * accurate seeking (depends on demuxer). - * Demuxers for which a full in-memory index is mandatory will ignore - * this. - * - muxing: unused - * - demuxing: set by user - */ - public native @Cast("unsigned int") int max_index_size(); public native AVFormatContext max_index_size(int setter); - - /** - * Maximum amount of memory in bytes to use for buffering frames - * obtained from realtime capture devices. - */ - public native @Cast("unsigned int") int max_picture_buffer(); public native AVFormatContext max_picture_buffer(int setter); - - /** - * Number of chapters in AVChapter array. - * When muxing, chapters are normally written in the file header, - * so nb_chapters should normally be initialized before write_header - * is called. Some muxers (e.g. mov and mkv) can also write chapters - * in the trailer. To write chapters in the trailer, nb_chapters - * must be zero when write_header is called and non-zero when - * write_trailer is called. - * - muxing: set by user - * - demuxing: set by libavformat + * Forced Data codec_id. + * Demuxing: Set by user. */ - public native @Cast("unsigned int") int nb_chapters(); public native AVFormatContext nb_chapters(int setter); - public native AVChapter chapters(int i); public native AVFormatContext chapters(int i, AVChapter setter); - public native @Cast("AVChapter**") PointerPointer chapters(); public native AVFormatContext chapters(PointerPointer setter); + public native @Cast("AVCodecID") int data_codec_id(); public native AVFormatContext data_codec_id(int setter); /** * Metadata that applies to the whole file. @@ -339,6 +347,31 @@ public class AVFormatContext extends Pointer { public native int debug(); public native AVFormatContext debug(int setter); public static final int FF_FDEBUG_TS = 0x0001; + /** + * The maximum number of streams. + * - encoding: unused + * - decoding: set by user + */ + public native int max_streams(); public native AVFormatContext max_streams(int setter); + + /** + * Maximum amount of memory in bytes to use for the index of each stream. + * If the index exceeds this size, entries will be discarded as + * needed to maintain a smaller size. This can lead to slower or less + * accurate seeking (depends on demuxer). + * Demuxers for which a full in-memory index is mandatory will ignore + * this. + * - muxing: unused + * - demuxing: set by user + */ + public native @Cast("unsigned int") int max_index_size(); public native AVFormatContext max_index_size(int setter); + + /** + * Maximum amount of memory in bytes to use for buffering frames + * obtained from realtime capture devices. + */ + public native @Cast("unsigned int") int max_picture_buffer(); public native AVFormatContext max_picture_buffer(int setter); + /** * Maximum buffering duration for interleaving. * @@ -357,6 +390,35 @@ public class AVFormatContext extends Pointer { */ public native @Cast("int64_t") long max_interleave_delta(); public native AVFormatContext max_interleave_delta(long setter); + /** + * Maximum number of packets to read while waiting for the first timestamp. + * Decoding only. + */ + public native int max_ts_probe(); public native AVFormatContext max_ts_probe(int setter); + + /** + * Max chunk time in microseconds. + * Note, not all formats support this and unpredictable things may happen if it is used when not supported. + * - encoding: Set by user + * - decoding: unused + */ + public native int max_chunk_duration(); public native AVFormatContext max_chunk_duration(int setter); + + /** + * Max chunk size in bytes + * Note, not all formats support this and unpredictable things may happen if it is used when not supported. + * - encoding: Set by user + * - decoding: unused + */ + public native int max_chunk_size(); public native AVFormatContext max_chunk_size(int setter); + + /** + * Maximum number of packets that can be probed + * - encoding: unused + * - decoding: set by user + */ + public native int max_probe_packets(); public native AVFormatContext max_probe_packets(int setter); + /** * Allow non-standard and experimental extension * @see AVCodecContext.strict_std_compliance @@ -383,11 +445,6 @@ public class AVFormatContext extends Pointer { */ public static final int AVFMT_EVENT_FLAG_METADATA_UPDATED = 0x0001; - /** - * Maximum number of packets to read while waiting for the first timestamp. - * Decoding only. - */ - public native int max_ts_probe(); public native AVFormatContext max_ts_probe(int setter); /** * Avoid negative timestamps during muxing. @@ -406,12 +463,6 @@ public class AVFormatContext extends Pointer { /** Shift timestamps so that they start at 0 */ public static final int AVFMT_AVOID_NEG_TS_MAKE_ZERO = 2; - /** - * Transport stream id. - * This will be moved into demuxer private options. Thus no API/ABI compatibility - */ - public native int ts_id(); public native AVFormatContext ts_id(int setter); - /** * Audio preload in microseconds. * Note, not all formats support this and unpredictable things may happen if it is used when not supported. @@ -420,22 +471,6 @@ public class AVFormatContext extends Pointer { */ public native int audio_preload(); public native AVFormatContext audio_preload(int setter); - /** - * Max chunk time in microseconds. - * Note, not all formats support this and unpredictable things may happen if it is used when not supported. - * - encoding: Set by user - * - decoding: unused - */ - public native int max_chunk_duration(); public native AVFormatContext max_chunk_duration(int setter); - - /** - * Max chunk size in bytes - * Note, not all formats support this and unpredictable things may happen if it is used when not supported. - * - encoding: Set by user - * - decoding: unused - */ - public native int max_chunk_size(); public native AVFormatContext max_chunk_size(int setter); - /** * forces the use of wallclock timestamps as pts/dts of packets * This has undefined results in the presence of B frames. @@ -444,6 +479,13 @@ public class AVFormatContext extends Pointer { */ public native int use_wallclock_as_timestamps(); public native AVFormatContext use_wallclock_as_timestamps(int setter); + /** + * Skip duration calcuation in estimate_timings_from_pts. + * - encoding: unused + * - decoding: set by user + */ + public native int skip_estimate_duration_from_pts(); public native AVFormatContext skip_estimate_duration_from_pts(int setter); + /** * avio flags, used to force AVIO_FLAG_DIRECT. * - encoding: unused @@ -523,6 +565,20 @@ public class AVFormatContext extends Pointer { */ public native @Cast("char*") BytePointer format_whitelist(); public native AVFormatContext format_whitelist(BytePointer setter); + /** + * ',' separated list of allowed protocols. + * - encoding: unused + * - decoding: set by user + */ + public native @Cast("char*") BytePointer protocol_whitelist(); public native AVFormatContext protocol_whitelist(BytePointer setter); + + /** + * ',' separated list of disallowed protocols. + * - encoding: unused + * - decoding: set by user + */ + public native @Cast("char*") BytePointer protocol_blacklist(); public native AVFormatContext protocol_blacklist(BytePointer setter); + /** * IO repositioned flag. * This is set by avformat when the underlaying IO context read pointer @@ -566,7 +622,7 @@ public class AVFormatContext extends Pointer { /** * Number of bytes to be written as padding in a metadata header. * Demuxing: Unused. - * Muxing: Set by user via av_format_set_metadata_header_padding. + * Muxing: Set by user. */ public native int metadata_header_padding(); public native AVFormatContext metadata_header_padding(int setter); @@ -595,19 +651,6 @@ public class AVFormatContext extends Pointer { */ public native @Cast("uint8_t*") BytePointer dump_separator(); public native AVFormatContext dump_separator(BytePointer setter); - /** - * Forced Data codec_id. - * Demuxing: Set by user. - */ - public native @Cast("AVCodecID") int data_codec_id(); public native AVFormatContext data_codec_id(int setter); - - /** - * ',' separated list of allowed protocols. - * - encoding: unused - * - decoding: set by user - */ - public native @Cast("char*") BytePointer protocol_whitelist(); public native AVFormatContext protocol_whitelist(BytePointer setter); - /** * A callback for opening new IO streams. * @@ -639,51 +682,6 @@ public native int call(AVFormatContext s, @Cast("AVIOContext**") PointerPointer } public native Io_open_AVFormatContext_PointerPointer_BytePointer_int_PointerPointer io_open(); public native AVFormatContext io_open(Io_open_AVFormatContext_PointerPointer_BytePointer_int_PointerPointer setter); -// #if FF_API_AVFORMAT_IO_CLOSE - /** - * A callback for closing the streams opened with AVFormatContext.io_open(). - * - * @deprecated use io_close2 - */ - public static class Io_close_AVFormatContext_AVIOContext extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Io_close_AVFormatContext_AVIOContext(Pointer p) { super(p); } - protected Io_close_AVFormatContext_AVIOContext() { allocate(); } - private native void allocate(); - public native @Deprecated void call(AVFormatContext s, AVIOContext pb); - } - public native Io_close_AVFormatContext_AVIOContext io_close(); public native AVFormatContext io_close(Io_close_AVFormatContext_AVIOContext setter); -// #endif - - /** - * ',' separated list of disallowed protocols. - * - encoding: unused - * - decoding: set by user - */ - public native @Cast("char*") BytePointer protocol_blacklist(); public native AVFormatContext protocol_blacklist(BytePointer setter); - - /** - * The maximum number of streams. - * - encoding: unused - * - decoding: set by user - */ - public native int max_streams(); public native AVFormatContext max_streams(int setter); - - /** - * Skip duration calcuation in estimate_timings_from_pts. - * - encoding: unused - * - decoding: set by user - */ - public native int skip_estimate_duration_from_pts(); public native AVFormatContext skip_estimate_duration_from_pts(int setter); - - /** - * Maximum number of packets that can be probed - * - encoding: unused - * - decoding: set by user - */ - public native int max_probe_packets(); public native AVFormatContext max_probe_packets(int setter); - /** * A callback for closing the streams opened with AVFormatContext.io_open(). * diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInternal.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIAMFAudioElement.java similarity index 50% rename from ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInternal.java rename to ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIAMFAudioElement.java index d62b7bc4fff..d2f5a33d3fb 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterInternal.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIAMFAudioElement.java @@ -1,6 +1,6 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE -package org.bytedeco.ffmpeg.avfilter; +package org.bytedeco.ffmpeg.avformat; import java.nio.*; import org.bytedeco.javacpp.*; @@ -13,20 +13,14 @@ import static org.bytedeco.ffmpeg.global.swresample.*; import org.bytedeco.ffmpeg.avcodec.*; import static org.bytedeco.ffmpeg.global.avcodec.*; -import org.bytedeco.ffmpeg.avformat.*; -import static org.bytedeco.ffmpeg.global.avformat.*; -import org.bytedeco.ffmpeg.postproc.*; -import static org.bytedeco.ffmpeg.global.postproc.*; -import org.bytedeco.ffmpeg.swscale.*; -import static org.bytedeco.ffmpeg.global.swscale.*; -import static org.bytedeco.ffmpeg.global.avfilter.*; +import static org.bytedeco.ffmpeg.global.avformat.*; -@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avfilter.class) -public class AVFilterInternal extends Pointer { +@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avformat.class) +public class AVIAMFAudioElement extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public AVFilterInternal() { super((Pointer)null); } + public AVIAMFAudioElement() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public AVFilterInternal(Pointer p) { super(p); } + public AVIAMFAudioElement(Pointer p) { super(p); } } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphInternal.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIAMFMixPresentation.java similarity index 50% rename from ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphInternal.java rename to ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIAMFMixPresentation.java index 0e951694205..3cf32a806a6 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avfilter/AVFilterGraphInternal.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIAMFMixPresentation.java @@ -1,6 +1,6 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE -package org.bytedeco.ffmpeg.avfilter; +package org.bytedeco.ffmpeg.avformat; import java.nio.*; import org.bytedeco.javacpp.*; @@ -13,20 +13,13 @@ import static org.bytedeco.ffmpeg.global.swresample.*; import org.bytedeco.ffmpeg.avcodec.*; import static org.bytedeco.ffmpeg.global.avcodec.*; -import org.bytedeco.ffmpeg.avformat.*; -import static org.bytedeco.ffmpeg.global.avformat.*; -import org.bytedeco.ffmpeg.postproc.*; -import static org.bytedeco.ffmpeg.global.postproc.*; -import org.bytedeco.ffmpeg.swscale.*; -import static org.bytedeco.ffmpeg.global.swscale.*; - -import static org.bytedeco.ffmpeg.global.avfilter.*; +import static org.bytedeco.ffmpeg.global.avformat.*; -@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avfilter.class) -public class AVFilterGraphInternal extends Pointer { +@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avformat.class) +public class AVIAMFMixPresentation extends Pointer { /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public AVFilterGraphInternal() { super((Pointer)null); } + public AVIAMFMixPresentation() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public AVFilterGraphInternal(Pointer p) { super(p); } + public AVIAMFMixPresentation(Pointer p) { super(p); } } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOContext.java index 09d0f33b8ef..d417ca82788 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -134,18 +134,15 @@ public static class Read_packet_Pointer_BytePointer_int extends FunctionPointer public native int call(Pointer opaque, @Cast("uint8_t*") BytePointer buf, int buf_size); } public native Read_packet_Pointer_BytePointer_int read_packet(); public native AVIOContext read_packet(Read_packet_Pointer_BytePointer_int setter); -// #if FF_API_AVIO_WRITE_NONCONST public static class Write_packet_Pointer_BytePointer_int extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Write_packet_Pointer_BytePointer_int(Pointer p) { super(p); } protected Write_packet_Pointer_BytePointer_int() { allocate(); } private native void allocate(); - public native int call(Pointer opaque, @Cast("uint8_t*") BytePointer buf, int buf_size); + public native int call(Pointer opaque, @Cast("const uint8_t*") BytePointer buf, int buf_size); } public native Write_packet_Pointer_BytePointer_int write_packet(); public native AVIOContext write_packet(Write_packet_Pointer_BytePointer_int setter); -// #else -// #endif public static class Seek_Pointer_long_int extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ @@ -230,19 +227,16 @@ public static class Read_seek_Pointer_int_long_int extends FunctionPointer { /** * A callback that is used instead of write_packet. */ -// #if FF_API_AVIO_WRITE_NONCONST public static class Write_data_type_Pointer_BytePointer_int_int_long extends FunctionPointer { static { Loader.load(); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public Write_data_type_Pointer_BytePointer_int_int_long(Pointer p) { super(p); } protected Write_data_type_Pointer_BytePointer_int_int_long() { allocate(); } private native void allocate(); - public native int call(Pointer opaque, @Cast("uint8_t*") BytePointer buf, int buf_size, + public native int call(Pointer opaque, @Cast("const uint8_t*") BytePointer buf, int buf_size, @Cast("AVIODataMarkerType") int type, @Cast("int64_t") long time); } public native Write_data_type_Pointer_BytePointer_int_int_long write_data_type(); public native AVIOContext write_data_type(Write_data_type_Pointer_BytePointer_int_int_long setter); -// #else -// #endif /** * If set, don't call write_data_type separately for AVIO_DATA_MARKER_BOUNDARY_POINT, * but ignore them and treat them as AVIO_DATA_MARKER_UNKNOWN (to avoid needlessly diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirContext.java index d6fc5d3fb63..2e6f0829d52 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -17,24 +17,10 @@ import static org.bytedeco.ffmpeg.global.avformat.*; -// #if FF_API_AVIODIRCONTEXT -@Properties(inherit = org.bytedeco.ffmpeg.presets.avformat.class) +@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avformat.class) public class AVIODirContext extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public AVIODirContext() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public AVIODirContext(long size) { super((Pointer)null); allocateArray(size); } + /** Empty constructor. Calls {@code super((Pointer)null)}. */ + public AVIODirContext() { super((Pointer)null); } /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ public AVIODirContext(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public AVIODirContext position(long position) { - return (AVIODirContext)super.position(position); - } - @Override public AVIODirContext getPointer(long i) { - return new AVIODirContext((Pointer)this).offsetAddress(i); - } - - public native @Cast("URLContext*") Pointer url_context(); public native AVIODirContext url_context(Pointer setter); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirEntry.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirEntry.java index f1225073ee1..cd0b0d1af90 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirEntry.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIODirEntry.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOInterruptCB.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOInterruptCB.java index 86371bf098a..38ea391010a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOInterruptCB.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIOInterruptCB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIndexEntry.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIndexEntry.java index e60944c5c1d..20700cdf3c7 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIndexEntry.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVIndexEntry.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVInputFormat.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVInputFormat.java index 77340aae18a..e2fed839494 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVInputFormat.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVInputFormat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -81,181 +81,4 @@ public class AVInputFormat extends Pointer { * @see av_probe_input_format2 */ public native @Cast("const char*") BytePointer mime_type(); public native AVInputFormat mime_type(BytePointer setter); - - /***************************************************************** - * No fields below this line are part of the public API. They - * may not be used outside of libavformat and can be changed and - * removed at will. - * New public fields should be added right above. - ***************************************************************** - */ - /** - * Raw demuxers store their codec ID here. - */ - public native int raw_codec_id(); public native AVInputFormat raw_codec_id(int setter); - - /** - * Size of private data so that it can be allocated in the wrapper. - */ - public native int priv_data_size(); public native AVInputFormat priv_data_size(int setter); - - /** - * Internal flags. See FF_FMT_FLAG_* in internal.h. - */ - public native int flags_internal(); public native AVInputFormat flags_internal(int setter); - - /** - * Tell if a given file has a chance of being parsed as this format. - * The buffer provided is guaranteed to be AVPROBE_PADDING_SIZE bytes - * big so you do not have to check for that unless you need more. - */ - public static class Read_probe_AVProbeData extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_probe_AVProbeData(Pointer p) { super(p); } - protected Read_probe_AVProbeData() { allocate(); } - private native void allocate(); - public native int call(@Const AVProbeData arg0); - } - public native Read_probe_AVProbeData read_probe(); public native AVInputFormat read_probe(Read_probe_AVProbeData setter); - - /** - * Read the format header and initialize the AVFormatContext - * structure. Return 0 if OK. 'avformat_new_stream' should be - * called to create new streams. - */ - public static class Read_header_AVFormatContext extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_header_AVFormatContext(Pointer p) { super(p); } - protected Read_header_AVFormatContext() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext arg0); - } - public native Read_header_AVFormatContext read_header(); public native AVInputFormat read_header(Read_header_AVFormatContext setter); - - /** - * Read one packet and put it in 'pkt'. pts and flags are also - * set. 'avformat_new_stream' can be called only if the flag - * AVFMTCTX_NOHEADER is used and only in the calling thread (not in a - * background thread). - * @return 0 on success, < 0 on error. - * Upon returning an error, pkt must be unreferenced by the caller. - */ - public static class Read_packet_AVFormatContext_AVPacket extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_packet_AVFormatContext_AVPacket(Pointer p) { super(p); } - protected Read_packet_AVFormatContext_AVPacket() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext arg0, AVPacket pkt); - } - public native Read_packet_AVFormatContext_AVPacket read_packet(); public native AVInputFormat read_packet(Read_packet_AVFormatContext_AVPacket setter); - - /** - * Close the stream. The AVFormatContext and AVStreams are not - * freed by this function - */ - public static class Read_close_AVFormatContext extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_close_AVFormatContext(Pointer p) { super(p); } - protected Read_close_AVFormatContext() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext arg0); - } - public native Read_close_AVFormatContext read_close(); public native AVInputFormat read_close(Read_close_AVFormatContext setter); - - /** - * Seek to a given timestamp relative to the frames in - * stream component stream_index. - * @param stream_index Must not be -1. - * @param flags Selects which direction should be preferred if no exact - * match is available. - * @return >= 0 on success (but not necessarily the new offset) - */ - public static class Read_seek_AVFormatContext_int_long_int extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_seek_AVFormatContext_int_long_int(Pointer p) { super(p); } - protected Read_seek_AVFormatContext_int_long_int() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext arg0, - int stream_index, @Cast("int64_t") long timestamp, int flags); - } - public native Read_seek_AVFormatContext_int_long_int read_seek(); public native AVInputFormat read_seek(Read_seek_AVFormatContext_int_long_int setter); - - /** - * Get the next timestamp in stream[stream_index].time_base units. - * @return the timestamp or AV_NOPTS_VALUE if an error occurred - */ - public static class Read_timestamp_AVFormatContext_int_LongPointer_long extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_timestamp_AVFormatContext_int_LongPointer_long(Pointer p) { super(p); } - protected Read_timestamp_AVFormatContext_int_LongPointer_long() { allocate(); } - private native void allocate(); - public native @Cast("int64_t") long call(AVFormatContext s, int stream_index, - @Cast("int64_t*") LongPointer pos, @Cast("int64_t") long pos_limit); - } - public native Read_timestamp_AVFormatContext_int_LongPointer_long read_timestamp(); public native AVInputFormat read_timestamp(Read_timestamp_AVFormatContext_int_LongPointer_long setter); - - /** - * Start/resume playing - only meaningful if using a network-based format - * (RTSP). - */ - public static class Read_play_AVFormatContext extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_play_AVFormatContext(Pointer p) { super(p); } - protected Read_play_AVFormatContext() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext arg0); - } - public native Read_play_AVFormatContext read_play(); public native AVInputFormat read_play(Read_play_AVFormatContext setter); - - /** - * Pause playing - only meaningful if using a network-based format - * (RTSP). - */ - public static class Read_pause_AVFormatContext extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_pause_AVFormatContext(Pointer p) { super(p); } - protected Read_pause_AVFormatContext() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext arg0); - } - public native Read_pause_AVFormatContext read_pause(); public native AVInputFormat read_pause(Read_pause_AVFormatContext setter); - - /** - * Seek to timestamp ts. - * Seeking will be done so that the point from which all active streams - * can be presented successfully will be closest to ts and within min/max_ts. - * Active streams are all streams that have AVStream.discard < AVDISCARD_ALL. - */ - public static class Read_seek2_AVFormatContext_int_long_long_long_int extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Read_seek2_AVFormatContext_int_long_long_long_int(Pointer p) { super(p); } - protected Read_seek2_AVFormatContext_int_long_long_long_int() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext s, int stream_index, @Cast("int64_t") long min_ts, @Cast("int64_t") long ts, @Cast("int64_t") long max_ts, int flags); - } - public native Read_seek2_AVFormatContext_int_long_long_long_int read_seek2(); public native AVInputFormat read_seek2(Read_seek2_AVFormatContext_int_long_long_long_int setter); - - /** - * Returns device list with it properties. - * @see avdevice_list_devices() for more details. - */ - public static class Get_device_list_AVFormatContext_Pointer extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Get_device_list_AVFormatContext_Pointer(Pointer p) { super(p); } - protected Get_device_list_AVFormatContext_Pointer() { allocate(); } - private native void allocate(); - public native int call(AVFormatContext s, @Cast("AVDeviceInfoList*") Pointer device_list); - } - public native Get_device_list_AVFormatContext_Pointer get_device_list(); public native AVInputFormat get_device_list(Get_device_list_AVFormatContext_Pointer setter); - } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOpenCallback.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOpenCallback.java index 5a9f2b73d0f..f563e45cd1b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOpenCallback.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOpenCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOutputFormat.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOutputFormat.java index b9bc0f0923c..15bd17dc453 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOutputFormat.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVOutputFormat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProbeData.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProbeData.java index ad5b70ee719..e009d1eb3b6 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProbeData.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProbeData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProgram.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProgram.java index e1ef43465a3..254ffa1e71c 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProgram.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVProgram.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStream.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStream.java index e60cead5688..969fa907958 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStream.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStream.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroup.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroup.java new file mode 100644 index 00000000000..4fd019822f9 --- /dev/null +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroup.java @@ -0,0 +1,113 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.ffmpeg.avformat; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.ffmpeg.avutil.*; +import static org.bytedeco.ffmpeg.global.avutil.*; +import org.bytedeco.ffmpeg.swresample.*; +import static org.bytedeco.ffmpeg.global.swresample.*; +import org.bytedeco.ffmpeg.avcodec.*; +import static org.bytedeco.ffmpeg.global.avcodec.*; + +import static org.bytedeco.ffmpeg.global.avformat.*; + + +@Properties(inherit = org.bytedeco.ffmpeg.presets.avformat.class) +public class AVStreamGroup extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public AVStreamGroup() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public AVStreamGroup(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AVStreamGroup(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public AVStreamGroup position(long position) { + return (AVStreamGroup)super.position(position); + } + @Override public AVStreamGroup getPointer(long i) { + return new AVStreamGroup((Pointer)this).offsetAddress(i); + } + + /** + * A class for \ref avoptions. Set by avformat_stream_group_create(). + */ + public native @Const AVClass av_class(); public native AVStreamGroup av_class(AVClass setter); + + public native Pointer priv_data(); public native AVStreamGroup priv_data(Pointer setter); + + /** + * Group index in AVFormatContext. + */ + public native @Cast("unsigned int") int index(); public native AVStreamGroup index(int setter); + + /** + * Group type-specific group ID. + * + * decoding: set by libavformat + * encoding: may set by the user + */ + public native @Cast("int64_t") long id(); public native AVStreamGroup id(long setter); + + /** + * Group type + * + * decoding: set by libavformat on group creation + * encoding: set by avformat_stream_group_create() + */ + public native @Cast("AVStreamGroupParamsType") int type(); public native AVStreamGroup type(int setter); + + /** + * Group type-specific parameters + */ + @Name("params.iamf_audio_element") public native AVIAMFAudioElement params_iamf_audio_element(); public native AVStreamGroup params_iamf_audio_element(AVIAMFAudioElement setter); + @Name("params.iamf_mix_presentation") public native AVIAMFMixPresentation params_iamf_mix_presentation(); public native AVStreamGroup params_iamf_mix_presentation(AVIAMFMixPresentation setter); + @Name("params.tile_grid") public native AVStreamGroupTileGrid params_tile_grid(); public native AVStreamGroup params_tile_grid(AVStreamGroupTileGrid setter); + + /** + * Metadata that applies to the whole group. + * + * - demuxing: set by libavformat on group creation + * - muxing: may be set by the caller before avformat_write_header() + * + * Freed by libavformat in avformat_free_context(). + */ + public native AVDictionary metadata(); public native AVStreamGroup metadata(AVDictionary setter); + + /** + * Number of elements in AVStreamGroup.streams. + * + * Set by avformat_stream_group_add_stream() must not be modified by any other code. + */ + public native @Cast("unsigned int") int nb_streams(); public native AVStreamGroup nb_streams(int setter); + + /** + * A list of streams in the group. New entries are created with + * avformat_stream_group_add_stream(). + * + * - demuxing: entries are created by libavformat on group creation. + * If AVFMTCTX_NOHEADER is set in ctx_flags, then new entries may also + * appear in av_read_frame(). + * - muxing: entries are created by the user before avformat_write_header(). + * + * Freed by libavformat in avformat_free_context(). + */ + public native AVStream streams(int i); public native AVStreamGroup streams(int i, AVStream setter); + public native @Cast("AVStream**") PointerPointer streams(); public native AVStreamGroup streams(PointerPointer setter); + + /** + * Stream group disposition - a combination of AV_DISPOSITION_* flags. + * This field currently applies to all defined AVStreamGroupParamsType. + * + * - demuxing: set by libavformat when creating the group or in + * avformat_find_stream_info(). + * - muxing: may be set by the caller before avformat_write_header(). + */ + public native int disposition(); public native AVStreamGroup disposition(int setter); +} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroupTileGrid.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroupTileGrid.java new file mode 100644 index 00000000000..97f127ca121 --- /dev/null +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/AVStreamGroupTileGrid.java @@ -0,0 +1,193 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.ffmpeg.avformat; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; +import org.bytedeco.ffmpeg.avutil.*; +import static org.bytedeco.ffmpeg.global.avutil.*; +import org.bytedeco.ffmpeg.swresample.*; +import static org.bytedeco.ffmpeg.global.swresample.*; +import org.bytedeco.ffmpeg.avcodec.*; +import static org.bytedeco.ffmpeg.global.avcodec.*; + +import static org.bytedeco.ffmpeg.global.avformat.*; + + +/** + * AVStreamGroupTileGrid holds information on how to combine several + * independent images on a single canvas for presentation. + * + * The output should be a \ref AVStreamGroupTileGrid.background "background" + * colored \ref AVStreamGroupTileGrid.coded_width "coded_width" x + * \ref AVStreamGroupTileGrid.coded_height "coded_height" canvas where a + * \ref AVStreamGroupTileGrid.nb_tiles "nb_tiles" amount of tiles are placed in + * the order they appear in the \ref AVStreamGroupTileGrid.offsets "offsets" + * array, at the exact offset described for them. In particular, if two or more + * tiles overlap, the image with higher index in the + * \ref AVStreamGroupTileGrid.offsets "offsets" array takes priority. + * Note that a single image may be used multiple times, i.e. multiple entries + * in \ref AVStreamGroupTileGrid.offsets "offsets" may have the same value of + * idx. + * + * The following is an example of a simple grid with 3 rows and 4 columns: + * + * +---+---+---+---+ + * | 0 | 1 | 2 | 3 | + * +---+---+---+---+ + * | 4 | 5 | 6 | 7 | + * +---+---+---+---+ + * | 8 | 9 |10 |11 | + * +---+---+---+---+ + * + * Assuming all tiles have a dimension of 512x512, the + * \ref AVStreamGroupTileGrid.offsets "offset" of the topleft pixel of + * the first \ref AVStreamGroup.streams "stream" in the group is "0,0", the + * \ref AVStreamGroupTileGrid.offsets "offset" of the topleft pixel of + * the second \ref AVStreamGroup.streams "stream" in the group is "512,0", the + * \ref AVStreamGroupTileGrid.offsets "offset" of the topleft pixel of + * the fifth \ref AVStreamGroup.streams "stream" in the group is "0,512", the + * \ref AVStreamGroupTileGrid.offsets "offset", of the topleft pixel of + * the sixth \ref AVStreamGroup.streams "stream" in the group is "512,512", + * etc. + * + * The following is an example of a canvas with overlaping tiles: + * + * +-----------+ + * | %%%%% | + * |***%%3%%{@literal @}\| + * |**0%%%%%2{@literal @}| + * |***##1{@literal @}{@literal @}\| + * | ##### | + * +-----------+ + * + * Assuming a canvas with size 1024x1024 and all tiles with a dimension of + * 512x512, a possible \ref AVStreamGroupTileGrid.offsets "offset" for the + * topleft pixel of the first \ref AVStreamGroup.streams "stream" in the group + * would be 0x256, the \ref AVStreamGroupTileGrid.offsets "offset" for the + * topleft pixel of the second \ref AVStreamGroup.streams "stream" in the group + * would be 256x512, the \ref AVStreamGroupTileGrid.offsets "offset" for the + * topleft pixel of the third \ref AVStreamGroup.streams "stream" in the group + * would be 512x256, and the \ref AVStreamGroupTileGrid.offsets "offset" for + * the topleft pixel of the fourth \ref AVStreamGroup.streams "stream" in the + * group would be 256x0. + * + * sizeof(AVStreamGroupTileGrid) is not a part of the ABI and may only be + * allocated by avformat_stream_group_create(). + */ +@Properties(inherit = org.bytedeco.ffmpeg.presets.avformat.class) +public class AVStreamGroupTileGrid extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public AVStreamGroupTileGrid() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public AVStreamGroupTileGrid(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AVStreamGroupTileGrid(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public AVStreamGroupTileGrid position(long position) { + return (AVStreamGroupTileGrid)super.position(position); + } + @Override public AVStreamGroupTileGrid getPointer(long i) { + return new AVStreamGroupTileGrid((Pointer)this).offsetAddress(i); + } + + public native @Const AVClass av_class(); public native AVStreamGroupTileGrid av_class(AVClass setter); + + /** + * Amount of tiles in the grid. + * + * Must be > 0. + */ + public native @Cast("unsigned int") int nb_tiles(); public native AVStreamGroupTileGrid nb_tiles(int setter); + + /** + * Width of the canvas. + * + * Must be > 0. + */ + public native int coded_width(); public native AVStreamGroupTileGrid coded_width(int setter); + /** + * Width of the canvas. + * + * Must be > 0. + */ + public native int coded_height(); public native AVStreamGroupTileGrid coded_height(int setter); + + /** + * An \ref nb_tiles sized array of offsets in pixels from the topleft edge + * of the canvas, indicating where each stream should be placed. + * It must be allocated with the av_malloc() family of functions. + * + * - demuxing: set by libavformat, must not be modified by the caller. + * - muxing: set by the caller before avformat_write_header(). + * + * Freed by libavformat in avformat_free_context(). + */ + /** + * Index of the stream in the group this tile references. + * + * Must be < \ref AVStreamGroup.nb_streams "nb_streams". + */ + @Name({"offsets", ".idx"}) public native @Cast("unsigned int") int offsets_idx(int i); public native AVStreamGroupTileGrid offsets_idx(int i, int setter); + /** + * Offset in pixels from the left edge of the canvas where the tile + * should be placed. + */ + @Name({"offsets", ".horizontal"}) public native int offsets_horizontal(int i); public native AVStreamGroupTileGrid offsets_horizontal(int i, int setter); + /** + * Offset in pixels from the top edge of the canvas where the tile + * should be placed. + */ + @Name({"offsets", ".vertical"}) public native int offsets_vertical(int i); public native AVStreamGroupTileGrid offsets_vertical(int i, int setter); + + /** + * The pixel value per channel in RGBA format used if no pixel of any tile + * is located at a particular pixel location. + * + * @see av_image_fill_color(). + * @see av_parse_color(). + */ + public native @Cast("uint8_t") byte background(int i); public native AVStreamGroupTileGrid background(int i, byte setter); + @MemberGetter public native @Cast("uint8_t*") BytePointer background(); + + /** + * Offset in pixels from the left edge of the canvas where the actual image + * meant for presentation starts. + * + * This field must be >= 0 and < \ref coded_width. + */ + public native int horizontal_offset(); public native AVStreamGroupTileGrid horizontal_offset(int setter); + /** + * Offset in pixels from the top edge of the canvas where the actual image + * meant for presentation starts. + * + * This field must be >= 0 and < \ref coded_height. + */ + public native int vertical_offset(); public native AVStreamGroupTileGrid vertical_offset(int setter); + + /** + * Width of the final image for presentation. + * + * Must be > 0 and <= (\ref coded_width - \ref horizontal_offset). + * When it's not equal to (\ref coded_width - \ref horizontal_offset), the + * result of (\ref coded_width - width - \ref horizontal_offset) is the + * amount amount of pixels to be cropped from the right edge of the + * final image before presentation. + */ + public native int width(); public native AVStreamGroupTileGrid width(int setter); + /** + * Height of the final image for presentation. + * + * Must be > 0 and <= (\ref coded_height - \ref vertical_offset). + * When it's not equal to (\ref coded_height - \ref vertical_offset), the + * result of (\ref coded_height - height - \ref vertical_offset) is the + * amount amount of pixels to be cropped from the bottom edge of the + * final image before presentation. + */ + public native int height(); public native AVStreamGroupTileGrid height(int setter); +} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_ByteBuffer_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_ByteBuffer_int.java index 5cfb8455f17..805ad792275 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_ByteBuffer_int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_ByteBuffer_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_BytePointer_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_BytePointer_int.java index ae4dc8c3ba3..916b5b4ee3d 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_BytePointer_int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_BytePointer_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_byte___int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_byte___int.java index c3943bd8046..782b90c5121 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_byte___int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Read_packet_Pointer_byte___int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Seek_Pointer_long_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Seek_Pointer_long_int.java index cca66f1d36c..777c6a3aa17 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Seek_Pointer_long_int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Seek_Pointer_long_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_ByteBuffer_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_ByteBuffer_int.java index c6b2c4f2da1..11996e2f8e9 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_ByteBuffer_int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_ByteBuffer_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -23,5 +23,5 @@ public class Write_packet_Pointer_ByteBuffer_int extends FunctionPointer { public Write_packet_Pointer_ByteBuffer_int(Pointer p) { super(p); } protected Write_packet_Pointer_ByteBuffer_int() { allocate(); } private native void allocate(); - public native int call(Pointer opaque, @Cast("uint8_t*") ByteBuffer buf, int buf_size); + public native int call(Pointer opaque, @Cast("const uint8_t*") ByteBuffer buf, int buf_size); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_BytePointer_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_BytePointer_int.java index ca6716b1e4b..4b59cc1c6c4 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_BytePointer_int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_BytePointer_int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -23,5 +23,5 @@ public class Write_packet_Pointer_BytePointer_int extends FunctionPointer { public Write_packet_Pointer_BytePointer_int(Pointer p) { super(p); } protected Write_packet_Pointer_BytePointer_int() { allocate(); } private native void allocate(); - public native int call(Pointer opaque, @Cast("uint8_t*") BytePointer buf, int buf_size); + public native int call(Pointer opaque, @Cast("const uint8_t*") BytePointer buf, int buf_size); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_byte___int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_byte___int.java index 25384406886..bee7f0bd72e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_byte___int.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/Write_packet_Pointer_byte___int.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; @@ -23,5 +23,5 @@ public class Write_packet_Pointer_byte___int extends FunctionPointer { public Write_packet_Pointer_byte___int(Pointer p) { super(p); } protected Write_packet_Pointer_byte___int() { allocate(); } private native void allocate(); - public native int call(Pointer opaque, @Cast("uint8_t*") byte[] buf, int buf_size); + public native int call(Pointer opaque, @Cast("const uint8_t*") byte[] buf, int buf_size); } diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/av_format_control_message.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/av_format_control_message.java index 1f7ee44ee13..01a8de832ec 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/av_format_control_message.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avformat/av_format_control_message.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avformat; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAES.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAES.java index d5fbe3aa688..67616acaf3a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAES.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAES.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAESCTR.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAESCTR.java index ea5ab9e7595..56f827de283 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAESCTR.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAESCTR.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAudioFifo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAudioFifo.java index 9850c7da389..8cc3afd3b8e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAudioFifo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVAudioFifo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBPrint.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBPrint.java index 986f0df161d..b85dc484402 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBPrint.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBPrint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBlowfish.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBlowfish.java index 006a5352c6d..c1437d40129 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBlowfish.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBlowfish.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBuffer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBuffer.java index 196b23e465b..8d2f931e2c2 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBuffer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBuffer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferPool.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferPool.java index 0d606c56331..a237549e491 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferPool.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferPool.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferRef.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferRef.java index e333ca28903..4ff6cc40d0a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferRef.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVBufferRef.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAMELLIA.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAMELLIA.java index 0eea154a587..de66117bea9 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAMELLIA.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAMELLIA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAST5.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAST5.java index 89f6d2912eb..28ca6953ff8 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAST5.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVCAST5.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelCustom.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelCustom.java index 4bc8675b488..dd24ffa526c 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelCustom.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelCustom.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelLayout.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelLayout.java index 184713b6a7e..8b7947a42ee 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelLayout.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVChannelLayout.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVClass.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVClass.java index b8d31bbfb10..c48cf8561db 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVClass.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVClass.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexDouble.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexDouble.java index e8d07d5f0c5..24893e282c7 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexDouble.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexDouble.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexFloat.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexFloat.java index de757dd62ea..4be12bd3bce 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexFloat.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexFloat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexInt32.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexInt32.java index 602a7e11220..d89a298b159 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexInt32.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComplexInt32.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComponentDescriptor.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComponentDescriptor.java index c9179d059d9..7516b9c7f78 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComponentDescriptor.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVComponentDescriptor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVContentLightMetadata.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVContentLightMetadata.java index 5eb1bb4d5f6..7511e239817 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVContentLightMetadata.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVContentLightMetadata.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDES.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDES.java index b998ebdddfb..8723cc66fff 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDES.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDES.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionary.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionary.java index ce71b61bba8..7fd46645b6a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionary.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionary.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionaryEntry.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionaryEntry.java index c1ae83c5c5c..6c62539dd60 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionaryEntry.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDictionaryEntry.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDownmixInfo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDownmixInfo.java index d436b20c5a6..248db759f03 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDownmixInfo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDownmixInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDynamicHDRPlus.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDynamicHDRPlus.java index 90fa874f933..2c7880f15df 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDynamicHDRPlus.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVDynamicHDRPlus.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInfo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInfo.java index 8258686d3cf..70c8c9c09bb 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInfo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInitInfo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInitInfo.java index 8de6d8154e1..61569d7695e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInitInfo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVEncryptionInitInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVExpr.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVExpr.java index 47eba2f4fb9..f7955e084c1 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVExpr.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVExpr.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifo.java index 422e77eb769..05ecc6b72ae 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoBuffer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoBuffer.java deleted file mode 100644 index 613c1be089b..00000000000 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoBuffer.java +++ /dev/null @@ -1,40 +0,0 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE - -package org.bytedeco.ffmpeg.avutil; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.ffmpeg.global.avutil.*; - - - -// #if FF_API_FIFO_OLD_API -@Properties(inherit = org.bytedeco.ffmpeg.presets.avutil.class) -public class AVFifoBuffer extends Pointer { - static { Loader.load(); } - /** Default native constructor. */ - public AVFifoBuffer() { super((Pointer)null); allocate(); } - /** Native array allocator. Access with {@link Pointer#position(long)}. */ - public AVFifoBuffer(long size) { super((Pointer)null); allocateArray(size); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public AVFifoBuffer(Pointer p) { super(p); } - private native void allocate(); - private native void allocateArray(long size); - @Override public AVFifoBuffer position(long position) { - return (AVFifoBuffer)super.position(position); - } - @Override public AVFifoBuffer getPointer(long i) { - return new AVFifoBuffer((Pointer)this).offsetAddress(i); - } - - public native @Cast("uint8_t*") BytePointer buffer(); public native AVFifoBuffer buffer(BytePointer setter); - public native @Cast("uint8_t*") BytePointer rptr(); public native AVFifoBuffer rptr(BytePointer setter); - public native @Cast("uint8_t*") BytePointer wptr(); public native AVFifoBuffer wptr(BytePointer setter); - public native @Cast("uint8_t*") BytePointer end(); public native AVFifoBuffer end(BytePointer setter); - public native @Cast("uint32_t") int rndx(); public native AVFifoBuffer rndx(int setter); - public native @Cast("uint32_t") int wndx(); public native AVFifoBuffer wndx(int setter); -} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoCB.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoCB.java index dc98f152e7d..8fecf4a9c6e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoCB.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFifoCB.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrame.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrame.java index 7ec79692650..9f6662b5afb 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrame.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrame.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; @@ -190,17 +190,6 @@ public class AVFrame extends Pointer { */ public native @ByRef AVRational time_base(); public native AVFrame time_base(AVRational setter); -// #if FF_API_FRAME_PICTURE_NUMBER - /** - * picture number in bitstream order - */ - public native @Deprecated int coded_picture_number(); public native AVFrame coded_picture_number(int setter); - /** - * picture number in display order - */ - public native @Deprecated int display_picture_number(); public native AVFrame display_picture_number(int setter); -// #endif - /** * quality (between 1 (good) and FF_LAMBDA_MAX (bad)) */ @@ -265,33 +254,11 @@ public class AVFrame extends Pointer { public native @Deprecated int palette_has_changed(); public native AVFrame palette_has_changed(int setter); // #endif -// #if FF_API_REORDERED_OPAQUE - /** - * reordered opaque 64 bits (generally an integer or a double precision float - * PTS but can be anything). - * The user sets AVCodecContext.reordered_opaque to represent the input at - * that time, - * the decoder reorders values as needed and sets AVFrame.reordered_opaque - * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque - * - * @deprecated Use AV_CODEC_FLAG_COPY_OPAQUE instead - */ - public native @Cast("int64_t") @Deprecated long reordered_opaque(); public native AVFrame reordered_opaque(long setter); -// #endif - /** * Sample rate of the audio data. */ public native int sample_rate(); public native AVFrame sample_rate(int setter); -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * Channel layout of the audio data. - * @deprecated use ch_layout instead - */ - public native @Cast("uint64_t") @Deprecated long channel_layout(); public native AVFrame channel_layout(long setter); -// #endif - /** * AVBuffer references backing the data for this frame. All the pointers in * data and extended_data must point inside one of the buffers in buf or @@ -406,18 +373,6 @@ public class AVFrame extends Pointer { public native @Cast("int64_t") @Deprecated long pkt_pos(); public native AVFrame pkt_pos(long setter); // #endif -// #if FF_API_PKT_DURATION - /** - * duration of the corresponding packet, expressed in - * AVStream->time_base units, 0 if unknown. - * - encoding: unused - * - decoding: Read by user. - * - * @deprecated use duration instead - */ - public native @Cast("int64_t") @Deprecated long pkt_duration(); public native AVFrame pkt_duration(long setter); -// #endif - /** * metadata. * - encoding: Set by user. @@ -438,16 +393,6 @@ public class AVFrame extends Pointer { public static final int FF_DECODE_ERROR_CONCEALMENT_ACTIVE = 4; public static final int FF_DECODE_ERROR_DECODE_SLICES = 8; -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * number of audio channels, only used for audio. - * - encoding: unused - * - decoding: Read by user. - * @deprecated use ch_layout instead - */ - public native @Deprecated int channels(); public native AVFrame channels(int setter); -// #endif - // #if FF_API_FRAME_PKT /** * size of the corresponding packet containing the compressed diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrameSideData.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrameSideData.java index 02276cd4c48..f588664d30a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrameSideData.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVFrameSideData.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusColorTransformParams.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusColorTransformParams.java index 86b75a40b31..8e667e50ae1 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusColorTransformParams.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusColorTransformParams.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusPercentile.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusPercentile.java index bbc4a94a23b..54227a7a0e5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusPercentile.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHDRPlusPercentile.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHMAC.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHMAC.java index 00a13dec25f..386c43d33d8 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHMAC.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHMAC.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceContext.java index c59e3e99496..dbccd5d46fa 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; @@ -51,12 +51,6 @@ public class AVHWDeviceContext extends Pointer { */ public native @Const AVClass av_class(); public native AVHWDeviceContext av_class(AVClass setter); - /** - * Private data used internally by libavutil. Must not be accessed in any - * way by the caller. - */ - public native AVHWDeviceInternal internal(); public native AVHWDeviceContext internal(AVHWDeviceInternal setter); - /** * This field identifies the underlying API used for hardware access. * diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceInternal.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceInternal.java deleted file mode 100644 index e423c99dcaa..00000000000 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWDeviceInternal.java +++ /dev/null @@ -1,20 +0,0 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE - -package org.bytedeco.ffmpeg.avutil; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.ffmpeg.global.avutil.*; - - -@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avutil.class) -public class AVHWDeviceInternal extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public AVHWDeviceInternal() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public AVHWDeviceInternal(Pointer p) { super(p); } -} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesConstraints.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesConstraints.java index 11a04d13bab..3813236f114 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesConstraints.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesConstraints.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesContext.java index 30622556e40..72128209a9f 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; @@ -44,12 +44,6 @@ public class AVHWFramesContext extends Pointer { */ public native @Const AVClass av_class(); public native AVHWFramesContext av_class(AVClass setter); - /** - * Private data used internally by libavutil. Must not be accessed in any - * way by the caller. - */ - public native AVHWFramesInternal internal(); public native AVHWFramesContext internal(AVHWFramesInternal setter); - /** * A reference to the parent AVHWDeviceContext. This reference is owned and * managed by the enclosing AVHWFramesContext, but the caller may derive @@ -69,9 +63,12 @@ public class AVHWFramesContext extends Pointer { * The format-specific data, allocated and freed automatically along with * this context. * - * Should be cast by the user to the format-specific context defined in the - * corresponding header (hwframe_*.h) and filled as described in the - * documentation before calling av_hwframe_ctx_init(). + * The user shall ignore this field if the corresponding format-specific + * header (hwcontext_*.h) does not define a context to be used as + * AVHWFramesContext.hwctx. + * + * Otherwise, it should be cast by the user to said context and filled + * as described in the documentation before calling av_hwframe_ctx_init(). * * After any frames using this context are created, the contents of this * struct should not be modified by the caller. diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesInternal.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesInternal.java deleted file mode 100644 index bd82426a2b4..00000000000 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHWFramesInternal.java +++ /dev/null @@ -1,20 +0,0 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE - -package org.bytedeco.ffmpeg.avutil; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.ffmpeg.global.avutil.*; - - -@Opaque @Properties(inherit = org.bytedeco.ffmpeg.presets.avutil.class) -public class AVHWFramesInternal extends Pointer { - /** Empty constructor. Calls {@code super((Pointer)null)}. */ - public AVHWFramesInternal() { super((Pointer)null); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public AVHWFramesInternal(Pointer p) { super(p); } -} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHashContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHashContext.java index 32890046826..c320c38785c 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHashContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVHashContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVLFG.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVLFG.java index a8bfe6d6b09..4c073b08f49 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVLFG.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVLFG.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMD5.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMD5.java index 90e98b7bdf4..48c90431667 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMD5.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMD5.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMasteringDisplayMetadata.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMasteringDisplayMetadata.java index 3aa176a872c..4948592deca 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMasteringDisplayMetadata.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMasteringDisplayMetadata.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMotionVector.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMotionVector.java index 32fc2540cac..df056e886e6 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMotionVector.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVMotionVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOption.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOption.java index af5bbf0d0b5..f4107a8b5fc 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOption.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOption.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; @@ -41,6 +41,8 @@ public class AVOption extends Pointer { public native @Cast("const char*") BytePointer help(); public native AVOption help(BytePointer setter); /** + * Native access only. + * * The offset relative to the context structure where the option * value is stored. It should be 0 for named constants. */ @@ -48,6 +50,7 @@ public class AVOption extends Pointer { public native @Cast("AVOptionType") int type(); public native AVOption type(int setter); /** + * Native access only, except when documented otherwise. * the default value for scalar options */ @Name("default_val.i64") public native @Cast("int64_t") long default_val_i64(); public native AVOption default_val_i64(long setter); @@ -55,39 +58,23 @@ public class AVOption extends Pointer { @Name("default_val.str") public native @Cast("const char*") BytePointer default_val_str(); public native AVOption default_val_str(BytePointer setter); /* TODO those are unused now */ @Name("default_val.q") public native @ByRef AVRational default_val_q(); public native AVOption default_val_q(AVRational setter); + + /** + * Used for AV_OPT_TYPE_FLAG_ARRAY options. May be NULL. + * + * Foreign access to some members allowed, as noted in AVOptionArrayDef + * documentation. + */ + @Name("default_val.arr") public native @Const AVOptionArrayDef default_val_arr(); public native AVOption default_val_arr(AVOptionArrayDef setter); /** minimum valid value for the option */ public native double min(); public native AVOption min(double setter); /** maximum valid value for the option */ public native double max(); public native AVOption max(double setter); + /** + * A combination of AV_OPT_FLAG_*. + */ public native int flags(); public native AVOption flags(int setter); -/** a generic parameter which can be set by the user for muxing or encoding */ -public static final int AV_OPT_FLAG_ENCODING_PARAM = 1; -/** a generic parameter which can be set by the user for demuxing or decoding */ -public static final int AV_OPT_FLAG_DECODING_PARAM = 2; -public static final int AV_OPT_FLAG_AUDIO_PARAM = 8; -public static final int AV_OPT_FLAG_VIDEO_PARAM = 16; -public static final int AV_OPT_FLAG_SUBTITLE_PARAM = 32; -/** - * The option is intended for exporting values to the caller. - */ -public static final int AV_OPT_FLAG_EXPORT = 64; -/** - * The option may not be set through the AVOptions API, only read. - * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set. - */ -public static final int AV_OPT_FLAG_READONLY = 128; -/** a generic parameter which can be set by the user for bit stream filtering */ -public static final int AV_OPT_FLAG_BSF_PARAM = (1<<8); -/** a generic parameter which can be set by the user at runtime */ -public static final int AV_OPT_FLAG_RUNTIME_PARAM = (1<<15); -/** a generic parameter which can be set by the user for filtering */ -public static final int AV_OPT_FLAG_FILTERING_PARAM = (1<<16); -/** set if option is deprecated, users should refer to AVOption.help text for more information */ -public static final int AV_OPT_FLAG_DEPRECATED = (1<<17); -/** set if option constants can also reside in child objects */ -public static final int AV_OPT_FLAG_CHILD_CONSTS = (1<<18); -//FIXME think about enc-audio, ... style flags /** * The logical unit to which the option belongs. Non-constant diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionArrayDef.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionArrayDef.java new file mode 100644 index 00000000000..a68605e3237 --- /dev/null +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionArrayDef.java @@ -0,0 +1,63 @@ +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE + +package org.bytedeco.ffmpeg.avutil; + +import java.nio.*; +import org.bytedeco.javacpp.*; +import org.bytedeco.javacpp.annotation.*; + +import static org.bytedeco.javacpp.presets.javacpp.*; + +import static org.bytedeco.ffmpeg.global.avutil.*; + + +/** + * May be set as default_val for AV_OPT_TYPE_FLAG_ARRAY options. + */ +@Properties(inherit = org.bytedeco.ffmpeg.presets.avutil.class) +public class AVOptionArrayDef extends Pointer { + static { Loader.load(); } + /** Default native constructor. */ + public AVOptionArrayDef() { super((Pointer)null); allocate(); } + /** Native array allocator. Access with {@link Pointer#position(long)}. */ + public AVOptionArrayDef(long size) { super((Pointer)null); allocateArray(size); } + /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ + public AVOptionArrayDef(Pointer p) { super(p); } + private native void allocate(); + private native void allocateArray(long size); + @Override public AVOptionArrayDef position(long position) { + return (AVOptionArrayDef)super.position(position); + } + @Override public AVOptionArrayDef getPointer(long i) { + return new AVOptionArrayDef((Pointer)this).offsetAddress(i); + } + + /** + * Native access only. + * + * Default value of the option, as would be serialized by av_opt_get() (i.e. + * using the value of sep as the separator). + */ + public native @Cast("const char*") BytePointer def(); public native AVOptionArrayDef def(BytePointer setter); + + /** + * Minimum number of elements in the array. When this field is non-zero, def + * must be non-NULL and contain at least this number of elements. + */ + public native @Cast("unsigned") int size_min(); public native AVOptionArrayDef size_min(int setter); + /** + * Maximum number of elements in the array, 0 when unlimited. + */ + public native @Cast("unsigned") int size_max(); public native AVOptionArrayDef size_max(int setter); + + /** + * Separator between array elements in string representations of this + * option, used by av_opt_set() and av_opt_get(). It must be a printable + * ASCII character, excluding alphanumeric and the backslash. A comma is + * used when sep=0. + * + * The separator and the backslash must be backslash-escaped in order to + * appear in string representations of the option value. + */ + public native @Cast("char") byte sep(); public native AVOptionArrayDef sep(byte setter); +} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRange.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRange.java index 110c1f35f35..7dc4d8c94d9 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRange.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRange.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRanges.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRanges.java index a6821808e15..d8d379703c5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRanges.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVOptionRanges.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVPixFmtDescriptor.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVPixFmtDescriptor.java index 2a8fa5a88ec..289957de915 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVPixFmtDescriptor.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVPixFmtDescriptor.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRC4.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRC4.java index de518ff2cb7..25d56df5404 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRC4.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRC4.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRIPEMD.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRIPEMD.java index 743ea9237cf..8ca513e6736 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRIPEMD.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRIPEMD.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRational.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRational.java index 3ab3dd4eff6..8fe4a2122fd 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRational.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRational.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRegionOfInterest.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRegionOfInterest.java index 61922df1e01..874fc236946 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRegionOfInterest.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVRegionOfInterest.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVReplayGain.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVReplayGain.java index 4b8628f40fe..881070e2fdd 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVReplayGain.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVReplayGain.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA.java index 9773910e46a..e1802ecc925 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA512.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA512.java index 32673422cc2..025abf44060 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA512.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSHA512.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSphericalMapping.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSphericalMapping.java index bdbcc80ef2d..6a9fbd8745b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSphericalMapping.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSphericalMapping.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVStereo3D.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVStereo3D.java index b8d5f9848e4..93a72d30b86 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVStereo3D.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVStereo3D.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSubsampleEncryptionInfo.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSubsampleEncryptionInfo.java index 5ad42234115..f812ebcdec5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSubsampleEncryptionInfo.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVSubsampleEncryptionInfo.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTEA.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTEA.java index 647cbace780..ecb5fbface5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTEA.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTEA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTWOFISH.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTWOFISH.java index f6e57671b20..c3f7d7bf105 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTWOFISH.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTWOFISH.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTXContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTXContext.java index d47bb3bab7a..09371a59dac 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTXContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTXContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVThreadMessageQueue.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVThreadMessageQueue.java index c048823aa1c..357a6720b17 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVThreadMessageQueue.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVThreadMessageQueue.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTimecode.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTimecode.java index df577a14e97..7ea75c1e89e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTimecode.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTimecode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTreeNode.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTreeNode.java index 32241f6c4b2..d287a66e267 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTreeNode.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVTreeNode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVXTEA.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVXTEA.java index a2be919c3d7..5bb2e107393 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVXTEA.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/AVXTEA.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_Pointer_long.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_Pointer_long.java index d5de2fb43b7..8f76d4a407d 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_Pointer_long.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_Pointer_long.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_long.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_long.java index 514221c6ee9..d9e73885e09 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_long.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Alloc_long.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_BytePointer_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_BytePointer_Pointer.java index b429b1e6c5e..1635ba82cb7 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_BytePointer_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_BytePointer_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_String_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_String_Pointer.java index bceae3b9a9e..80991c6476f 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_String_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Callback_Pointer_int_String_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Const_Pointer_Const_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Const_Pointer_Const_Pointer.java index 4ac502655ae..f7b3404aa7e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Const_Pointer_Const_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Const_Pointer_Const_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Pointer_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Pointer_Pointer.java index 5adc538fd75..6752f4237c2 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Pointer_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Cmp_Pointer_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Enu_Pointer_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Enu_Pointer_Pointer.java index 62a82df8089..373757bcf65 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Enu_Pointer_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Enu_Pointer_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_ByteBuffer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_ByteBuffer.java index d76334dbdd4..241fd1982f2 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_ByteBuffer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_ByteBuffer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_BytePointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_BytePointer.java index 6fb2a9eb3b9..fe82058e9c6 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_BytePointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_BytePointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_byte__.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_byte__.java index 3c47a65b233..b29b17f5ba2 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_byte__.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_Pointer_byte__.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_func_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_func_Pointer.java index 469a88b70ed..e07798bfd63 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_func_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Free_func_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Func_Pointer_Pointer_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Func_Pointer_Pointer_int.java deleted file mode 100644 index 571aea52c4c..00000000000 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Func_Pointer_Pointer_int.java +++ /dev/null @@ -1,36 +0,0 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE - -package org.bytedeco.ffmpeg.avutil; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.ffmpeg.global.avutil.*; - - -/** - * Feed data at specific position from an AVFifoBuffer to a user-supplied callback. - * Similar as av_fifo_gereric_read but without discarding data. - * @param f AVFifoBuffer to read from - * @param offset offset from current read position - * @param buf_size number of bytes to read - * @param func generic read function - * @param dest data destination - * - * @return a non-negative number on success, a negative error code on failure - * - * @deprecated use the new AVFifo-API with av_fifo_peek() when func == NULL, - * av_fifo_peek_to_cb() otherwise - */ -@Properties(inherit = org.bytedeco.ffmpeg.presets.avutil.class) -public class Func_Pointer_Pointer_int extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Func_Pointer_Pointer_int(Pointer p) { super(p); } - protected Func_Pointer_Pointer_int() { allocate(); } - private native void allocate(); - public native void call(Pointer arg0, Pointer arg1, int arg2); -} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs1_Pointer_double.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs1_Pointer_double.java index ef74e4288c3..263b1366cd8 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs1_Pointer_double.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs1_Pointer_double.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs2_Pointer_double_double.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs2_Pointer_double_double.java index 82397884cbd..d5cd4e58aa3 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs2_Pointer_double_double.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Funcs2_Pointer_double_double.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Int_func_Pointer_Pointer_int.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Int_func_Pointer_Pointer_int.java deleted file mode 100644 index d769430276a..00000000000 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Int_func_Pointer_Pointer_int.java +++ /dev/null @@ -1,38 +0,0 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE - -package org.bytedeco.ffmpeg.avutil; - -import java.nio.*; -import org.bytedeco.javacpp.*; -import org.bytedeco.javacpp.annotation.*; - -import static org.bytedeco.javacpp.presets.javacpp.*; - -import static org.bytedeco.ffmpeg.global.avutil.*; - - -/** - * Feed data from a user-supplied callback to an AVFifoBuffer. - * @param f AVFifoBuffer to write to - * @param src data source; non-const since it may be used as a - * modifiable context by the function defined in func - * @param size number of bytes to write - * @param func generic write function; the first parameter is src, - * the second is dest_buf, the third is dest_buf_size. - * func must return the number of bytes written to dest_buf, or <= 0 to - * indicate no more data available to write. - * If func is NULL, src is interpreted as a simple byte array for source data. - * @return the number of bytes written to the FIFO or a negative error code on failure - * - * @deprecated use the new AVFifo-API with av_fifo_write() when func == NULL, - * av_fifo_write_from_cb() otherwise - */ -@Properties(inherit = org.bytedeco.ffmpeg.presets.avutil.class) -public class Int_func_Pointer_Pointer_int extends FunctionPointer { - static { Loader.load(); } - /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */ - public Int_func_Pointer_Pointer_int(Pointer p) { super(p); } - protected Int_func_Pointer_Pointer_int() { allocate(); } - private native void allocate(); - public native int call(Pointer arg0, Pointer arg1, int arg2); -} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/LogCallback.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/LogCallback.java index be6639f9ef1..64c6a44dcac 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/LogCallback.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/LogCallback.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Pool_free_Pointer.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Pool_free_Pointer.java index e0305935e23..d26bfa055ed 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Pool_free_Pointer.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/Pool_free_Pointer.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias16.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias16.java index 287d60c5e19..6413018449b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias16.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias16.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias32.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias32.java index 145a638a37a..f1c8fe87f2d 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias32.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias32.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias64.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias64.java index 98c446560f9..b230e0d340b 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias64.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_alias64.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat32.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat32.java index a47b06f5aa9..6fb7be45f6a 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat32.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat32.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat64.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat64.java index 93c47d5f853..6e335a84601 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat64.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_intfloat64.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_pixelutils_sad_fn.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_pixelutils_sad_fn.java index 33413774fea..361c2d33fc2 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_pixelutils_sad_fn.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_pixelutils_sad_fn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_tx_fn.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_tx_fn.java index 6d29ad94bcf..c700db1cfdd 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_tx_fn.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/av_tx_fn.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/ff_pad_helper_AVBPrint.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/ff_pad_helper_AVBPrint.java index 7ba3e034fb1..68e9f4dec6c 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/ff_pad_helper_AVBPrint.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/ff_pad_helper_AVBPrint.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/tm.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/tm.java index 6ddb0c61f93..46d293ce4d0 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/tm.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/tm.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_16.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_16.java index a407724aa3c..9a5c83ca306 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_16.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_16.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_32.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_32.java index e1bdf304805..a2d26812d74 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_32.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_32.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_64.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_64.java index d3b952891ac..9b9e7cbf0ee 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_64.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avutil/unaligned_64.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.avutil; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java index 03f072be4e8..84b599959fe 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avcodec.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -279,77 +279,75 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { AV_CODEC_ID_AVRP = 198, AV_CODEC_ID_012V = 199, AV_CODEC_ID_AVUI = 200, -// #if FF_API_AYUV_CODECID - AV_CODEC_ID_AYUV = 201, -// #endif - AV_CODEC_ID_TARGA_Y216 = 202, - AV_CODEC_ID_V308 = 203, - AV_CODEC_ID_V408 = 204, - AV_CODEC_ID_YUV4 = 205, - AV_CODEC_ID_AVRN = 206, - AV_CODEC_ID_CPIA = 207, - AV_CODEC_ID_XFACE = 208, - AV_CODEC_ID_SNOW = 209, - AV_CODEC_ID_SMVJPEG = 210, - AV_CODEC_ID_APNG = 211, - AV_CODEC_ID_DAALA = 212, - AV_CODEC_ID_CFHD = 213, - AV_CODEC_ID_TRUEMOTION2RT = 214, - AV_CODEC_ID_M101 = 215, - AV_CODEC_ID_MAGICYUV = 216, - AV_CODEC_ID_SHEERVIDEO = 217, - AV_CODEC_ID_YLC = 218, - AV_CODEC_ID_PSD = 219, - AV_CODEC_ID_PIXLET = 220, - AV_CODEC_ID_SPEEDHQ = 221, - AV_CODEC_ID_FMVC = 222, - AV_CODEC_ID_SCPR = 223, - AV_CODEC_ID_CLEARVIDEO = 224, - AV_CODEC_ID_XPM = 225, - AV_CODEC_ID_AV1 = 226, - AV_CODEC_ID_BITPACKED = 227, - AV_CODEC_ID_MSCC = 228, - AV_CODEC_ID_SRGC = 229, - AV_CODEC_ID_SVG = 230, - AV_CODEC_ID_GDV = 231, - AV_CODEC_ID_FITS = 232, - AV_CODEC_ID_IMM4 = 233, - AV_CODEC_ID_PROSUMER = 234, - AV_CODEC_ID_MWSC = 235, - AV_CODEC_ID_WCMV = 236, - AV_CODEC_ID_RASC = 237, - AV_CODEC_ID_HYMT = 238, - AV_CODEC_ID_ARBC = 239, - AV_CODEC_ID_AGM = 240, - AV_CODEC_ID_LSCR = 241, - AV_CODEC_ID_VP4 = 242, - AV_CODEC_ID_IMM5 = 243, - AV_CODEC_ID_MVDV = 244, - AV_CODEC_ID_MVHA = 245, - AV_CODEC_ID_CDTOONS = 246, - AV_CODEC_ID_MV30 = 247, - AV_CODEC_ID_NOTCHLC = 248, - AV_CODEC_ID_PFM = 249, - AV_CODEC_ID_MOBICLIP = 250, - AV_CODEC_ID_PHOTOCD = 251, - AV_CODEC_ID_IPU = 252, - AV_CODEC_ID_ARGO = 253, - AV_CODEC_ID_CRI = 254, - AV_CODEC_ID_SIMBIOSIS_IMX = 255, - AV_CODEC_ID_SGA_VIDEO = 256, - AV_CODEC_ID_GEM = 257, - AV_CODEC_ID_VBN = 258, - AV_CODEC_ID_JPEGXL = 259, - AV_CODEC_ID_QOI = 260, - AV_CODEC_ID_PHM = 261, - AV_CODEC_ID_RADIANCE_HDR = 262, - AV_CODEC_ID_WBMP = 263, - AV_CODEC_ID_MEDIA100 = 264, - AV_CODEC_ID_VQC = 265, - AV_CODEC_ID_PDV = 266, - AV_CODEC_ID_EVC = 267, - AV_CODEC_ID_RTV1 = 268, - AV_CODEC_ID_VMIX = 269, + AV_CODEC_ID_TARGA_Y216 = 201, + AV_CODEC_ID_V308 = 202, + AV_CODEC_ID_V408 = 203, + AV_CODEC_ID_YUV4 = 204, + AV_CODEC_ID_AVRN = 205, + AV_CODEC_ID_CPIA = 206, + AV_CODEC_ID_XFACE = 207, + AV_CODEC_ID_SNOW = 208, + AV_CODEC_ID_SMVJPEG = 209, + AV_CODEC_ID_APNG = 210, + AV_CODEC_ID_DAALA = 211, + AV_CODEC_ID_CFHD = 212, + AV_CODEC_ID_TRUEMOTION2RT = 213, + AV_CODEC_ID_M101 = 214, + AV_CODEC_ID_MAGICYUV = 215, + AV_CODEC_ID_SHEERVIDEO = 216, + AV_CODEC_ID_YLC = 217, + AV_CODEC_ID_PSD = 218, + AV_CODEC_ID_PIXLET = 219, + AV_CODEC_ID_SPEEDHQ = 220, + AV_CODEC_ID_FMVC = 221, + AV_CODEC_ID_SCPR = 222, + AV_CODEC_ID_CLEARVIDEO = 223, + AV_CODEC_ID_XPM = 224, + AV_CODEC_ID_AV1 = 225, + AV_CODEC_ID_BITPACKED = 226, + AV_CODEC_ID_MSCC = 227, + AV_CODEC_ID_SRGC = 228, + AV_CODEC_ID_SVG = 229, + AV_CODEC_ID_GDV = 230, + AV_CODEC_ID_FITS = 231, + AV_CODEC_ID_IMM4 = 232, + AV_CODEC_ID_PROSUMER = 233, + AV_CODEC_ID_MWSC = 234, + AV_CODEC_ID_WCMV = 235, + AV_CODEC_ID_RASC = 236, + AV_CODEC_ID_HYMT = 237, + AV_CODEC_ID_ARBC = 238, + AV_CODEC_ID_AGM = 239, + AV_CODEC_ID_LSCR = 240, + AV_CODEC_ID_VP4 = 241, + AV_CODEC_ID_IMM5 = 242, + AV_CODEC_ID_MVDV = 243, + AV_CODEC_ID_MVHA = 244, + AV_CODEC_ID_CDTOONS = 245, + AV_CODEC_ID_MV30 = 246, + AV_CODEC_ID_NOTCHLC = 247, + AV_CODEC_ID_PFM = 248, + AV_CODEC_ID_MOBICLIP = 249, + AV_CODEC_ID_PHOTOCD = 250, + AV_CODEC_ID_IPU = 251, + AV_CODEC_ID_ARGO = 252, + AV_CODEC_ID_CRI = 253, + AV_CODEC_ID_SIMBIOSIS_IMX = 254, + AV_CODEC_ID_SGA_VIDEO = 255, + AV_CODEC_ID_GEM = 256, + AV_CODEC_ID_VBN = 257, + AV_CODEC_ID_JPEGXL = 258, + AV_CODEC_ID_QOI = 259, + AV_CODEC_ID_PHM = 260, + AV_CODEC_ID_RADIANCE_HDR = 261, + AV_CODEC_ID_WBMP = 262, + AV_CODEC_ID_MEDIA100 = 263, + AV_CODEC_ID_VQC = 264, + AV_CODEC_ID_PDV = 265, + AV_CODEC_ID_EVC = 266, + AV_CODEC_ID_RTV1 = 267, + AV_CODEC_ID_VMIX = 268, + AV_CODEC_ID_LEAD = 269, /* various PCM "codecs" */ /** A dummy id pointing at the start of audio codecs */ @@ -573,6 +571,7 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { AV_CODEC_ID_RKA = 0x15000 + 102, AV_CODEC_ID_AC4 = 0x15000 + 103, AV_CODEC_ID_OSQ = 0x15000 + 104, + AV_CODEC_ID_QOA = 0x15000 + 105, /* subtitle codecs */ /** A dummy ID pointing at the start of subtitle codecs. */ @@ -1478,6 +1477,37 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { */ AV_PKT_DATA_DYNAMIC_HDR10_PLUS = 31, + /** + * IAMF Mix Gain Parameter Data associated with the audio frame. This metadata + * is in the form of the AVIAMFParamDefinition struct and contains information + * defined in sections 3.6.1 and 3.8.1 of the Immersive Audio Model and + * Formats standard. + */ + AV_PKT_DATA_IAMF_MIX_GAIN_PARAM = 32, + + /** + * IAMF Demixing Info Parameter Data associated with the audio frame. This + * metadata is in the form of the AVIAMFParamDefinition struct and contains + * information defined in sections 3.6.1 and 3.8.2 of the Immersive Audio Model + * and Formats standard. + */ + AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM = 33, + + /** + * IAMF Recon Gain Info Parameter Data associated with the audio frame. This + * metadata is in the form of the AVIAMFParamDefinition struct and contains + * information defined in sections 3.6.1 and 3.8.3 of the Immersive Audio Model + * and Formats standard. + */ + AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM = 34, + + /** + * Ambient viewing environment metadata, as defined by H.274. This metadata + * should be associated with a video stream and contains data in the form + * of the AVAmbientViewingEnvironment struct. + */ + AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT = 35, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may @@ -1486,7 +1516,7 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { * If its value becomes huge, some code using it * needs to be updated as it assumes it to be smaller than other limits. */ - AV_PKT_DATA_NB = 32; + AV_PKT_DATA_NB = 36; public static final int AV_PKT_DATA_QUALITY_FACTOR = AV_PKT_DATA_QUALITY_STATS; // Targeting ../avcodec/AVPacketSideData.java @@ -1629,13 +1659,6 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { /** enum AVSideDataParamChangeFlags */ public static final int -// #if FF_API_OLD_CHANNEL_LAYOUT - /** - * @deprecated those are not used by any decoder - */ - AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, - AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002, -// #endif AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE = 0x0004, AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 0x0008; @@ -2665,10 +2688,13 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { * \{ */ +// #if FF_API_BUFFER_MIN_SIZE /** * \ingroup lavc_encoding * minimum encoding buffer size * Used to avoid some checks during header writing. + * @deprecated Unused: avcodec_receive_packet() does not work + * with preallocated packet buffers. */ public static final int AV_INPUT_BUFFER_MIN_SIZE = 16384; // Targeting ../avcodec/RcOverride.java @@ -3123,6 +3149,7 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { @NoException public static native int avcodec_open2(AVCodecContext avctx, @Const AVCodec codec, @Cast("AVDictionary**") PointerPointer options); @NoException public static native int avcodec_open2(AVCodecContext avctx, @Const AVCodec codec, @ByPtrPtr AVDictionary options); +// #if FF_API_AVCODEC_CLOSE /** * Close a given AVCodecContext and free all the data associated with it * (but not the AVCodecContext itself). @@ -3131,12 +3158,13 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { * the codec-specific data allocated in avcodec_alloc_context3() with a non-NULL * codec. Subsequent calls will do nothing. * - * \note Do not use this function. Use avcodec_free_context() to destroy a + * @deprecated Do not use this function. Use avcodec_free_context() to destroy a * codec context (either open or closed). Opening and closing a codec context * multiple times is not supported anymore -- use multiple codec contexts * instead. */ -@NoException public static native int avcodec_close(AVCodecContext avctx); +@NoException public static native @Deprecated int avcodec_close(AVCodecContext avctx); +// #endif /** * Free all allocated data in the given subtitle struct. @@ -3193,34 +3221,6 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { @NoException public static native void avcodec_align_dimensions2(AVCodecContext s, int[] width, int[] height, int[] linesize_align); -// #ifdef FF_API_AVCODEC_CHROMA_POS -/** - * Converts AVChromaLocation to swscale x/y chroma position. - * - * The positions represent the chroma (0,0) position in a coordinates system - * with luma (0,0) representing the origin and luma(1,1) representing 256,256 - * - * @param xpos horizontal chroma sample position - * @param ypos vertical chroma sample position - * @deprecated Use av_chroma_location_enum_to_pos() instead. - */ - @NoException public static native @Deprecated int avcodec_enum_to_chroma_pos(IntPointer xpos, IntPointer ypos, @Cast("AVChromaLocation") int pos); - @NoException public static native @Deprecated int avcodec_enum_to_chroma_pos(IntBuffer xpos, IntBuffer ypos, @Cast("AVChromaLocation") int pos); - @NoException public static native @Deprecated int avcodec_enum_to_chroma_pos(int[] xpos, int[] ypos, @Cast("AVChromaLocation") int pos); - -/** - * Converts swscale x/y chroma position to AVChromaLocation. - * - * The positions represent the chroma (0,0) position in a coordinates system - * with luma (0,0) representing the origin and luma(1,1) representing 256,256 - * - * @param xpos horizontal chroma sample position - * @param ypos vertical chroma sample position - * @deprecated Use av_chroma_location_pos_to_enum() instead. - */ - @NoException public static native @Cast("AVChromaLocation") @Deprecated int avcodec_chroma_pos_to_enum(int xpos, int ypos); -// #endif - /** * Decode a subtitle message. * Return a negative value on error, otherwise return the number of bytes used. @@ -3816,6 +3816,27 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { */ @NoException public static native Pointer av_jni_get_java_vm(Pointer log_ctx); +/* + * Set the Android application context which will be used to retrieve the Android + * content resolver to handle content uris. + * + * This function is only available on Android. + * + * @param app_ctx global JNI reference to the Android application context + * @return 0 on success, < 0 otherwise + */ +@NoException public static native int av_jni_set_android_app_ctx(Pointer app_ctx, Pointer log_ctx); + +/* + * Get the Android application context that has been set with + * av_jni_set_android_app_ctx. + * + * This function is only available on Android. + * + * @return a pointer the the Android application context + */ +@NoException public static native Pointer av_jni_get_android_app_ctx(); + // #endif /* AVCODEC_JNI_H */ @@ -3988,7 +4009,7 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { * Libavcodec version macros. */ -public static final int LIBAVCODEC_VERSION_MAJOR = 60; +public static final int LIBAVCODEC_VERSION_MAJOR = 61; /** * FF_API_* defines may be placed below to indicate public API that will be @@ -4000,24 +4021,16 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { * at once through the bump. This improves the git bisect-ability of the change. */ -public static final boolean FF_API_INIT_PACKET = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_IDCT_NONE = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_SVTAV1_OPTS = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_AYUV_CODECID = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_VT_OUTPUT_CALLBACK = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_AVCODEC_CHROMA_POS = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_VT_HWACCEL_CONTEXT = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_AVCTX_FRAME_NUMBER = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_SLICE_OFFSET = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_SUBFRAMES = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_TICKS_PER_FRAME = (LIBAVCODEC_VERSION_MAJOR < 61); -public static final boolean FF_API_DROPCHANGED = (LIBAVCODEC_VERSION_MAJOR < 61); +public static final boolean FF_API_INIT_PACKET = (LIBAVCODEC_VERSION_MAJOR < 62); +public static final boolean FF_API_SUBFRAMES = (LIBAVCODEC_VERSION_MAJOR < 62); +public static final boolean FF_API_TICKS_PER_FRAME = (LIBAVCODEC_VERSION_MAJOR < 62); +public static final boolean FF_API_DROPCHANGED = (LIBAVCODEC_VERSION_MAJOR < 62); public static final boolean FF_API_AVFFT = (LIBAVCODEC_VERSION_MAJOR < 62); public static final boolean FF_API_FF_PROFILE_LEVEL = (LIBAVCODEC_VERSION_MAJOR < 62); - -// reminder to remove CrystalHD decoders on next major bump -public static final boolean FF_CODEC_CRYSTAL_HD = (LIBAVCODEC_VERSION_MAJOR < 61); +public static final boolean FF_API_AVCODEC_CLOSE = (LIBAVCODEC_VERSION_MAJOR < 62); +public static final boolean FF_API_BUFFER_MIN_SIZE = (LIBAVCODEC_VERSION_MAJOR < 62); +public static final boolean FF_API_VDPAU_ALLOC_GET_SET = (LIBAVCODEC_VERSION_MAJOR < 62); // #endif /* AVCODEC_VERSION_MAJOR_H */ @@ -4055,8 +4068,8 @@ public class avcodec extends org.bytedeco.ffmpeg.presets.avcodec { // #include "version_major.h" -public static final int LIBAVCODEC_VERSION_MINOR = 31; -public static final int LIBAVCODEC_VERSION_MICRO = 102; +public static final int LIBAVCODEC_VERSION_MINOR = 3; +public static final int LIBAVCODEC_VERSION_MICRO = 100; public static native @MemberGetter int LIBAVCODEC_VERSION_INT(); public static final int LIBAVCODEC_VERSION_INT = LIBAVCODEC_VERSION_INT(); diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avdevice.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avdevice.java index 5408cc91430..44e993a22ec 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avdevice.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avdevice.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -496,7 +496,7 @@ public class avdevice extends org.bytedeco.ffmpeg.presets.avdevice { * Libavdevice version macros */ -public static final int LIBAVDEVICE_VERSION_MAJOR = 60; +public static final int LIBAVDEVICE_VERSION_MAJOR = 61; /** * FF_API_* defines may be placed below to indicate public API that will be @@ -504,6 +504,13 @@ public class avdevice extends org.bytedeco.ffmpeg.presets.avdevice { * the public API and may change, break or disappear at any time. */ +// reminder to remove the bktr device on next major bump +public static final boolean FF_API_BKTR_DEVICE = (LIBAVDEVICE_VERSION_MAJOR < 62); +// reminder to remove the opengl device on next major bump +public static final boolean FF_API_OPENGL_DEVICE = (LIBAVDEVICE_VERSION_MAJOR < 62); +// reminder to remove the sdl2 device on next major bump +public static final boolean FF_API_SDL2_DEVICE = (LIBAVDEVICE_VERSION_MAJOR < 62); + // #endif /* AVDEVICE_VERSION_MAJOR_H */ @@ -540,7 +547,7 @@ public class avdevice extends org.bytedeco.ffmpeg.presets.avdevice { // #include "version_major.h" -public static final int LIBAVDEVICE_VERSION_MINOR = 3; +public static final int LIBAVDEVICE_VERSION_MINOR = 1; public static final int LIBAVDEVICE_VERSION_MICRO = 100; public static native @MemberGetter int LIBAVDEVICE_VERSION_INT(); diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avfilter.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avfilter.java index 9d7b8fdbab1..d4627093c45 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avfilter.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avfilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -200,9 +200,6 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { * Process multiple parts of the frame concurrently. */ public static final int AVFILTER_THREAD_SLICE = (1 << 0); -// Targeting ../avfilter/AVFilterInternal.java - - // Targeting ../avfilter/AVFilterContext.java @@ -225,19 +222,18 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { @NoException public static native int avfilter_link(AVFilterContext src, @Cast("unsigned") int srcpad, AVFilterContext dst, @Cast("unsigned") int dstpad); +// #if FF_API_LINK_PUBLIC /** - * Free the link in *link, and set its pointer to NULL. + * @deprecated this function should never be called by users */ -@NoException public static native void avfilter_link_free(@Cast("AVFilterLink**") PointerPointer link); -@NoException public static native void avfilter_link_free(@ByPtrPtr AVFilterLink link); +@NoException public static native @Deprecated void avfilter_link_free(@Cast("AVFilterLink**") PointerPointer link); +@NoException public static native @Deprecated void avfilter_link_free(@ByPtrPtr AVFilterLink link); /** - * Negotiate the media format, dimensions, etc of all inputs to a filter. - * - * @param filter the filter to negotiate the properties for its inputs - * @return zero on successful negotiation + * @deprecated this function should never be called by users */ -@NoException public static native int avfilter_config_links(AVFilterContext filter); +@NoException public static native @Deprecated int avfilter_config_links(AVFilterContext filter); +// #endif /** Stop once a filter understood the command (for target=all for example), fast filters are favored automatically */ public static final int AVFILTER_CMD_FLAG_ONE = 1; @@ -340,9 +336,6 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { * @see av_opt_find(). */ @NoException public static native @Const AVClass avfilter_get_class(); -// Targeting ../avfilter/AVFilterGraphInternal.java - - // Targeting ../avfilter/avfilter_action_func.java @@ -892,6 +885,8 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { * The format can be constrained by setting options, using av_opt_set() and * related functions with the AV_OPT_SEARCH_CHILDREN flag. * - pix_fmts (int list), + * - color_spaces (int list), + * - color_ranges (int list), * - sample_fmts (int list), * - sample_rates (int list), * - ch_layouts (string), @@ -954,11 +949,10 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { @NoException public static native int av_buffersink_get_w(@Const AVFilterContext ctx); @NoException public static native int av_buffersink_get_h(@Const AVFilterContext ctx); @NoException public static native @ByVal AVRational av_buffersink_get_sample_aspect_ratio(@Const AVFilterContext ctx); +@NoException public static native @Cast("AVColorSpace") int av_buffersink_get_colorspace(@Const AVFilterContext ctx); +@NoException public static native @Cast("AVColorRange") int av_buffersink_get_color_range(@Const AVFilterContext ctx); @NoException public static native int av_buffersink_get_channels(@Const AVFilterContext ctx); -// #if FF_API_OLD_CHANNEL_LAYOUT -@NoException public static native @Cast("uint64_t") @Deprecated long av_buffersink_get_channel_layout(@Const AVFilterContext ctx); -// #endif @NoException public static native int av_buffersink_get_ch_layout(@Const AVFilterContext ctx, AVChannelLayout ch_layout); @NoException public static native int av_buffersink_get_sample_rate(@Const AVFilterContext ctx); @@ -1199,7 +1193,7 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { * Libavfilter version macros */ -public static final int LIBAVFILTER_VERSION_MAJOR = 9; +public static final int LIBAVFILTER_VERSION_MAJOR = 10; /** * FF_API_* defines may be placed below to indicate public API that will be @@ -1207,7 +1201,7 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { * the public API and may change, break or disappear at any time. */ -public static final boolean FF_API_LIBPLACEBO_OPTS = (LIBAVFILTER_VERSION_MAJOR < 10); +public static final boolean FF_API_LINK_PUBLIC = (LIBAVFILTER_VERSION_MAJOR < 11); // #endif /* AVFILTER_VERSION_MAJOR_H */ @@ -1247,7 +1241,7 @@ public class avfilter extends org.bytedeco.ffmpeg.presets.avfilter { // #include "version_major.h" -public static final int LIBAVFILTER_VERSION_MINOR = 12; +public static final int LIBAVFILTER_VERSION_MINOR = 1; public static final int LIBAVFILTER_VERSION_MICRO = 100; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avformat.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avformat.java index 5358813555e..50021610993 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avformat.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avformat.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -93,8 +93,6 @@ public class avformat extends org.bytedeco.ffmpeg.presets.avformat { // Targeting ../avformat/AVIODirContext.java -// #else -// #endif /** * Different data types that can be returned via the AVIO @@ -385,10 +383,10 @@ public class avformat extends org.bytedeco.ffmpeg.presets.avformat { * Usually you don't need to use this function directly but its macro wrapper, * avio_print. */ -@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char**") PointerPointer strings); -@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char**") @ByPtrPtr BytePointer strings); -@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char**") @ByPtrPtr ByteBuffer strings); -@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char**") @ByPtrPtr byte[] strings); +@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char*const*") PointerPointer strings); +@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char*const*") @ByPtrPtr BytePointer strings); +@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char*const*") @ByPtrPtr ByteBuffer strings); +@NoException public static native void avio_print_string_array(AVIOContext s, @Cast("const char*const*") @ByPtrPtr byte[] strings); /** * Write strings (const char *) to the context. @@ -1355,9 +1353,9 @@ public class avformat extends org.bytedeco.ffmpeg.presets.avformat { */ public static final int AV_DISPOSITION_METADATA = (1 << 18); /** - * The audio stream is intended to be mixed with another stream before - * presentation. - * Corresponds to mix_type=0 in mpegts. + * The stream is intended to be mixed with another stream before presentation. + * Used for example to signal the stream contains an image part of a HEIF grid, + * or for mix_type=0 in mpegts. */ public static final int AV_DISPOSITION_DEPENDENT = (1 << 19); /** @@ -1392,17 +1390,27 @@ public class avformat extends org.bytedeco.ffmpeg.presets.avformat { // Targeting ../avformat/AVStream.java +// Targeting ../avformat/AVStreamGroupTileGrid.java -@NoException public static native AVCodecParserContext av_stream_get_parser(@Const AVStream s); -// #if FF_API_GET_END_PTS -/** - * Returns the pts of the last muxed packet + its duration - * - * the retuned value is undefined when used with a demuxer. - */ -@NoException public static native @Cast("int64_t") @Deprecated long av_stream_get_end_pts(@Const AVStream st); -// #endif + +/** enum AVStreamGroupParamsType */ +public static final int + AV_STREAM_GROUP_PARAMS_NONE = 0, + AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT = 1, + AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION = 2, + AV_STREAM_GROUP_PARAMS_TILE_GRID = 3; +// Targeting ../avformat/AVIAMFAudioElement.java + + +// Targeting ../avformat/AVIAMFMixPresentation.java + + +// Targeting ../avformat/AVStreamGroup.java + + + +@NoException public static native AVCodecParserContext av_stream_get_parser(@Const AVStream s); public static final int AV_PROGRAM_RUNNING = 1; // Targeting ../avformat/AVProgram.java @@ -1456,12 +1464,15 @@ network protocols (e.g. HLS), this can */ @NoException public static native void av_format_inject_global_side_data(AVFormatContext s); +// #if FF_API_GET_DUR_ESTIMATE_METHOD /** * Returns the method used to set ctx->duration. * * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE. + * @deprecated duration_estimation_method is public and can be read directly. */ -@NoException public static native @Cast("AVDurationEstimationMethod") int av_fmt_ctx_get_duration_estimation_method(@Const AVFormatContext ctx); +@NoException public static native @Cast("AVDurationEstimationMethod") @Deprecated int av_fmt_ctx_get_duration_estimation_method(@Const AVFormatContext ctx); +// #endif /** * \defgroup lavf_core Core functions @@ -1562,6 +1573,45 @@ network protocols (e.g. HLS), this can */ @NoException public static native @Const AVClass av_stream_get_class(); +/** + * Get the AVClass for AVStreamGroup. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +@NoException public static native @Const AVClass av_stream_group_get_class(); + +/** + * @return a string identifying the stream group type, or NULL if unknown + */ +@NoException public static native @Cast("const char*") BytePointer avformat_stream_group_name(@Cast("AVStreamGroupParamsType") int type); + +/** + * Add a new empty stream group to a media file. + * + * When demuxing, it may be called by the demuxer in read_header(). If the + * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also + * be called in read_packet(). + * + * When muxing, may be called by the user before avformat_write_header(). + * + * User is required to call avformat_free_context() to clean up the allocation + * by avformat_stream_group_create(). + * + * New streams can be added to the group with avformat_stream_group_add_stream(). + * + * @param s media file handle + * + * @return newly created group or NULL on error. + * @see avformat_new_stream, avformat_stream_group_add_stream. + */ +@NoException public static native AVStreamGroup avformat_stream_group_create(AVFormatContext s, + @Cast("AVStreamGroupParamsType") int type, + @Cast("AVDictionary**") PointerPointer options); +@NoException public static native AVStreamGroup avformat_stream_group_create(AVFormatContext s, + @Cast("AVStreamGroupParamsType") int type, + @ByPtrPtr AVDictionary options); + /** * Add a new stream to a media file. * @@ -1581,6 +1631,31 @@ network protocols (e.g. HLS), this can */ @NoException public static native AVStream avformat_new_stream(AVFormatContext s, @Const AVCodec c); +/** + * Add an already allocated stream to a stream group. + * + * When demuxing, it may be called by the demuxer in read_header(). If the + * flag AVFMTCTX_NOHEADER is set in s.ctx_flags, then it may also + * be called in read_packet(). + * + * When muxing, may be called by the user before avformat_write_header() after + * having allocated a new group with avformat_stream_group_create() and stream with + * avformat_new_stream(). + * + * User is required to call avformat_free_context() to clean up the allocation + * by avformat_stream_group_add_stream(). + * + * @param stg stream group belonging to a media file. + * @param st stream in the media file to add to the group. + * + * \retval 0 success + * \retval AVERROR(EEXIST) the stream was already in the group + * \retval "another negative error code" legitimate errors + * + * @see avformat_new_stream, avformat_stream_group_create. + */ +@NoException public static native int avformat_stream_group_add_stream(AVStreamGroup stg, AVStream st); + // #if FF_API_AVSTREAM_SIDE_DATA /** * Wrap an existing array as stream side data. @@ -2737,7 +2812,7 @@ network protocols (e.g. HLS), this can // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here -public static final int LIBAVFORMAT_VERSION_MAJOR = 60; +public static final int LIBAVFORMAT_VERSION_MAJOR = 61; /** * FF_API_* defines may be placed below to indicate public API that will be @@ -2749,15 +2824,12 @@ network protocols (e.g. HLS), this can * at once through the bump. This improves the git bisect-ability of the change. * */ -public static final boolean FF_API_COMPUTE_PKT_FIELDS2 = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_GET_END_PTS = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_AVIODIRCONTEXT = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_AVFORMAT_IO_CLOSE = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_AVIO_WRITE_NONCONST = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_LAVF_SHORTEST = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_ALLOW_FLUSH = (LIBAVFORMAT_VERSION_MAJOR < 61); -public static final boolean FF_API_AVSTREAM_SIDE_DATA = (LIBAVFORMAT_VERSION_MAJOR < 61); +public static final boolean FF_API_COMPUTE_PKT_FIELDS2 = (LIBAVFORMAT_VERSION_MAJOR < 62); +public static final boolean FF_API_LAVF_SHORTEST = (LIBAVFORMAT_VERSION_MAJOR < 62); +public static final boolean FF_API_ALLOW_FLUSH = (LIBAVFORMAT_VERSION_MAJOR < 62); +public static final boolean FF_API_AVSTREAM_SIDE_DATA = (LIBAVFORMAT_VERSION_MAJOR < 62); +public static final boolean FF_API_GET_DUR_ESTIMATE_METHOD = (LIBAVFORMAT_VERSION_MAJOR < 62); public static final int FF_API_R_FRAME_RATE = 1; @@ -2799,7 +2871,7 @@ network protocols (e.g. HLS), this can // #include "version_major.h" -public static final int LIBAVFORMAT_VERSION_MINOR = 16; +public static final int LIBAVFORMAT_VERSION_MINOR = 1; public static final int LIBAVFORMAT_VERSION_MICRO = 100; public static native @MemberGetter int LIBAVFORMAT_VERSION_INT(); diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java index 9c955b15597..90794b4a1e5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/avutil.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -362,19 +362,6 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { // #define av_int_list_length(list, term) // av_int_list_length_for_size(sizeof(*(list)), list, term) -// #if FF_API_AV_FOPEN_UTF8 -/** - * Open a file using a UTF-8 filename. - * The API of this function matches POSIX fopen(), errors are returned through - * errno. - * @deprecated Avoid using it, as on Windows, the FILE* allocated by this - * function may be allocated with a different CRT than the caller - * who uses the FILE*. No replacement provided in public API. - */ -@NoException public static native @Cast("FILE*") @Deprecated Pointer av_fopen_utf8(@Cast("const char*") BytePointer path, @Cast("const char*") BytePointer mode); -@NoException public static native @Cast("FILE*") @Deprecated Pointer av_fopen_utf8(String path, String mode); -// #endif - /** * Return the fractional representation of the internal time base. */ @@ -1717,6 +1704,10 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { * In case of infinity, the returned value is expressed as {@code {1, 0}} or * {@code {-1, 0}} depending on the sign. * + * In general rational numbers with |num| <= 1<<26 && |den| <= 1<<26 + * can be recovered exactly from their double representation. + * (no exceptions were found within 1B random ones) + * * @param d {@code double} to convert * @param max Maximum allowed numerator and denominator * @return {@code d} in AVRational form @@ -2354,6 +2345,13 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { public static final int AVPALETTE_SIZE = 1024; public static final int AVPALETTE_COUNT = 256; +/** + * Maximum number of planes in any pixel format. + * This should be used when a maximum is needed, but code should not + * be written to require a maximum for no good reason. + */ +public static final int AV_VIDEO_MAX_PLANES = 4; + /** * Pixel format. * @@ -2426,7 +2424,7 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { AV_PIX_FMT_BGR4 = 18, /** packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb) */ AV_PIX_FMT_BGR4_BYTE = 19, - /** packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb) */ + /** packed RGB 3:3:2, 8bpp, (msb)3R 3G 2B(lsb) */ AV_PIX_FMT_RGB8 = 20, /** packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits */ AV_PIX_FMT_RGB4 = 21, @@ -2760,58 +2758,53 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { /** bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */ AV_PIX_FMT_BAYER_GRBG16BE = AV_PIX_FMT_GBRP + 79, -// #if FF_API_XVMC - /** XVideo Motion Acceleration via common packet passing */ - AV_PIX_FMT_XVMC = AV_PIX_FMT_GBRP + 80, -// #endif - /** planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian */ - AV_PIX_FMT_YUV440P10LE = AV_PIX_FMT_GBRP + 81, + AV_PIX_FMT_YUV440P10LE = AV_PIX_FMT_GBRP + 80, /** planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian */ - AV_PIX_FMT_YUV440P10BE = AV_PIX_FMT_GBRP + 82, + AV_PIX_FMT_YUV440P10BE = AV_PIX_FMT_GBRP + 81, /** planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian */ - AV_PIX_FMT_YUV440P12LE = AV_PIX_FMT_GBRP + 83, + AV_PIX_FMT_YUV440P12LE = AV_PIX_FMT_GBRP + 82, /** planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian */ - AV_PIX_FMT_YUV440P12BE = AV_PIX_FMT_GBRP + 84, + AV_PIX_FMT_YUV440P12BE = AV_PIX_FMT_GBRP + 83, /** packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), little-endian */ - AV_PIX_FMT_AYUV64LE = AV_PIX_FMT_GBRP + 85, + AV_PIX_FMT_AYUV64LE = AV_PIX_FMT_GBRP + 84, /** packed AYUV 4:4:4,64bpp (1 Cr & Cb sample per 1x1 Y & A samples), big-endian */ - AV_PIX_FMT_AYUV64BE = AV_PIX_FMT_GBRP + 86, + AV_PIX_FMT_AYUV64BE = AV_PIX_FMT_GBRP + 85, /** hardware decoding through Videotoolbox */ - AV_PIX_FMT_VIDEOTOOLBOX = AV_PIX_FMT_GBRP + 87, + AV_PIX_FMT_VIDEOTOOLBOX = AV_PIX_FMT_GBRP + 86, /** like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, little-endian */ - AV_PIX_FMT_P010LE = AV_PIX_FMT_GBRP + 88, + AV_PIX_FMT_P010LE = AV_PIX_FMT_GBRP + 87, /** like NV12, with 10bpp per component, data in the high bits, zeros in the low bits, big-endian */ - AV_PIX_FMT_P010BE = AV_PIX_FMT_GBRP + 89, + AV_PIX_FMT_P010BE = AV_PIX_FMT_GBRP + 88, /** planar GBR 4:4:4:4 48bpp, big-endian */ - AV_PIX_FMT_GBRAP12BE = AV_PIX_FMT_GBRP + 90, + AV_PIX_FMT_GBRAP12BE = AV_PIX_FMT_GBRP + 89, /** planar GBR 4:4:4:4 48bpp, little-endian */ - AV_PIX_FMT_GBRAP12LE = AV_PIX_FMT_GBRP + 91, + AV_PIX_FMT_GBRAP12LE = AV_PIX_FMT_GBRP + 90, /** planar GBR 4:4:4:4 40bpp, big-endian */ - AV_PIX_FMT_GBRAP10BE = AV_PIX_FMT_GBRP + 92, + AV_PIX_FMT_GBRAP10BE = AV_PIX_FMT_GBRP + 91, /** planar GBR 4:4:4:4 40bpp, little-endian */ - AV_PIX_FMT_GBRAP10LE = AV_PIX_FMT_GBRP + 93, + AV_PIX_FMT_GBRAP10LE = AV_PIX_FMT_GBRP + 92, /** hardware decoding through MediaCodec */ - AV_PIX_FMT_MEDIACODEC = AV_PIX_FMT_GBRP + 94, + AV_PIX_FMT_MEDIACODEC = AV_PIX_FMT_GBRP + 93, /** Y , 12bpp, big-endian */ - AV_PIX_FMT_GRAY12BE = AV_PIX_FMT_GBRP + 95, + AV_PIX_FMT_GRAY12BE = AV_PIX_FMT_GBRP + 94, /** Y , 12bpp, little-endian */ - AV_PIX_FMT_GRAY12LE = AV_PIX_FMT_GBRP + 96, + AV_PIX_FMT_GRAY12LE = AV_PIX_FMT_GBRP + 95, /** Y , 10bpp, big-endian */ - AV_PIX_FMT_GRAY10BE = AV_PIX_FMT_GBRP + 97, + AV_PIX_FMT_GRAY10BE = AV_PIX_FMT_GBRP + 96, /** Y , 10bpp, little-endian */ - AV_PIX_FMT_GRAY10LE = AV_PIX_FMT_GBRP + 98, + AV_PIX_FMT_GRAY10LE = AV_PIX_FMT_GBRP + 97, /** like NV12, with 16bpp per component, little-endian */ - AV_PIX_FMT_P016LE = AV_PIX_FMT_GBRP + 99, + AV_PIX_FMT_P016LE = AV_PIX_FMT_GBRP + 98, /** like NV12, with 16bpp per component, big-endian */ - AV_PIX_FMT_P016BE = AV_PIX_FMT_GBRP + 100, + AV_PIX_FMT_P016BE = AV_PIX_FMT_GBRP + 99, /** * Hardware surfaces for Direct3D11. @@ -2823,156 +2816,163 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { * texture array index of the frame as intptr_t if the ID3D11Texture2D is * an array texture (or always 0 if it's a normal texture). */ - AV_PIX_FMT_D3D11 = AV_PIX_FMT_GBRP + 101, + AV_PIX_FMT_D3D11 = AV_PIX_FMT_GBRP + 100, /** Y , 9bpp, big-endian */ - AV_PIX_FMT_GRAY9BE = AV_PIX_FMT_GBRP + 102, + AV_PIX_FMT_GRAY9BE = AV_PIX_FMT_GBRP + 101, /** Y , 9bpp, little-endian */ - AV_PIX_FMT_GRAY9LE = AV_PIX_FMT_GBRP + 103, + AV_PIX_FMT_GRAY9LE = AV_PIX_FMT_GBRP + 102, /** IEEE-754 single precision planar GBR 4:4:4, 96bpp, big-endian */ - AV_PIX_FMT_GBRPF32BE = AV_PIX_FMT_GBRP + 104, + AV_PIX_FMT_GBRPF32BE = AV_PIX_FMT_GBRP + 103, /** IEEE-754 single precision planar GBR 4:4:4, 96bpp, little-endian */ - AV_PIX_FMT_GBRPF32LE = AV_PIX_FMT_GBRP + 105, + AV_PIX_FMT_GBRPF32LE = AV_PIX_FMT_GBRP + 104, /** IEEE-754 single precision planar GBRA 4:4:4:4, 128bpp, big-endian */ - AV_PIX_FMT_GBRAPF32BE = AV_PIX_FMT_GBRP + 106, + AV_PIX_FMT_GBRAPF32BE = AV_PIX_FMT_GBRP + 105, /** IEEE-754 single precision planar GBRA 4:4:4:4, 128bpp, little-endian */ - AV_PIX_FMT_GBRAPF32LE = AV_PIX_FMT_GBRP + 107, + AV_PIX_FMT_GBRAPF32LE = AV_PIX_FMT_GBRP + 106, /** * DRM-managed buffers exposed through PRIME buffer sharing. * * data[0] points to an AVDRMFrameDescriptor. */ - AV_PIX_FMT_DRM_PRIME = AV_PIX_FMT_GBRP + 108, + AV_PIX_FMT_DRM_PRIME = AV_PIX_FMT_GBRP + 107, /** * Hardware surfaces for OpenCL. * * data[i] contain 2D image objects (typed in C as cl_mem, used * in OpenCL as image2d_t) for each plane of the surface. */ - AV_PIX_FMT_OPENCL = AV_PIX_FMT_GBRP + 109, + AV_PIX_FMT_OPENCL = AV_PIX_FMT_GBRP + 108, /** Y , 14bpp, big-endian */ - AV_PIX_FMT_GRAY14BE = AV_PIX_FMT_GBRP + 110, + AV_PIX_FMT_GRAY14BE = AV_PIX_FMT_GBRP + 109, /** Y , 14bpp, little-endian */ - AV_PIX_FMT_GRAY14LE = AV_PIX_FMT_GBRP + 111, + AV_PIX_FMT_GRAY14LE = AV_PIX_FMT_GBRP + 110, /** IEEE-754 single precision Y, 32bpp, big-endian */ - AV_PIX_FMT_GRAYF32BE = AV_PIX_FMT_GBRP + 112, + AV_PIX_FMT_GRAYF32BE = AV_PIX_FMT_GBRP + 111, /** IEEE-754 single precision Y, 32bpp, little-endian */ - AV_PIX_FMT_GRAYF32LE = AV_PIX_FMT_GBRP + 113, + AV_PIX_FMT_GRAYF32LE = AV_PIX_FMT_GBRP + 112, /** planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), 12b alpha, big-endian */ - AV_PIX_FMT_YUVA422P12BE = AV_PIX_FMT_GBRP + 114, + AV_PIX_FMT_YUVA422P12BE = AV_PIX_FMT_GBRP + 113, /** planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), 12b alpha, little-endian */ - AV_PIX_FMT_YUVA422P12LE = AV_PIX_FMT_GBRP + 115, + AV_PIX_FMT_YUVA422P12LE = AV_PIX_FMT_GBRP + 114, /** planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), 12b alpha, big-endian */ - AV_PIX_FMT_YUVA444P12BE = AV_PIX_FMT_GBRP + 116, + AV_PIX_FMT_YUVA444P12BE = AV_PIX_FMT_GBRP + 115, /** planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), 12b alpha, little-endian */ - AV_PIX_FMT_YUVA444P12LE = AV_PIX_FMT_GBRP + 117, + AV_PIX_FMT_YUVA444P12LE = AV_PIX_FMT_GBRP + 116, /** planar YUV 4:4:4, 24bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V) */ - AV_PIX_FMT_NV24 = AV_PIX_FMT_GBRP + 118, + AV_PIX_FMT_NV24 = AV_PIX_FMT_GBRP + 117, /** as above, but U and V bytes are swapped */ - AV_PIX_FMT_NV42 = AV_PIX_FMT_GBRP + 119, + AV_PIX_FMT_NV42 = AV_PIX_FMT_GBRP + 118, /** * Vulkan hardware images. * * data[0] points to an AVVkFrame */ - AV_PIX_FMT_VULKAN = AV_PIX_FMT_GBRP + 120, + AV_PIX_FMT_VULKAN = AV_PIX_FMT_GBRP + 119, /** packed YUV 4:2:2 like YUYV422, 20bpp, data in the high bits, big-endian */ - AV_PIX_FMT_Y210BE = AV_PIX_FMT_GBRP + 121, + AV_PIX_FMT_Y210BE = AV_PIX_FMT_GBRP + 120, /** packed YUV 4:2:2 like YUYV422, 20bpp, data in the high bits, little-endian */ - AV_PIX_FMT_Y210LE = AV_PIX_FMT_GBRP + 122, + AV_PIX_FMT_Y210LE = AV_PIX_FMT_GBRP + 121, /** packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), little-endian, X=unused/undefined */ - AV_PIX_FMT_X2RGB10LE = AV_PIX_FMT_GBRP + 123, + AV_PIX_FMT_X2RGB10LE = AV_PIX_FMT_GBRP + 122, /** packed RGB 10:10:10, 30bpp, (msb)2X 10R 10G 10B(lsb), big-endian, X=unused/undefined */ - AV_PIX_FMT_X2RGB10BE = AV_PIX_FMT_GBRP + 124, + AV_PIX_FMT_X2RGB10BE = AV_PIX_FMT_GBRP + 123, /** packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), little-endian, X=unused/undefined */ - AV_PIX_FMT_X2BGR10LE = AV_PIX_FMT_GBRP + 125, + AV_PIX_FMT_X2BGR10LE = AV_PIX_FMT_GBRP + 124, /** packed BGR 10:10:10, 30bpp, (msb)2X 10B 10G 10R(lsb), big-endian, X=unused/undefined */ - AV_PIX_FMT_X2BGR10BE = AV_PIX_FMT_GBRP + 126, + AV_PIX_FMT_X2BGR10BE = AV_PIX_FMT_GBRP + 125, /** interleaved chroma YUV 4:2:2, 20bpp, data in the high bits, big-endian */ - AV_PIX_FMT_P210BE = AV_PIX_FMT_GBRP + 127, + AV_PIX_FMT_P210BE = AV_PIX_FMT_GBRP + 126, /** interleaved chroma YUV 4:2:2, 20bpp, data in the high bits, little-endian */ - AV_PIX_FMT_P210LE = AV_PIX_FMT_GBRP + 128, + AV_PIX_FMT_P210LE = AV_PIX_FMT_GBRP + 127, /** interleaved chroma YUV 4:4:4, 30bpp, data in the high bits, big-endian */ - AV_PIX_FMT_P410BE = AV_PIX_FMT_GBRP + 129, + AV_PIX_FMT_P410BE = AV_PIX_FMT_GBRP + 128, /** interleaved chroma YUV 4:4:4, 30bpp, data in the high bits, little-endian */ - AV_PIX_FMT_P410LE = AV_PIX_FMT_GBRP + 130, + AV_PIX_FMT_P410LE = AV_PIX_FMT_GBRP + 129, /** interleaved chroma YUV 4:2:2, 32bpp, big-endian */ - AV_PIX_FMT_P216BE = AV_PIX_FMT_GBRP + 131, + AV_PIX_FMT_P216BE = AV_PIX_FMT_GBRP + 130, /** interleaved chroma YUV 4:2:2, 32bpp, little-endian */ - AV_PIX_FMT_P216LE = AV_PIX_FMT_GBRP + 132, + AV_PIX_FMT_P216LE = AV_PIX_FMT_GBRP + 131, /** interleaved chroma YUV 4:4:4, 48bpp, big-endian */ - AV_PIX_FMT_P416BE = AV_PIX_FMT_GBRP + 133, + AV_PIX_FMT_P416BE = AV_PIX_FMT_GBRP + 132, /** interleaved chroma YUV 4:4:4, 48bpp, little-endian */ - AV_PIX_FMT_P416LE = AV_PIX_FMT_GBRP + 134, + AV_PIX_FMT_P416LE = AV_PIX_FMT_GBRP + 133, /** packed VUYA 4:4:4, 32bpp, VUYAVUYA... */ - AV_PIX_FMT_VUYA = AV_PIX_FMT_GBRP + 135, + AV_PIX_FMT_VUYA = AV_PIX_FMT_GBRP + 134, /** IEEE-754 half precision packed RGBA 16:16:16:16, 64bpp, RGBARGBA..., big-endian */ - AV_PIX_FMT_RGBAF16BE = AV_PIX_FMT_GBRP + 136, + AV_PIX_FMT_RGBAF16BE = AV_PIX_FMT_GBRP + 135, /** IEEE-754 half precision packed RGBA 16:16:16:16, 64bpp, RGBARGBA..., little-endian */ - AV_PIX_FMT_RGBAF16LE = AV_PIX_FMT_GBRP + 137, + AV_PIX_FMT_RGBAF16LE = AV_PIX_FMT_GBRP + 136, /** packed VUYX 4:4:4, 32bpp, Variant of VUYA where alpha channel is left undefined */ - AV_PIX_FMT_VUYX = AV_PIX_FMT_GBRP + 138, + AV_PIX_FMT_VUYX = AV_PIX_FMT_GBRP + 137, /** like NV12, with 12bpp per component, data in the high bits, zeros in the low bits, little-endian */ - AV_PIX_FMT_P012LE = AV_PIX_FMT_GBRP + 139, + AV_PIX_FMT_P012LE = AV_PIX_FMT_GBRP + 138, /** like NV12, with 12bpp per component, data in the high bits, zeros in the low bits, big-endian */ - AV_PIX_FMT_P012BE = AV_PIX_FMT_GBRP + 140, + AV_PIX_FMT_P012BE = AV_PIX_FMT_GBRP + 139, /** packed YUV 4:2:2 like YUYV422, 24bpp, data in the high bits, zeros in the low bits, big-endian */ - AV_PIX_FMT_Y212BE = AV_PIX_FMT_GBRP + 141, + AV_PIX_FMT_Y212BE = AV_PIX_FMT_GBRP + 140, /** packed YUV 4:2:2 like YUYV422, 24bpp, data in the high bits, zeros in the low bits, little-endian */ - AV_PIX_FMT_Y212LE = AV_PIX_FMT_GBRP + 142, + AV_PIX_FMT_Y212LE = AV_PIX_FMT_GBRP + 141, /** packed XVYU 4:4:4, 32bpp, (msb)2X 10V 10Y 10U(lsb), big-endian, variant of Y410 where alpha channel is left undefined */ - AV_PIX_FMT_XV30BE = AV_PIX_FMT_GBRP + 143, + AV_PIX_FMT_XV30BE = AV_PIX_FMT_GBRP + 142, /** packed XVYU 4:4:4, 32bpp, (msb)2X 10V 10Y 10U(lsb), little-endian, variant of Y410 where alpha channel is left undefined */ - AV_PIX_FMT_XV30LE = AV_PIX_FMT_GBRP + 144, + AV_PIX_FMT_XV30LE = AV_PIX_FMT_GBRP + 143, /** packed XVYU 4:4:4, 48bpp, data in the high bits, zeros in the low bits, big-endian, variant of Y412 where alpha channel is left undefined */ - AV_PIX_FMT_XV36BE = AV_PIX_FMT_GBRP + 145, + AV_PIX_FMT_XV36BE = AV_PIX_FMT_GBRP + 144, /** packed XVYU 4:4:4, 48bpp, data in the high bits, zeros in the low bits, little-endian, variant of Y412 where alpha channel is left undefined */ - AV_PIX_FMT_XV36LE = AV_PIX_FMT_GBRP + 146, + AV_PIX_FMT_XV36LE = AV_PIX_FMT_GBRP + 145, /** IEEE-754 single precision packed RGB 32:32:32, 96bpp, RGBRGB..., big-endian */ - AV_PIX_FMT_RGBF32BE = AV_PIX_FMT_GBRP + 147, + AV_PIX_FMT_RGBF32BE = AV_PIX_FMT_GBRP + 146, /** IEEE-754 single precision packed RGB 32:32:32, 96bpp, RGBRGB..., little-endian */ - AV_PIX_FMT_RGBF32LE = AV_PIX_FMT_GBRP + 148, + AV_PIX_FMT_RGBF32LE = AV_PIX_FMT_GBRP + 147, /** IEEE-754 single precision packed RGBA 32:32:32:32, 128bpp, RGBARGBA..., big-endian */ - AV_PIX_FMT_RGBAF32BE = AV_PIX_FMT_GBRP + 149, + AV_PIX_FMT_RGBAF32BE = AV_PIX_FMT_GBRP + 148, /** IEEE-754 single precision packed RGBA 32:32:32:32, 128bpp, RGBARGBA..., little-endian */ - AV_PIX_FMT_RGBAF32LE = AV_PIX_FMT_GBRP + 150, + AV_PIX_FMT_RGBAF32LE = AV_PIX_FMT_GBRP + 149, /** interleaved chroma YUV 4:2:2, 24bpp, data in the high bits, big-endian */ - AV_PIX_FMT_P212BE = AV_PIX_FMT_GBRP + 151, + AV_PIX_FMT_P212BE = AV_PIX_FMT_GBRP + 150, /** interleaved chroma YUV 4:2:2, 24bpp, data in the high bits, little-endian */ - AV_PIX_FMT_P212LE = AV_PIX_FMT_GBRP + 152, + AV_PIX_FMT_P212LE = AV_PIX_FMT_GBRP + 151, /** interleaved chroma YUV 4:4:4, 36bpp, data in the high bits, big-endian */ - AV_PIX_FMT_P412BE = AV_PIX_FMT_GBRP + 153, + AV_PIX_FMT_P412BE = AV_PIX_FMT_GBRP + 152, /** interleaved chroma YUV 4:4:4, 36bpp, data in the high bits, little-endian */ - AV_PIX_FMT_P412LE = AV_PIX_FMT_GBRP + 154, + AV_PIX_FMT_P412LE = AV_PIX_FMT_GBRP + 153, /** planar GBR 4:4:4:4 56bpp, big-endian */ - AV_PIX_FMT_GBRAP14BE = AV_PIX_FMT_GBRP + 155, + AV_PIX_FMT_GBRAP14BE = AV_PIX_FMT_GBRP + 154, /** planar GBR 4:4:4:4 56bpp, little-endian */ - AV_PIX_FMT_GBRAP14LE = AV_PIX_FMT_GBRP + 156, + AV_PIX_FMT_GBRAP14LE = AV_PIX_FMT_GBRP + 155, + + /** + * Hardware surfaces for Direct3D 12. + * + * data[0] points to an AVD3D12VAFrame + */ + AV_PIX_FMT_D3D12 = AV_PIX_FMT_GBRP + 156, /** number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions */ AV_PIX_FMT_NB = AV_PIX_FMT_GBRP + 157; @@ -3568,6 +3568,10 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { /** * Film grain parameters for a frame, described by AVFilmGrainParams. * Must be present for every frame which should have film grain applied. + * + * May be present multiple times, for example when there are multiple + * alternative parameter sets for different video signal characteristics. + * The user should select the most appropriate set for the application. */ AV_FRAME_DATA_FILM_GRAIN_PARAMS = 21, @@ -3875,6 +3879,101 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { */ @NoException public static native @Cast("const char*") BytePointer av_frame_side_data_name(@Cast("AVFrameSideDataType") int type); +/** + * Free all side data entries and their contents, then zeroes out the + * values which the pointers are pointing to. + * + * @param sd pointer to array of side data to free. Will be set to NULL + * upon return. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. Will be set to 0 upon return. + */ +@NoException public static native void av_frame_side_data_free(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, IntPointer nb_sd); +@NoException public static native void av_frame_side_data_free(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, IntBuffer nb_sd); +@NoException public static native void av_frame_side_data_free(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, int[] nb_sd); + +public static final int AV_FRAME_SIDE_DATA_FLAG_UNIQUE = (1 << 0); + +/** + * Add new side data entry to an array. + * + * @param sd pointer to array of side data to which to add another entry, + * or to NULL in order to start a new array. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. + * @param type type of the added side data + * @param size size of the side data + * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. + * + * @return newly added side data on success, NULL on error. In case of + * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching + * AVFrameSideDataType will be removed before the addition is + * attempted. + */ +@NoException public static native AVFrameSideData av_frame_side_data_new(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, IntPointer nb_sd, + @Cast("AVFrameSideDataType") int type, + @Cast("size_t") long size, @Cast("unsigned int") int flags); +@NoException public static native AVFrameSideData av_frame_side_data_new(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, IntBuffer nb_sd, + @Cast("AVFrameSideDataType") int type, + @Cast("size_t") long size, @Cast("unsigned int") int flags); +@NoException public static native AVFrameSideData av_frame_side_data_new(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, int[] nb_sd, + @Cast("AVFrameSideDataType") int type, + @Cast("size_t") long size, @Cast("unsigned int") int flags); + +/** + * Add a new side data entry to an array based on existing side data, taking + * a reference towards the contained AVBufferRef. + * + * @param sd pointer to array of side data to which to add another entry, + * or to NULL in order to start a new array. + * @param nb_sd pointer to an integer containing the number of entries in + * the array. + * @param src side data to be cloned, with a new reference utilized + * for the buffer. + * @param flags Some combination of AV_FRAME_SIDE_DATA_FLAG_* flags, or 0. + * + * @return negative error code on failure, >=0 on success. In case of + * AV_FRAME_SIDE_DATA_FLAG_UNIQUE being set, entries of matching + * AVFrameSideDataType will be removed before the addition is + * attempted. + */ +@NoException public static native int av_frame_side_data_clone(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, IntPointer nb_sd, + @Const AVFrameSideData src, @Cast("unsigned int") int flags); +@NoException public static native int av_frame_side_data_clone(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, IntBuffer nb_sd, + @Const AVFrameSideData src, @Cast("unsigned int") int flags); +@NoException public static native int av_frame_side_data_clone(@Cast("AVFrameSideData***") @ByPtrPtr PointerPointer sd, int[] nb_sd, + @Const AVFrameSideData src, @Cast("unsigned int") int flags); + +/** + * Get a side data entry of a specific type from an array. + * + * @param sd array of side data. + * @param nb_sd integer containing the number of entries in the array. + * @param type type of side data to be queried + * + * @return a pointer to the side data of a given type on success, NULL if there + * is no side data with such type in this set. + */ +@NoException public static native @Const AVFrameSideData av_frame_side_data_get_c(@Cast("const AVFrameSideData*const*") PointerPointer sd, + int nb_sd, + @Cast("AVFrameSideDataType") int type); +@NoException public static native @Const AVFrameSideData av_frame_side_data_get_c(@Const @ByPtrPtr AVFrameSideData sd, + int nb_sd, + @Cast("AVFrameSideDataType") int type); + +/** + * Wrapper around av_frame_side_data_get_c() to workaround the limitation + * that for any type T the conversion from T * const * to const T * const * + * is not performed automatically in C. + * @see av_frame_side_data_get_c() + */ +@NoException public static native @Const AVFrameSideData av_frame_side_data_get(@Cast("AVFrameSideData*const*") PointerPointer sd, + int nb_sd, + @Cast("AVFrameSideDataType") int type); +@NoException public static native @Const AVFrameSideData av_frame_side_data_get(@ByPtrPtr AVFrameSideData sd, + int nb_sd, + @Cast("AVFrameSideDataType") int type); + /** * \} */ @@ -4335,7 +4434,7 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { /** * The channel order does not correspond to any other predefined order and * is stored as an explicit map. For example, this could be used to support - * layouts with 64 or more channels, or with empty/skipped (AV_CHAN_SILENCE) + * layouts with 64 or more channels, or with empty/skipped (AV_CHAN_UNUSED) * channels at arbitrary positions. */ AV_CHANNEL_ORDER_CUSTOM = 2, @@ -4361,7 +4460,11 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { * Normalization is assumed to be SN3D (Schmidt Semi-Normalization) * as defined in AmbiX format $ 2.1. */ - AV_CHANNEL_ORDER_AMBISONIC = 3; + AV_CHANNEL_ORDER_AMBISONIC = 3, + /** + * Number of channel orders, not part of ABI/API + */ + FF_CHANNEL_ORDER_NB = 4; /** @@ -4407,16 +4510,6 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { public static final long AV_CH_BOTTOM_FRONT_LEFT = (1L << AV_CHAN_BOTTOM_FRONT_LEFT ); public static final long AV_CH_BOTTOM_FRONT_RIGHT = (1L << AV_CHAN_BOTTOM_FRONT_RIGHT ); -// #if FF_API_OLD_CHANNEL_LAYOUT -/** Channel mask value used for AVCodecContext.request_channel_layout - to indicate that the user requests the channel order of the decoder output - to be the native codec channel order. - @deprecated channel order is now indicated in a special field in - AVChannelLayout - */ -public static final long AV_CH_LAYOUT_NATIVE = 0x8000000000000000L; -// #endif - /** * \} * \defgroup channel_mask_c Audio channel layouts @@ -4454,6 +4547,8 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { public static final long AV_CH_LAYOUT_5POINT1POINT4_BACK = (AV_CH_LAYOUT_5POINT1POINT2_BACK|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT); public static final long AV_CH_LAYOUT_7POINT1POINT2 = (AV_CH_LAYOUT_7POINT1|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT); public static final long AV_CH_LAYOUT_7POINT1POINT4_BACK = (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT); +public static final long AV_CH_LAYOUT_7POINT2POINT3 = (AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_CENTER|AV_CH_LOW_FREQUENCY_2); +public static final long AV_CH_LAYOUT_9POINT1POINT4_BACK = (AV_CH_LAYOUT_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER); public static final long AV_CH_LAYOUT_HEXADECAGONAL = (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT); public static final long AV_CH_LAYOUT_STEREO_DOWNMIX = (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT); public static final long AV_CH_LAYOUT_22POINT2 = (AV_CH_LAYOUT_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT); @@ -4556,6 +4651,10 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { public static final AVChannelLayout AV_CHANNEL_LAYOUT_7POINT1POINT2 = AV_CHANNEL_LAYOUT_7POINT1POINT2(); public static native @MemberGetter @ByVal AVChannelLayout AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK(); public static final AVChannelLayout AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK = AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK(); +public static native @MemberGetter @ByVal AVChannelLayout AV_CHANNEL_LAYOUT_7POINT2POINT3(); +public static final AVChannelLayout AV_CHANNEL_LAYOUT_7POINT2POINT3 = AV_CHANNEL_LAYOUT_7POINT2POINT3(); +public static native @MemberGetter @ByVal AVChannelLayout AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK(); +public static final AVChannelLayout AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK = AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK(); public static native @MemberGetter @ByVal AVChannelLayout AV_CHANNEL_LAYOUT_HEXADECAGONAL(); public static final AVChannelLayout AV_CHANNEL_LAYOUT_HEXADECAGONAL = AV_CHANNEL_LAYOUT_HEXADECAGONAL(); public static native @MemberGetter @ByVal AVChannelLayout AV_CHANNEL_LAYOUT_STEREO_DOWNMIX(); @@ -4570,149 +4669,6 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { public static final AVChannelLayout AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER = AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER(); /** \} */ -// #if FF_API_OLD_CHANNEL_LAYOUT -/** - * \name Deprecated Functions - * \{ - */ - -/** - * Return a channel layout id that matches name, or 0 if no match is found. - * - * name can be one or several of the following notations, - * separated by '+' or '|': - * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0, - * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix); - * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC, - * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR); - * - a number of channels, in decimal, followed by 'c', yielding - * the default channel layout for that number of channels (@see - * av_get_default_channel_layout); - * - a channel layout mask, in hexadecimal starting with "0x" (see the - * AV_CH_* macros). - * - * Example: "stereo+FC" = "2c+FC" = "2c+1c" = "0x7" - * - * @deprecated use av_channel_layout_from_string() - */ -@NoException public static native @Cast("uint64_t") @Deprecated long av_get_channel_layout(@Cast("const char*") BytePointer name); -@NoException public static native @Cast("uint64_t") @Deprecated long av_get_channel_layout(String name); - -/** - * Return a channel layout and the number of channels based on the specified name. - * - * This function is similar to (@see av_get_channel_layout), but can also parse - * unknown channel layout specifications. - * - * @param name [in] channel layout specification string - * @param channel_layout [out] parsed channel layout (0 if unknown) - * @param nb_channels [out] number of channels - * - * @return 0 on success, AVERROR(EINVAL) if the parsing fails. - * @deprecated use av_channel_layout_from_string() - */ -@NoException public static native @Deprecated int av_get_extended_channel_layout(@Cast("const char*") BytePointer name, @Cast("uint64_t*") LongPointer channel_layout, IntPointer nb_channels); -@NoException public static native @Deprecated int av_get_extended_channel_layout(String name, @Cast("uint64_t*") LongBuffer channel_layout, IntBuffer nb_channels); -@NoException public static native @Deprecated int av_get_extended_channel_layout(@Cast("const char*") BytePointer name, @Cast("uint64_t*") long[] channel_layout, int[] nb_channels); -@NoException public static native @Deprecated int av_get_extended_channel_layout(String name, @Cast("uint64_t*") LongPointer channel_layout, IntPointer nb_channels); -@NoException public static native @Deprecated int av_get_extended_channel_layout(@Cast("const char*") BytePointer name, @Cast("uint64_t*") LongBuffer channel_layout, IntBuffer nb_channels); -@NoException public static native @Deprecated int av_get_extended_channel_layout(String name, @Cast("uint64_t*") long[] channel_layout, int[] nb_channels); - -/** - * Return a description of a channel layout. - * If nb_channels is <= 0, it is guessed from the channel_layout. - * - * @param buf put here the string containing the channel layout - * @param buf_size size in bytes of the buffer - * @param nb_channels number of channels - * @param channel_layout channel layout bitset - * @deprecated use av_channel_layout_describe() - */ -@NoException public static native @Deprecated void av_get_channel_layout_string(@Cast("char*") BytePointer buf, int buf_size, int nb_channels, @Cast("uint64_t") long channel_layout); -@NoException public static native @Deprecated void av_get_channel_layout_string(@Cast("char*") ByteBuffer buf, int buf_size, int nb_channels, @Cast("uint64_t") long channel_layout); -@NoException public static native @Deprecated void av_get_channel_layout_string(@Cast("char*") byte[] buf, int buf_size, int nb_channels, @Cast("uint64_t") long channel_layout); - -/** - * Append a description of a channel layout to a bprint buffer. - * @deprecated use av_channel_layout_describe() - */ -@NoException public static native @Deprecated void av_bprint_channel_layout(AVBPrint bp, int nb_channels, @Cast("uint64_t") long channel_layout); - -/** - * Return the number of channels in the channel layout. - * @deprecated use AVChannelLayout.nb_channels - */ -@NoException public static native @Deprecated int av_get_channel_layout_nb_channels(@Cast("uint64_t") long channel_layout); - -/** - * Return default channel layout for a given number of channels. - * - * @deprecated use av_channel_layout_default() - */ -@NoException public static native @Cast("int64_t") @Deprecated long av_get_default_channel_layout(int nb_channels); - -/** - * Get the index of a channel in channel_layout. - * - * @param channel_layout channel layout bitset - * @param channel a channel layout describing exactly one channel which must be - * present in channel_layout. - * - * @return index of channel in channel_layout on success, a negative AVERROR - * on error. - * - * @deprecated use av_channel_layout_index_from_channel() - */ -@NoException public static native @Deprecated int av_get_channel_layout_channel_index(@Cast("uint64_t") long channel_layout, - @Cast("uint64_t") long channel); - -/** - * Get the channel with the given index in channel_layout. - * @deprecated use av_channel_layout_channel_from_index() - */ -@NoException public static native @Cast("uint64_t") @Deprecated long av_channel_layout_extract_channel(@Cast("uint64_t") long channel_layout, int index); - -/** - * Get the name of a given channel. - * - * @return channel name on success, NULL on error. - * - * @deprecated use av_channel_name() - */ -@NoException public static native @Deprecated @Cast("const char*") BytePointer av_get_channel_name(@Cast("uint64_t") long channel); - -/** - * Get the description of a given channel. - * - * @param channel a channel layout with a single channel - * @return channel description on success, NULL on error - * @deprecated use av_channel_description() - */ -@NoException public static native @Deprecated @Cast("const char*") BytePointer av_get_channel_description(@Cast("uint64_t") long channel); - -/** - * Get the value and name of a standard channel layout. - * - * @param index [in] index in an internal list, starting at 0 - * @param layout [out] channel layout mask - * @param name [out] name of the layout - * @return 0 if the layout exists, - * <0 if index is beyond the limits - * @deprecated use av_channel_layout_standard() - */ -@NoException public static native @Deprecated int av_get_standard_channel_layout(@Cast("unsigned") int index, @Cast("uint64_t*") LongPointer layout, - @Cast("const char**") PointerPointer name); -@NoException public static native @Deprecated int av_get_standard_channel_layout(@Cast("unsigned") int index, @Cast("uint64_t*") LongPointer layout, - @Cast("const char**") @ByPtrPtr BytePointer name); -@NoException public static native @Deprecated int av_get_standard_channel_layout(@Cast("unsigned") int index, @Cast("uint64_t*") LongBuffer layout, - @Cast("const char**") @ByPtrPtr ByteBuffer name); -@NoException public static native @Deprecated int av_get_standard_channel_layout(@Cast("unsigned") int index, @Cast("uint64_t*") long[] layout, - @Cast("const char**") @ByPtrPtr byte[] name); -/** - * \} - */ -// #endif - /** * Get a human readable string in an abbreviated form describing a given channel. * This is the inverse function of \ref av_channel_from_string(). @@ -4765,6 +4721,23 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { @NoException public static native @Cast("AVChannel") int av_channel_from_string(@Cast("const char*") BytePointer name); @NoException public static native @Cast("AVChannel") int av_channel_from_string(String name); +/** + * Initialize a custom channel layout with the specified number of channels. + * The channel map will be allocated and the designation of all channels will + * be set to AV_CHAN_UNKNOWN. + * + * This is only a convenience helper function, a custom channel layout can also + * be constructed without using this. + * + * @param channel_layout the layout structure to be initialized + * @param nb_channels the number of channels + * + * @return 0 on success + * AVERROR(EINVAL) if the number of channels <= 0 + * AVERROR(ENOMEM) if the channel map could not be allocated + */ +@NoException public static native int av_channel_layout_custom_init(AVChannelLayout channel_layout, int nb_channels); + /** * Initialize a native channel layout from a bitmask indicating which channels * are present. @@ -4789,10 +4762,14 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { * - the number of unordered channels (eg. "4C" or "4 channels") * - the ambisonic order followed by optional non-diegetic channels (eg. * "ambisonic 2+stereo") + * On error, the channel layout will remain uninitialized, but not necessarily + * untouched. * - * @param channel_layout input channel layout + * @param channel_layout uninitialized channel layout for the result * @param str string describing the channel layout - * @return 0 channel layout was detected, AVERROR_INVALIDATATA otherwise + * @return 0 on success parsing the channel layout + * AVERROR(EINVAL) if an invalid channel layout string was provided + * AVERROR(ENOMEM) if there was not enough memory */ @NoException public static native int av_channel_layout_from_string(AVChannelLayout channel_layout, @Cast("const char*") BytePointer str); @@ -4961,6 +4938,53 @@ public class avutil extends org.bytedeco.ffmpeg.presets.avutil { */ @NoException public static native int av_channel_layout_compare(@Const AVChannelLayout chl, @Const AVChannelLayout chl1); +/** + * The conversion must be lossless. + */ +public static final int AV_CHANNEL_LAYOUT_RETYPE_FLAG_LOSSLESS = (1 << 0); + +/** + * The specified retype target order is ignored and the simplest possible + * (canonical) order is used for which the input layout can be losslessy + * represented. + */ +public static final int AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL = (1 << 1); + +/** + * Change the AVChannelOrder of a channel layout. + * + * Change of AVChannelOrder can be either lossless or lossy. In case of a + * lossless conversion all the channel designations and the associated channel + * names (if any) are kept. On a lossy conversion the channel names and channel + * designations might be lost depending on the capabilities of the desired + * AVChannelOrder. Note that some conversions are simply not possible in which + * case this function returns AVERROR(ENOSYS). + * + * The following conversions are supported: + * + * Any -> Custom : Always possible, always lossless. + * Any -> Unspecified: Always possible, lossless if channel designations + * are all unknown and channel names are not used, lossy otherwise. + * Custom -> Ambisonic : Possible if it contains ambisonic channels with + * optional non-diegetic channels in the end. Lossy if the channels have + * custom names, lossless otherwise. + * Custom -> Native : Possible if it contains native channels in native + * order. Lossy if the channels have custom names, lossless otherwise. + * + * On error this function keeps the original channel layout untouched. + * + * @param channel_layout channel layout which will be changed + * @param order the desired channel layout order + * @param flags a combination of AV_CHANNEL_LAYOUT_RETYPE_FLAG_* constants + * @return 0 if the conversion was successful and lossless or if the channel + * layout was already in the desired order + * >0 if the conversion was successful but lossy + * AVERROR(ENOSYS) if the conversion was not possible (or would be + * lossy and AV_CHANNEL_LAYOUT_RETYPE_FLAG_LOSSLESS was specified) + * AVERROR(EINVAL), AVERROR(ENOMEM) on error + */ +@NoException public static native int av_channel_layout_retype(AVChannelLayout channel_layout, @Cast("AVChannelOrder") int order, int flags); + /** * \} */ @@ -5470,6 +5494,16 @@ allocated with av_malloc() or another memory allocation function. */ * ("objects"). An option can have a help text, a type and a range of possible * values. Options may then be enumerated, read and written to. * + * There are two modes of access to members of AVOption and its child structs. + * One is called 'native access', and refers to access from the code that + * declares the AVOption in question. The other is 'foreign access', and refers + * to access from other code. + * + * Certain struct members in this header are documented as 'native access only' + * or similar - it means that only the code that declared the AVOption in + * question is allowed to access the field. This allows us to extend the + * semantics of those fields without breaking API compatibility. + * * \section avoptions_implement Implementing AVOptions * This section describes how to add AVOptions capabilities to a struct. * @@ -5649,31 +5683,85 @@ allocated with av_malloc() or another memory allocation function. */ /** enum AVOptionType */ public static final int - AV_OPT_TYPE_FLAGS = 0, - AV_OPT_TYPE_INT = 1, - AV_OPT_TYPE_INT64 = 2, - AV_OPT_TYPE_DOUBLE = 3, - AV_OPT_TYPE_FLOAT = 4, - AV_OPT_TYPE_STRING = 5, - AV_OPT_TYPE_RATIONAL = 6, + AV_OPT_TYPE_FLAGS = 1, + AV_OPT_TYPE_INT = 2, + AV_OPT_TYPE_INT64 = 3, + AV_OPT_TYPE_DOUBLE = 4, + AV_OPT_TYPE_FLOAT = 5, + AV_OPT_TYPE_STRING = 6, + AV_OPT_TYPE_RATIONAL = 7, /** offset must point to a pointer immediately followed by an int for the length */ - AV_OPT_TYPE_BINARY = 7, - AV_OPT_TYPE_DICT = 8, - AV_OPT_TYPE_UINT64 = 9, - AV_OPT_TYPE_CONST = 10, + AV_OPT_TYPE_BINARY = 8, + AV_OPT_TYPE_DICT = 9, + AV_OPT_TYPE_UINT64 = 10, + AV_OPT_TYPE_CONST = 11, /** offset must point to two consecutive integers */ - AV_OPT_TYPE_IMAGE_SIZE = 11, - AV_OPT_TYPE_PIXEL_FMT = 12, - AV_OPT_TYPE_SAMPLE_FMT = 13, + AV_OPT_TYPE_IMAGE_SIZE = 12, + AV_OPT_TYPE_PIXEL_FMT = 13, + AV_OPT_TYPE_SAMPLE_FMT = 14, /** offset must point to AVRational */ - AV_OPT_TYPE_VIDEO_RATE = 14, - AV_OPT_TYPE_DURATION = 15, - AV_OPT_TYPE_COLOR = 16, -// #if FF_API_OLD_CHANNEL_LAYOUT - AV_OPT_TYPE_CHANNEL_LAYOUT = 17, -// #endif + AV_OPT_TYPE_VIDEO_RATE = 15, + AV_OPT_TYPE_DURATION = 16, + AV_OPT_TYPE_COLOR = 17, AV_OPT_TYPE_BOOL = 18, - AV_OPT_TYPE_CHLAYOUT = 19; + AV_OPT_TYPE_CHLAYOUT = 19, + + /** + * May be combined with another regular option type to declare an array + * option. + * + * For array options, \ref AVOption.offset should refer to a pointer + * corresponding to the option type. The pointer should be immediately + * followed by an unsigned int that will store the number of elements in the + * array. + */ + AV_OPT_TYPE_FLAG_ARRAY = (1 << 16); + +/** + * A generic parameter which can be set by the user for muxing or encoding. + */ +public static final int AV_OPT_FLAG_ENCODING_PARAM = (1 << 0); +/** + * A generic parameter which can be set by the user for demuxing or decoding. + */ +public static final int AV_OPT_FLAG_DECODING_PARAM = (1 << 1); +public static final int AV_OPT_FLAG_AUDIO_PARAM = (1 << 3); +public static final int AV_OPT_FLAG_VIDEO_PARAM = (1 << 4); +public static final int AV_OPT_FLAG_SUBTITLE_PARAM = (1 << 5); +/** + * The option is intended for exporting values to the caller. + */ +public static final int AV_OPT_FLAG_EXPORT = (1 << 6); +/** + * The option may not be set through the AVOptions API, only read. + * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set. + */ +public static final int AV_OPT_FLAG_READONLY = (1 << 7); +/** + * A generic parameter which can be set by the user for bit stream filtering. + */ +public static final int AV_OPT_FLAG_BSF_PARAM = (1 << 8); + +/** + * A generic parameter which can be set by the user at runtime. + */ +public static final int AV_OPT_FLAG_RUNTIME_PARAM = (1 << 15); +/** + * A generic parameter which can be set by the user for filtering. + */ +public static final int AV_OPT_FLAG_FILTERING_PARAM = (1 << 16); +/** + * Set if option is deprecated, users should refer to AVOption.help text for + * more information. + */ +public static final int AV_OPT_FLAG_DEPRECATED = (1 << 17); +/** + * Set if option constants can also reside in child objects. + */ +public static final int AV_OPT_FLAG_CHILD_CONSTS = (1 << 18); +// Targeting ../avutil/AVOptionArrayDef.java + + // Targeting ../avutil/AVOption.java @@ -5685,15 +5773,9 @@ allocated with av_malloc() or another memory allocation function. */ /** - * Show the obj options. - * - * @param req_flags requested flags for the options to show. Show only the - * options for which it is opt->flags & req_flags. - * @param rej_flags rejected flags for the options to show. Show only the - * options for which it is !(opt->flags & req_flags). - * @param av_log_obj log context to use for showing the options + * \defgroup opt_mng AVOption (un)initialization and inspection. + * \{ */ -@NoException public static native int av_opt_show2(Pointer obj, Pointer av_log_obj, int req_flags, int rej_flags); /** * Set the values of all AVOption fields to their default values. @@ -5714,126 +5796,127 @@ allocated with av_malloc() or another memory allocation function. */ @NoException public static native void av_opt_set_defaults2(Pointer s, int mask, int flags); /** - * Parse the key/value pairs list in opts. For each key/value pair - * found, stores the value in the field in ctx that is named like the - * key. ctx must be an AVClass context, storing is done using - * AVOptions. - * - * @param opts options string to parse, may be NULL - * @param key_val_sep a 0-terminated list of characters used to - * separate key from value - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other - * @return the number of successfully set key/value pairs, or a negative - * value corresponding to an AVERROR code in case of error: - * AVERROR(EINVAL) if opts cannot be parsed, - * the error code issued by av_opt_set() if a key/value pair - * cannot be set + * Free all allocated objects in obj. */ -@NoException public static native int av_set_options_string(Pointer ctx, @Cast("const char*") BytePointer opts, - @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); -@NoException public static native int av_set_options_string(Pointer ctx, String opts, - String key_val_sep, String pairs_sep); +@NoException public static native void av_opt_free(Pointer obj); /** - * Parse the key-value pairs list in opts. For each key=value pair found, - * set the value of the corresponding option in ctx. - * - * @param ctx the AVClass object to set options on - * @param opts the options string, key-value pairs separated by a - * delimiter - * @param shorthand a NULL-terminated array of options names for shorthand - * notation: if the first field in opts has no key part, - * the key is taken from the first element of shorthand; - * then again for the second, etc., until either opts is - * finished, shorthand is finished or a named option is - * found; after that, all options must be named - * @param key_val_sep a 0-terminated list of characters used to separate - * key from value, for example '=' - * @param pairs_sep a 0-terminated list of characters used to separate - * two pairs from each other, for example ':' or ',' - * @return the number of successfully set key=value pairs, or a negative - * value corresponding to an AVERROR code in case of error: - * AVERROR(EINVAL) if opts cannot be parsed, - * the error code issued by av_set_string3() if a key/value pair - * cannot be set + * Iterate over all AVOptions belonging to obj. * - * Options names must use only the following characters: a-z A-Z 0-9 - . / _ - * Separators must use characters distinct from option names and from each - * other. - */ -@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, - @Cast("const char*const*") PointerPointer shorthand, - @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); -@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, - @Cast("const char*const*") @ByPtrPtr BytePointer shorthand, - @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); -@NoException public static native int av_opt_set_from_string(Pointer ctx, String opts, - @Cast("const char*const*") @ByPtrPtr ByteBuffer shorthand, - String key_val_sep, String pairs_sep); -@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, - @Cast("const char*const*") @ByPtrPtr byte[] shorthand, - @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); -@NoException public static native int av_opt_set_from_string(Pointer ctx, String opts, - @Cast("const char*const*") @ByPtrPtr BytePointer shorthand, - String key_val_sep, String pairs_sep); -@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, - @Cast("const char*const*") @ByPtrPtr ByteBuffer shorthand, - @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); -@NoException public static native int av_opt_set_from_string(Pointer ctx, String opts, - @Cast("const char*const*") @ByPtrPtr byte[] shorthand, - String key_val_sep, String pairs_sep); -/** - * Free all allocated objects in obj. + * @param obj an AVOptions-enabled struct or a double pointer to an + * AVClass describing it. + * @param prev result of the previous call to av_opt_next() on this object + * or NULL + * @return next AVOption or NULL */ -@NoException public static native void av_opt_free(Pointer obj); +@NoException public static native @Const AVOption av_opt_next(@Const Pointer obj, @Const AVOption prev); /** - * Check whether a particular flag is set in a flags field. + * Iterate over AVOptions-enabled children of obj. * - * @param field_name the name of the flag field option - * @param flag_name the name of the flag to check - * @return non-zero if the flag is set, zero if the flag isn't set, - * isn't of the right type, or the flags field doesn't exist. + * @param prev result of a previous call to this function or NULL + * @return next AVOptions-enabled child or NULL */ -@NoException public static native int av_opt_flag_is_set(Pointer obj, @Cast("const char*") BytePointer field_name, @Cast("const char*") BytePointer flag_name); -@NoException public static native int av_opt_flag_is_set(Pointer obj, String field_name, String flag_name); +@NoException public static native Pointer av_opt_child_next(Pointer obj, Pointer prev); /** - * Set all the options from a given dictionary on an object. + * Iterate over potential AVOptions-enabled children of parent. * - * @param obj a struct whose first element is a pointer to AVClass - * @param options options to process. This dictionary will be freed and replaced - * by a new one containing all options not found in obj. - * Of course this new dictionary needs to be freed by caller - * with av_dict_free(). + * @param iter a pointer where iteration state is stored. + * @return AVClass corresponding to next potential child or NULL + */ +@NoException public static native @Const AVClass av_opt_child_class_iterate(@Const AVClass parent, @Cast("void**") PointerPointer iter); +@NoException public static native @Const AVClass av_opt_child_class_iterate(@Const AVClass parent, @Cast("void**") @ByPtrPtr Pointer iter); + +/** Search in possible children of the + given object first. */ +public static final int AV_OPT_SEARCH_CHILDREN = (1 << 0); +/** + * The obj passed to av_opt_find() is fake -- only a double pointer to AVClass + * instead of a required pointer to a struct containing AVClass. This is + * useful for searching for options without needing to allocate the corresponding + * object. + */ +public static final int AV_OPT_SEARCH_FAKE_OBJ = (1 << 1); + +/** + * In av_opt_get, return NULL if the option has a pointer type and is set to NULL, + * rather than returning an empty string. + */ +public static final int AV_OPT_ALLOW_NULL = (1 << 2); + +/** + * Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than + * one component for certain option types. + * @see AVOptionRanges for details. + */ +public static final int AV_OPT_MULTI_COMPONENT_RANGE = (1 << 12); + +/** + * Look for an option in an object. Consider only options which + * have all the specified flags set. * - * @return 0 on success, a negative AVERROR if some option was found in obj, - * but could not be set. + * @param obj [in] A pointer to a struct whose first element is a + * pointer to an AVClass. + * Alternatively a double pointer to an AVClass, if + * AV_OPT_SEARCH_FAKE_OBJ search flag is set. + * @param name [in] The name of the option to look for. + * @param unit [in] When searching for named constants, name of the unit + * it belongs to. + * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). + * @param search_flags A combination of AV_OPT_SEARCH_*. * - * @see av_dict_copy() + * @return A pointer to the option found, or NULL if no option + * was found. + * + * \note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable + * directly with av_opt_set(). Use special calls which take an options + * AVDictionary (e.g. avformat_open_input()) to set options found with this + * flag. */ -@NoException public static native int av_opt_set_dict(Pointer obj, @Cast("AVDictionary**") PointerPointer options); -@NoException public static native int av_opt_set_dict(Pointer obj, @ByPtrPtr AVDictionary options); - +@NoException public static native @Const AVOption av_opt_find(Pointer obj, @Cast("const char*") BytePointer name, @Cast("const char*") BytePointer unit, + int opt_flags, int search_flags); +@NoException public static native @Const AVOption av_opt_find(Pointer obj, String name, String unit, + int opt_flags, int search_flags); /** - * Set all the options from a given dictionary on an object. + * Look for an option in an object. Consider only options which + * have all the specified flags set. * - * @param obj a struct whose first element is a pointer to AVClass - * @param options options to process. This dictionary will be freed and replaced - * by a new one containing all options not found in obj. - * Of course this new dictionary needs to be freed by caller - * with av_dict_free(). + * @param obj [in] A pointer to a struct whose first element is a + * pointer to an AVClass. + * Alternatively a double pointer to an AVClass, if + * AV_OPT_SEARCH_FAKE_OBJ search flag is set. + * @param name [in] The name of the option to look for. + * @param unit [in] When searching for named constants, name of the unit + * it belongs to. + * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). * @param search_flags A combination of AV_OPT_SEARCH_*. + * @param target_obj [out] if non-NULL, an object to which the option belongs will be + * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present + * in search_flags. This parameter is ignored if search_flags contain + * AV_OPT_SEARCH_FAKE_OBJ. * - * @return 0 on success, a negative AVERROR if some option was found in obj, - * but could not be set. + * @return A pointer to the option found, or NULL if no option + * was found. + */ +@NoException public static native @Const AVOption av_opt_find2(Pointer obj, @Cast("const char*") BytePointer name, @Cast("const char*") BytePointer unit, + int opt_flags, int search_flags, @Cast("void**") PointerPointer target_obj); +@NoException public static native @Const AVOption av_opt_find2(Pointer obj, @Cast("const char*") BytePointer name, @Cast("const char*") BytePointer unit, + int opt_flags, int search_flags, @Cast("void**") @ByPtrPtr Pointer target_obj); +@NoException public static native @Const AVOption av_opt_find2(Pointer obj, String name, String unit, + int opt_flags, int search_flags, @Cast("void**") @ByPtrPtr Pointer target_obj); + +/** + * Show the obj options. * - * @see av_dict_copy() + * @param req_flags requested flags for the options to show. Show only the + * options for which it is opt->flags & req_flags. + * @param rej_flags rejected flags for the options to show. Show only the + * options for which it is !(opt->flags & req_flags). + * @param av_log_obj log context to use for showing the options */ -@NoException public static native int av_opt_set_dict2(Pointer obj, @Cast("AVDictionary**") PointerPointer options, int search_flags); -@NoException public static native int av_opt_set_dict2(Pointer obj, @ByPtrPtr AVDictionary options, int search_flags); +@NoException public static native int av_opt_show2(Pointer obj, Pointer av_log_obj, int req_flags, int rej_flags); /** * Extract a key-value pair from the beginning of a string. @@ -5892,162 +5975,140 @@ allocated with av_malloc() or another memory allocation function. */ */ AV_OPT_FLAG_IMPLICIT_KEY = 1; -/** - * \defgroup opt_eval_funcs Evaluating option strings - * \{ - * This group of functions can be used to evaluate option strings - * and get numbers out of them. They do the same thing as av_opt_set(), - * except the result is written into the caller-supplied pointer. - * - * @param obj a struct whose first element is a pointer to AVClass. - * @param o an option for which the string is to be evaluated. - * @param val string to be evaluated. - * @param *_out value of the string will be written here. - * - * @return 0 on success, a negative number on failure. - */ -@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntPointer flags_out); -@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, String val, IntBuffer flags_out); -@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, int[] flags_out); -@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, String val, IntPointer flags_out); -@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntBuffer flags_out); -@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, String val, int[] flags_out); -@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntPointer int_out); -@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, String val, IntBuffer int_out); -@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, int[] int_out); -@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, String val, IntPointer int_out); -@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntBuffer int_out); -@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, String val, int[] int_out); -@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, @Cast("int64_t*") LongPointer int64_out); -@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, String val, @Cast("int64_t*") LongBuffer int64_out); -@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, @Cast("int64_t*") long[] int64_out); -@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, String val, @Cast("int64_t*") LongPointer int64_out); -@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, @Cast("int64_t*") LongBuffer int64_out); -@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, String val, @Cast("int64_t*") long[] int64_out); -@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, FloatPointer float_out); -@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, String val, FloatBuffer float_out); -@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, float[] float_out); -@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, String val, FloatPointer float_out); -@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, FloatBuffer float_out); -@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, String val, float[] float_out); -@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, DoublePointer double_out); -@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, String val, DoubleBuffer double_out); -@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, double[] double_out); -@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, String val, DoublePointer double_out); -@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, DoubleBuffer double_out); -@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, String val, double[] double_out); -@NoException public static native int av_opt_eval_q(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, AVRational q_out); -@NoException public static native int av_opt_eval_q(Pointer obj, @Const AVOption o, String val, AVRational q_out); /** * \} */ -/** Search in possible children of the - given object first. */ -public static final int AV_OPT_SEARCH_CHILDREN = (1 << 0); /** - * The obj passed to av_opt_find() is fake -- only a double pointer to AVClass - * instead of a required pointer to a struct containing AVClass. This is - * useful for searching for options without needing to allocate the corresponding - * object. + * \defgroup opt_write Setting and modifying option values + * \{ */ -public static final int AV_OPT_SEARCH_FAKE_OBJ = (1 << 1); /** - * In av_opt_get, return NULL if the option has a pointer type and is set to NULL, - * rather than returning an empty string. + * Parse the key/value pairs list in opts. For each key/value pair + * found, stores the value in the field in ctx that is named like the + * key. ctx must be an AVClass context, storing is done using + * AVOptions. + * + * @param opts options string to parse, may be NULL + * @param key_val_sep a 0-terminated list of characters used to + * separate key from value + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other + * @return the number of successfully set key/value pairs, or a negative + * value corresponding to an AVERROR code in case of error: + * AVERROR(EINVAL) if opts cannot be parsed, + * the error code issued by av_opt_set() if a key/value pair + * cannot be set */ -public static final int AV_OPT_ALLOW_NULL = (1 << 2); +@NoException public static native int av_set_options_string(Pointer ctx, @Cast("const char*") BytePointer opts, + @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); +@NoException public static native int av_set_options_string(Pointer ctx, String opts, + String key_val_sep, String pairs_sep); /** - * Allows av_opt_query_ranges and av_opt_query_ranges_default to return more than - * one component for certain option types. - * @see AVOptionRanges for details. + * Parse the key-value pairs list in opts. For each key=value pair found, + * set the value of the corresponding option in ctx. + * + * @param ctx the AVClass object to set options on + * @param opts the options string, key-value pairs separated by a + * delimiter + * @param shorthand a NULL-terminated array of options names for shorthand + * notation: if the first field in opts has no key part, + * the key is taken from the first element of shorthand; + * then again for the second, etc., until either opts is + * finished, shorthand is finished or a named option is + * found; after that, all options must be named + * @param key_val_sep a 0-terminated list of characters used to separate + * key from value, for example '=' + * @param pairs_sep a 0-terminated list of characters used to separate + * two pairs from each other, for example ':' or ',' + * @return the number of successfully set key=value pairs, or a negative + * value corresponding to an AVERROR code in case of error: + * AVERROR(EINVAL) if opts cannot be parsed, + * the error code issued by av_set_string3() if a key/value pair + * cannot be set + * + * Options names must use only the following characters: a-z A-Z 0-9 - . / _ + * Separators must use characters distinct from option names and from each + * other. */ -public static final int AV_OPT_MULTI_COMPONENT_RANGE = (1 << 12); +@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, + @Cast("const char*const*") PointerPointer shorthand, + @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); +@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, + @Cast("const char*const*") @ByPtrPtr BytePointer shorthand, + @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); +@NoException public static native int av_opt_set_from_string(Pointer ctx, String opts, + @Cast("const char*const*") @ByPtrPtr ByteBuffer shorthand, + String key_val_sep, String pairs_sep); +@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, + @Cast("const char*const*") @ByPtrPtr byte[] shorthand, + @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); +@NoException public static native int av_opt_set_from_string(Pointer ctx, String opts, + @Cast("const char*const*") @ByPtrPtr BytePointer shorthand, + String key_val_sep, String pairs_sep); +@NoException public static native int av_opt_set_from_string(Pointer ctx, @Cast("const char*") BytePointer opts, + @Cast("const char*const*") @ByPtrPtr ByteBuffer shorthand, + @Cast("const char*") BytePointer key_val_sep, @Cast("const char*") BytePointer pairs_sep); +@NoException public static native int av_opt_set_from_string(Pointer ctx, String opts, + @Cast("const char*const*") @ByPtrPtr byte[] shorthand, + String key_val_sep, String pairs_sep); /** - * Look for an option in an object. Consider only options which - * have all the specified flags set. + * Set all the options from a given dictionary on an object. * - * @param obj [in] A pointer to a struct whose first element is a - * pointer to an AVClass. - * Alternatively a double pointer to an AVClass, if - * AV_OPT_SEARCH_FAKE_OBJ search flag is set. - * @param name [in] The name of the option to look for. - * @param unit [in] When searching for named constants, name of the unit - * it belongs to. - * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). - * @param search_flags A combination of AV_OPT_SEARCH_*. + * @param obj a struct whose first element is a pointer to AVClass + * @param options options to process. This dictionary will be freed and replaced + * by a new one containing all options not found in obj. + * Of course this new dictionary needs to be freed by caller + * with av_dict_free(). * - * @return A pointer to the option found, or NULL if no option - * was found. + * @return 0 on success, a negative AVERROR if some option was found in obj, + * but could not be set. * - * \note Options found with AV_OPT_SEARCH_CHILDREN flag may not be settable - * directly with av_opt_set(). Use special calls which take an options - * AVDictionary (e.g. avformat_open_input()) to set options found with this - * flag. + * @see av_dict_copy() */ -@NoException public static native @Const AVOption av_opt_find(Pointer obj, @Cast("const char*") BytePointer name, @Cast("const char*") BytePointer unit, - int opt_flags, int search_flags); -@NoException public static native @Const AVOption av_opt_find(Pointer obj, String name, String unit, - int opt_flags, int search_flags); +@NoException public static native int av_opt_set_dict(Pointer obj, @Cast("AVDictionary**") PointerPointer options); +@NoException public static native int av_opt_set_dict(Pointer obj, @ByPtrPtr AVDictionary options); + /** - * Look for an option in an object. Consider only options which - * have all the specified flags set. + * Set all the options from a given dictionary on an object. * - * @param obj [in] A pointer to a struct whose first element is a - * pointer to an AVClass. - * Alternatively a double pointer to an AVClass, if - * AV_OPT_SEARCH_FAKE_OBJ search flag is set. - * @param name [in] The name of the option to look for. - * @param unit [in] When searching for named constants, name of the unit - * it belongs to. - * @param opt_flags Find only options with all the specified flags set (AV_OPT_FLAG). + * @param obj a struct whose first element is a pointer to AVClass + * @param options options to process. This dictionary will be freed and replaced + * by a new one containing all options not found in obj. + * Of course this new dictionary needs to be freed by caller + * with av_dict_free(). * @param search_flags A combination of AV_OPT_SEARCH_*. - * @param target_obj [out] if non-NULL, an object to which the option belongs will be - * written here. It may be different from obj if AV_OPT_SEARCH_CHILDREN is present - * in search_flags. This parameter is ignored if search_flags contain - * AV_OPT_SEARCH_FAKE_OBJ. * - * @return A pointer to the option found, or NULL if no option - * was found. - */ -@NoException public static native @Const AVOption av_opt_find2(Pointer obj, @Cast("const char*") BytePointer name, @Cast("const char*") BytePointer unit, - int opt_flags, int search_flags, @Cast("void**") PointerPointer target_obj); -@NoException public static native @Const AVOption av_opt_find2(Pointer obj, @Cast("const char*") BytePointer name, @Cast("const char*") BytePointer unit, - int opt_flags, int search_flags, @Cast("void**") @ByPtrPtr Pointer target_obj); -@NoException public static native @Const AVOption av_opt_find2(Pointer obj, String name, String unit, - int opt_flags, int search_flags, @Cast("void**") @ByPtrPtr Pointer target_obj); - -/** - * Iterate over all AVOptions belonging to obj. + * @return 0 on success, a negative AVERROR if some option was found in obj, + * but could not be set. * - * @param obj an AVOptions-enabled struct or a double pointer to an - * AVClass describing it. - * @param prev result of the previous call to av_opt_next() on this object - * or NULL - * @return next AVOption or NULL + * @see av_dict_copy() */ -@NoException public static native @Const AVOption av_opt_next(@Const Pointer obj, @Const AVOption prev); +@NoException public static native int av_opt_set_dict2(Pointer obj, @Cast("AVDictionary**") PointerPointer options, int search_flags); +@NoException public static native int av_opt_set_dict2(Pointer obj, @ByPtrPtr AVDictionary options, int search_flags); /** - * Iterate over AVOptions-enabled children of obj. + * Copy options from src object into dest object. * - * @param prev result of a previous call to this function or NULL - * @return next AVOptions-enabled child or NULL - */ -@NoException public static native Pointer av_opt_child_next(Pointer obj, Pointer prev); - -/** - * Iterate over potential AVOptions-enabled children of parent. + * The underlying AVClass of both src and dest must coincide. The guarantee + * below does not apply if this is not fulfilled. * - * @param iter a pointer where iteration state is stored. - * @return AVClass corresponding to next potential child or NULL + * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object. + * Original memory allocated for such options is freed unless both src and dest options points to the same memory. + * + * Even on error it is guaranteed that allocated options from src and dest + * no longer alias each other afterwards; in particular calling av_opt_free() + * on both src and dest is safe afterwards if dest has been memdup'ed from src. + * + * @param dest Object to copy from + * @param src Object to copy into + * @return 0 on success, negative on error */ -@NoException public static native @Const AVClass av_opt_child_class_iterate(@Const AVClass parent, @Cast("void**") PointerPointer iter); -@NoException public static native @Const AVClass av_opt_child_class_iterate(@Const AVClass parent, @Cast("void**") @ByPtrPtr Pointer iter); +@NoException public static native int av_opt_copy(Pointer dest, @Const Pointer src); /** * \defgroup opt_set_funcs Option setting functions @@ -6100,10 +6161,6 @@ allocated with av_malloc() or another memory allocation function. */ @NoException public static native int av_opt_set_sample_fmt(Pointer obj, String name, @Cast("AVSampleFormat") int fmt, int search_flags); @NoException public static native int av_opt_set_video_rate(Pointer obj, @Cast("const char*") BytePointer name, @ByVal AVRational val, int search_flags); @NoException public static native int av_opt_set_video_rate(Pointer obj, String name, @ByVal AVRational val, int search_flags); -// #if FF_API_OLD_CHANNEL_LAYOUT -@NoException public static native @Deprecated int av_opt_set_channel_layout(Pointer obj, @Cast("const char*") BytePointer name, @Cast("int64_t") long ch_layout, int search_flags); -@NoException public static native @Deprecated int av_opt_set_channel_layout(Pointer obj, String name, @Cast("int64_t") long ch_layout, int search_flags); -// #endif @NoException public static native int av_opt_set_chlayout(Pointer obj, @Cast("const char*") BytePointer name, @Const AVChannelLayout layout, int search_flags); @NoException public static native int av_opt_set_chlayout(Pointer obj, String name, @Const AVChannelLayout layout, int search_flags); /** @@ -6130,9 +6187,15 @@ allocated with av_malloc() or another memory allocation function. */ // av_int_list_length(val, term) * sizeof(*(val)), flags)) /** + * \} * \} */ +/** + * \defgroup opt_read Reading option values + * \{ + */ + /** * \defgroup opt_get_funcs Option getting functions * \{ @@ -6194,14 +6257,6 @@ allocated with av_malloc() or another memory allocation function. */ @NoException public static native int av_opt_get_sample_fmt(Pointer obj, String name, int search_flags, @Cast("AVSampleFormat*") int[] out_fmt); @NoException public static native int av_opt_get_video_rate(Pointer obj, @Cast("const char*") BytePointer name, int search_flags, AVRational out_val); @NoException public static native int av_opt_get_video_rate(Pointer obj, String name, int search_flags, AVRational out_val); -// #if FF_API_OLD_CHANNEL_LAYOUT -@NoException public static native @Deprecated int av_opt_get_channel_layout(Pointer obj, @Cast("const char*") BytePointer name, int search_flags, @Cast("int64_t*") LongPointer ch_layout); -@NoException public static native @Deprecated int av_opt_get_channel_layout(Pointer obj, String name, int search_flags, @Cast("int64_t*") LongBuffer ch_layout); -@NoException public static native @Deprecated int av_opt_get_channel_layout(Pointer obj, @Cast("const char*") BytePointer name, int search_flags, @Cast("int64_t*") long[] ch_layout); -@NoException public static native @Deprecated int av_opt_get_channel_layout(Pointer obj, String name, int search_flags, @Cast("int64_t*") LongPointer ch_layout); -@NoException public static native @Deprecated int av_opt_get_channel_layout(Pointer obj, @Cast("const char*") BytePointer name, int search_flags, @Cast("int64_t*") LongBuffer ch_layout); -@NoException public static native @Deprecated int av_opt_get_channel_layout(Pointer obj, String name, int search_flags, @Cast("int64_t*") long[] ch_layout); -// #endif @NoException public static native int av_opt_get_chlayout(Pointer obj, @Cast("const char*") BytePointer name, int search_flags, AVChannelLayout layout); @NoException public static native int av_opt_get_chlayout(Pointer obj, String name, int search_flags, AVChannelLayout layout); /** @@ -6214,6 +6269,57 @@ allocated with av_malloc() or another memory allocation function. */ /** * \} */ + +/** + * \defgroup opt_eval_funcs Evaluating option strings + * \{ + * This group of functions can be used to evaluate option strings + * and get numbers out of them. They do the same thing as av_opt_set(), + * except the result is written into the caller-supplied pointer. + * + * @param obj a struct whose first element is a pointer to AVClass. + * @param o an option for which the string is to be evaluated. + * @param val string to be evaluated. + * @param *_out value of the string will be written here. + * + * @return 0 on success, a negative number on failure. + */ +@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntPointer flags_out); +@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, String val, IntBuffer flags_out); +@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, int[] flags_out); +@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, String val, IntPointer flags_out); +@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntBuffer flags_out); +@NoException public static native int av_opt_eval_flags(Pointer obj, @Const AVOption o, String val, int[] flags_out); +@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntPointer int_out); +@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, String val, IntBuffer int_out); +@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, int[] int_out); +@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, String val, IntPointer int_out); +@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, IntBuffer int_out); +@NoException public static native int av_opt_eval_int(Pointer obj, @Const AVOption o, String val, int[] int_out); +@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, @Cast("int64_t*") LongPointer int64_out); +@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, String val, @Cast("int64_t*") LongBuffer int64_out); +@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, @Cast("int64_t*") long[] int64_out); +@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, String val, @Cast("int64_t*") LongPointer int64_out); +@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, @Cast("int64_t*") LongBuffer int64_out); +@NoException public static native int av_opt_eval_int64(Pointer obj, @Const AVOption o, String val, @Cast("int64_t*") long[] int64_out); +@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, FloatPointer float_out); +@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, String val, FloatBuffer float_out); +@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, float[] float_out); +@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, String val, FloatPointer float_out); +@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, FloatBuffer float_out); +@NoException public static native int av_opt_eval_float(Pointer obj, @Const AVOption o, String val, float[] float_out); +@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, DoublePointer double_out); +@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, String val, DoubleBuffer double_out); +@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, double[] double_out); +@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, String val, DoublePointer double_out); +@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, DoubleBuffer double_out); +@NoException public static native int av_opt_eval_double(Pointer obj, @Const AVOption o, String val, double[] double_out); +@NoException public static native int av_opt_eval_q(Pointer obj, @Const AVOption o, @Cast("const char*") BytePointer val, AVRational q_out); +@NoException public static native int av_opt_eval_q(Pointer obj, @Const AVOption o, String val, AVRational q_out); +/** + * \} + */ + /** * Gets a pointer to the requested field in a struct. * This function allows accessing a struct even when its fields are moved or @@ -6225,66 +6331,6 @@ allocated with av_malloc() or another memory allocation function. */ @NoException public static native Pointer av_opt_ptr(@Const AVClass avclass, Pointer obj, @Cast("const char*") BytePointer name); @NoException public static native Pointer av_opt_ptr(@Const AVClass avclass, Pointer obj, String name); -/** - * Free an AVOptionRanges struct and set it to NULL. - */ -@NoException public static native void av_opt_freep_ranges(@Cast("AVOptionRanges**") PointerPointer ranges); -@NoException public static native void av_opt_freep_ranges(@ByPtrPtr AVOptionRanges ranges); - -/** - * Get a list of allowed ranges for the given option. - * - * The returned list may depend on other fields in obj like for example profile. - * - * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored - * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance - * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges - * - * The result must be freed with av_opt_freep_ranges. - * - * @return number of compontents returned on success, a negative errro code otherwise - */ -@NoException public static native int av_opt_query_ranges(@Cast("AVOptionRanges**") PointerPointer arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); -@NoException public static native int av_opt_query_ranges(@ByPtrPtr AVOptionRanges arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); -@NoException public static native int av_opt_query_ranges(@ByPtrPtr AVOptionRanges arg0, Pointer obj, String key, int flags); - -/** - * Copy options from src object into dest object. - * - * The underlying AVClass of both src and dest must coincide. The guarantee - * below does not apply if this is not fulfilled. - * - * Options that require memory allocation (e.g. string or binary) are malloc'ed in dest object. - * Original memory allocated for such options is freed unless both src and dest options points to the same memory. - * - * Even on error it is guaranteed that allocated options from src and dest - * no longer alias each other afterwards; in particular calling av_opt_free() - * on both src and dest is safe afterwards if dest has been memdup'ed from src. - * - * @param dest Object to copy from - * @param src Object to copy into - * @return 0 on success, negative on error - */ -@NoException public static native int av_opt_copy(Pointer dest, @Const Pointer src); - -/** - * Get a default list of allowed ranges for the given option. - * - * This list is constructed without using the AVClass.query_ranges() callback - * and can be used as fallback from within the callback. - * - * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored - * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance - * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges - * - * The result must be freed with av_opt_free_ranges. - * - * @return number of compontents returned on success, a negative errro code otherwise - */ -@NoException public static native int av_opt_query_ranges_default(@Cast("AVOptionRanges**") PointerPointer arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); -@NoException public static native int av_opt_query_ranges_default(@ByPtrPtr AVOptionRanges arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); -@NoException public static native int av_opt_query_ranges_default(@ByPtrPtr AVOptionRanges arg0, Pointer obj, String key, int flags); - /** * Check if given option is set to its default value. * @@ -6312,6 +6358,16 @@ allocated with av_malloc() or another memory allocation function. */ @NoException public static native int av_opt_is_set_to_default_by_name(Pointer obj, @Cast("const char*") BytePointer name, int search_flags); @NoException public static native int av_opt_is_set_to_default_by_name(Pointer obj, String name, int search_flags); +/** + * Check whether a particular flag is set in a flags field. + * + * @param field_name the name of the flag field option + * @param flag_name the name of the flag to check + * @return non-zero if the flag is set, zero if the flag isn't set, + * isn't of the right type, or the flags field doesn't exist. + */ +@NoException public static native int av_opt_flag_is_set(Pointer obj, @Cast("const char*") BytePointer field_name, @Cast("const char*") BytePointer flag_name); +@NoException public static native int av_opt_flag_is_set(Pointer obj, String field_name, String flag_name); /** Serialize options that are not set to default values only. */ public static final int AV_OPT_SERIALIZE_SKIP_DEFAULTS = 0x00000001; @@ -6344,6 +6400,52 @@ allocated with av_malloc() or another memory allocation function. */ @Cast("const char") byte key_val_sep, @Cast("const char") byte pairs_sep); @NoException public static native int av_opt_serialize(Pointer obj, int opt_flags, int flags, @Cast("char**") @ByPtrPtr byte[] buffer, @Cast("const char") byte key_val_sep, @Cast("const char") byte pairs_sep); + +/** + * \} + */ + +/** + * Free an AVOptionRanges struct and set it to NULL. + */ +@NoException public static native void av_opt_freep_ranges(@Cast("AVOptionRanges**") PointerPointer ranges); +@NoException public static native void av_opt_freep_ranges(@ByPtrPtr AVOptionRanges ranges); + +/** + * Get a list of allowed ranges for the given option. + * + * The returned list may depend on other fields in obj like for example profile. + * + * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored + * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance + * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges + * + * The result must be freed with av_opt_freep_ranges. + * + * @return number of compontents returned on success, a negative errro code otherwise + */ +@NoException public static native int av_opt_query_ranges(@Cast("AVOptionRanges**") PointerPointer arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); +@NoException public static native int av_opt_query_ranges(@ByPtrPtr AVOptionRanges arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); +@NoException public static native int av_opt_query_ranges(@ByPtrPtr AVOptionRanges arg0, Pointer obj, String key, int flags); + +/** + * Get a default list of allowed ranges for the given option. + * + * This list is constructed without using the AVClass.query_ranges() callback + * and can be used as fallback from within the callback. + * + * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored + * AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance + * AV_OPT_MULTI_COMPONENT_RANGE indicates that function may return more than one component, @see AVOptionRanges + * + * The result must be freed with av_opt_free_ranges. + * + * @return number of compontents returned on success, a negative errro code otherwise + */ +@NoException public static native int av_opt_query_ranges_default(@Cast("AVOptionRanges**") PointerPointer arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); +@NoException public static native int av_opt_query_ranges_default(@ByPtrPtr AVOptionRanges arg0, Pointer obj, @Cast("const char*") BytePointer key, int flags); +@NoException public static native int av_opt_query_ranges_default(@ByPtrPtr AVOptionRanges arg0, Pointer obj, String key, int flags); + /** * \} */ @@ -6435,6 +6537,11 @@ allocated with av_malloc() or another memory allocation function. */ */ public static final int AV_PIX_FMT_FLAG_FLOAT = (1 << 9); +/** + * The pixel format contains XYZ-like data (as opposed to YUV/RGB/grayscale). + */ +public static final int AV_PIX_FMT_FLAG_XYZ = (1 << 10); + /** * Return the number of bits per pixel used by the pixel format * described by pixdesc. Note that this is not the same as the number @@ -7201,6 +7308,45 @@ allocated with av_malloc() or another memory allocation function. */ @Cast("AVPixelFormat") int pix_fmt, @Cast("AVColorRange") int range, int width, int height); +/** + * Overwrite the image data with a color. This is suitable for filling a + * sub-rectangle of an image, meaning the padding between the right most pixel + * and the left most pixel on the next line will not be overwritten. For some + * formats, the image size might be rounded up due to inherent alignment. + * + * If the pixel format has alpha, it is also replaced. Color component values + * are interpreted as native integers (or intfloats) regardless of actual pixel + * format endianness. + * + * This can return an error if the pixel format is not supported. Normally, all + * non-hwaccel pixel formats should be supported. + * + * Passing NULL for dst_data is allowed. Then the function returns whether the + * operation would have succeeded. (It can return an error if the pix_fmt is + * not supported.) + * + * @param dst_data data pointers to destination image + * @param dst_linesize linesizes for the destination image + * @param pix_fmt the pixel format of the image + * @param color the color components to be used for the fill + * @param width the width of the image in pixels + * @param height the height of the image in pixels + * @param flags currently unused + * @return 0 if the image data was filled, a negative AVERROR code otherwise + */ +@NoException public static native int av_image_fill_color(@Cast("uint8_t*const*") PointerPointer dst_data, @Cast("const ptrdiff_t*") SizeTPointer dst_linesize, + @Cast("AVPixelFormat") int pix_fmt, @Cast("const uint32_t*") IntPointer color, + int width, int height, int flags); +@NoException public static native int av_image_fill_color(@Cast("uint8_t*const*") @ByPtrPtr BytePointer dst_data, @Cast("const ptrdiff_t*") SizeTPointer dst_linesize, + @Cast("AVPixelFormat") int pix_fmt, @Cast("const uint32_t*") IntPointer color, + int width, int height, int flags); +@NoException public static native int av_image_fill_color(@Cast("uint8_t*const*") @ByPtrPtr ByteBuffer dst_data, @Cast("const ptrdiff_t*") SizeTPointer dst_linesize, + @Cast("AVPixelFormat") int pix_fmt, @Cast("const uint32_t*") IntBuffer color, + int width, int height, int flags); +@NoException public static native int av_image_fill_color(@Cast("uint8_t*const*") @ByPtrPtr byte[] dst_data, @Cast("const ptrdiff_t*") SizeTPointer dst_linesize, + @Cast("AVPixelFormat") int pix_fmt, @Cast("const uint32_t*") int[] color, + int width, int height, int flags); + /** * \} */ @@ -7511,7 +7657,7 @@ allocated with av_malloc() or another memory allocation function. */ /* Automatically generated by version.sh, do not manually edit! */ // #ifndef AVUTIL_FFVERSION_H // #define AVUTIL_FFVERSION_H -public static final String FFMPEG_VERSION = "6.1.1"; +public static final String FFMPEG_VERSION = "7.0"; // #endif /* AVUTIL_FFVERSION_H */ @@ -7767,155 +7913,6 @@ allocated with av_malloc() or another memory allocation function. */ */ @NoException public static native void av_fifo_freep2(@Cast("AVFifo**") PointerPointer f); @NoException public static native void av_fifo_freep2(@ByPtrPtr AVFifo f); -// Targeting ../avutil/AVFifoBuffer.java - - - -/** - * Initialize an AVFifoBuffer. - * @param size of FIFO - * @return AVFifoBuffer or NULL in case of memory allocation failure - * @deprecated use av_fifo_alloc2() - */ -@NoException public static native @Deprecated AVFifoBuffer av_fifo_alloc(@Cast("unsigned int") int size); - -/** - * Initialize an AVFifoBuffer. - * @param nmemb number of elements - * @param size size of the single element - * @return AVFifoBuffer or NULL in case of memory allocation failure - * @deprecated use av_fifo_alloc2() - */ -@NoException public static native @Deprecated AVFifoBuffer av_fifo_alloc_array(@Cast("size_t") long nmemb, @Cast("size_t") long size); - -/** - * Free an AVFifoBuffer. - * @param f AVFifoBuffer to free - * @deprecated use the AVFifo API with av_fifo_freep2() - */ -@NoException public static native @Deprecated void av_fifo_free(AVFifoBuffer f); - -/** - * Free an AVFifoBuffer and reset pointer to NULL. - * @param f AVFifoBuffer to free - * @deprecated use the AVFifo API with av_fifo_freep2() - */ -@NoException public static native @Deprecated void av_fifo_freep(@Cast("AVFifoBuffer**") PointerPointer f); -@NoException public static native @Deprecated void av_fifo_freep(@ByPtrPtr AVFifoBuffer f); - -/** - * Reset the AVFifoBuffer to the state right after av_fifo_alloc, in particular it is emptied. - * @param f AVFifoBuffer to reset - * @deprecated use av_fifo_reset2() with the new AVFifo-API - */ -@NoException public static native @Deprecated void av_fifo_reset(AVFifoBuffer f); - -/** - * Return the amount of data in bytes in the AVFifoBuffer, that is the - * amount of data you can read from it. - * @param f AVFifoBuffer to read from - * @return size - * @deprecated use av_fifo_can_read() with the new AVFifo-API - */ -@NoException public static native @Deprecated int av_fifo_size(@Const AVFifoBuffer f); - -/** - * Return the amount of space in bytes in the AVFifoBuffer, that is the - * amount of data you can write into it. - * @param f AVFifoBuffer to write into - * @return size - * @deprecated use av_fifo_can_write() with the new AVFifo-API - */ -@NoException public static native @Deprecated int av_fifo_space(@Const AVFifoBuffer f); -// Targeting ../avutil/Func_Pointer_Pointer_int.java - - -@NoException public static native @Deprecated int av_fifo_generic_peek_at(AVFifoBuffer f, Pointer dest, int offset, int buf_size, Func_Pointer_Pointer_int func); - -/** - * Feed data from an AVFifoBuffer to a user-supplied callback. - * Similar as av_fifo_gereric_read but without discarding data. - * @param f AVFifoBuffer to read from - * @param buf_size number of bytes to read - * @param func generic read function - * @param dest data destination - * - * @return a non-negative number on success, a negative error code on failure - * - * @deprecated use the new AVFifo-API with av_fifo_peek() when func == NULL, - * av_fifo_peek_to_cb() otherwise - */ -@NoException public static native @Deprecated int av_fifo_generic_peek(AVFifoBuffer f, Pointer dest, int buf_size, Func_Pointer_Pointer_int func); - -/** - * Feed data from an AVFifoBuffer to a user-supplied callback. - * @param f AVFifoBuffer to read from - * @param buf_size number of bytes to read - * @param func generic read function - * @param dest data destination - * - * @return a non-negative number on success, a negative error code on failure - * - * @deprecated use the new AVFifo-API with av_fifo_read() when func == NULL, - * av_fifo_read_to_cb() otherwise - */ -@NoException public static native @Deprecated int av_fifo_generic_read(AVFifoBuffer f, Pointer dest, int buf_size, Func_Pointer_Pointer_int func); -// Targeting ../avutil/Int_func_Pointer_Pointer_int.java - - -@NoException public static native @Deprecated int av_fifo_generic_write(AVFifoBuffer f, Pointer src, int size, Int_func_Pointer_Pointer_int func); - -/** - * Resize an AVFifoBuffer. - * In case of reallocation failure, the old FIFO is kept unchanged. - * - * @param f AVFifoBuffer to resize - * @param size new AVFifoBuffer size in bytes - * @return <0 for failure, >=0 otherwise - * - * @deprecated use the new AVFifo-API with av_fifo_grow2() to increase FIFO size, - * decreasing FIFO size is not supported - */ -@NoException public static native @Deprecated int av_fifo_realloc2(AVFifoBuffer f, @Cast("unsigned int") int size); - -/** - * Enlarge an AVFifoBuffer. - * In case of reallocation failure, the old FIFO is kept unchanged. - * The new fifo size may be larger than the requested size. - * - * @param f AVFifoBuffer to resize - * @param additional_space the amount of space in bytes to allocate in addition to av_fifo_size() - * @return <0 for failure, >=0 otherwise - * - * @deprecated use the new AVFifo-API with av_fifo_grow2(); note that unlike - * this function it adds to the allocated size, rather than to the used size - */ -@NoException public static native @Deprecated int av_fifo_grow(AVFifoBuffer f, @Cast("unsigned int") int additional_space); - -/** - * Read and discard the specified amount of data from an AVFifoBuffer. - * @param f AVFifoBuffer to read from - * @param size amount of data to read in bytes - * - * @deprecated use the new AVFifo-API with av_fifo_drain2() - */ -@NoException public static native @Deprecated void av_fifo_drain(AVFifoBuffer f, int size); - -// #if FF_API_FIFO_PEEK2 -/** - * Return a pointer to the data stored in a FIFO buffer at a certain offset. - * The FIFO buffer is not modified. - * - * @param f AVFifoBuffer to peek at, f must be non-NULL - * @param offs an offset in bytes, its absolute value must be less - * than the used buffer size or the returned pointer will - * point outside to the buffer data. - * The used buffer size can be checked with av_fifo_size(). - * @deprecated use the new AVFifo-API with av_fifo_peek() or av_fifo_peek_to_cb() - */ -@NoException public static native @Cast("uint8_t*") @Deprecated BytePointer av_fifo_peek2(@Const AVFifoBuffer f, int offs); -// #endif -// #endif /** * \} @@ -8146,16 +8143,11 @@ allocated with av_malloc() or another memory allocation function. */ AV_HWDEVICE_TYPE_DRM = 8, AV_HWDEVICE_TYPE_OPENCL = 9, AV_HWDEVICE_TYPE_MEDIACODEC = 10, - AV_HWDEVICE_TYPE_VULKAN = 11; -// Targeting ../avutil/AVHWDeviceInternal.java - - + AV_HWDEVICE_TYPE_VULKAN = 11, + AV_HWDEVICE_TYPE_D3D12VA = 12; // Targeting ../avutil/AVHWDeviceContext.java -// Targeting ../avutil/AVHWFramesInternal.java - - // Targeting ../avutil/AVHWFramesContext.java @@ -10863,9 +10855,9 @@ allocated with av_malloc() or another memory allocation function. */ /** * Append data to a print buffer. * - * param buf bprint buffer to use - * param data pointer to data - * param size size of data + * @param buf bprint buffer to use + * @param data pointer to data + * @param size size of data */ @NoException public static native void av_bprint_append_data(AVBPrint buf, @Cast("const char*") BytePointer data, @Cast("unsigned") int size); @NoException public static native void av_bprint_append_data(AVBPrint buf, String data, @Cast("unsigned") int size); @@ -10875,9 +10867,9 @@ allocated with av_malloc() or another memory allocation function. */ /** * Append a formatted date and time to a print buffer. * - * param buf bprint buffer to use - * param fmt date and time format string, see strftime() - * param tm broken-down time structure to translate + * @param buf bprint buffer to use + * @param fmt date and time format string, see strftime() + * @param tm broken-down time structure to translate * * \note due to poor design of the standard strftime function, it may * produce poor results if the format string expands to a very long text and @@ -11002,6 +10994,13 @@ allocated with av_malloc() or another memory allocation function. */ // #include "attributes.h" // #include "error.h" // #include "macros.h" +// #include "mem.h" + +// #ifdef HAVE_AV_CONFIG_H +// # include "config.h" +// # include "intmath.h" +// # include "internal.h" +// #endif /* HAVE_AV_CONFIG_H */ //rounded division & shift // #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) @@ -11044,11 +11043,6 @@ allocated with av_malloc() or another memory allocation function. */ /* misc math functions */ -// #ifdef HAVE_AV_CONFIG_H -// # include "config.h" -// # include "intmath.h" -// #endif - // #ifndef av_ceil_log2 // # define av_ceil_log2 av_ceil_log2_c // #endif @@ -11418,14 +11412,6 @@ allocated with av_malloc() or another memory allocation function. */ // } // } - - -// #include "mem.h" - -// #ifdef HAVE_AV_CONFIG_H -// # include "internal.h" -// #endif /* HAVE_AV_CONFIG_H */ - // #endif /* AVUTIL_COMMON_H */ @@ -11708,7 +11694,7 @@ allocated with av_malloc() or another memory allocation function. */ * @param e the AVExpr to track user provided functions in * @param counter a zero-initialized array where the count of each function will be stored * if you passed 5 functions with 2 arguments to av_expr_parse() - * then for arg=2 this will use upto 5 entries. + * then for arg=2 this will use up to 5 entries. * @param size size of array * @param arg number of arguments the counted functions have * @return 0 on success, a negative value indicates that no expression or array was passed @@ -11952,28 +11938,6 @@ allocated with av_malloc() or another memory allocation function. */ @NoException public static native void av_file_unmap(@Cast("uint8_t*") ByteBuffer bufptr, @Cast("size_t") long size); @NoException public static native void av_file_unmap(@Cast("uint8_t*") byte[] bufptr, @Cast("size_t") long size); -// #if FF_API_AV_FOPEN_UTF8 -/** - * Wrapper to work around the lack of mkstemp() on mingw. - * Also, tries to create file in /tmp first, if possible. - * *prefix can be a character constant; *filename will be allocated internally. - * @return file descriptor of opened file (or negative value corresponding to an - * AVERROR code on error) - * and opened file name in **filename. - * \note On very old libcs it is necessary to set a secure umask before - * calling this, av_tempfile() can't call umask itself as it is used in - * libraries and could interfere with the calling application. - * @deprecated as fd numbers cannot be passed saftely between libs on some platforms - */ -@NoException public static native @Deprecated int av_tempfile(@Cast("const char*") BytePointer prefix, @Cast("char**") PointerPointer filename, int log_offset, Pointer log_ctx); -@NoException public static native @Deprecated int av_tempfile(@Cast("const char*") BytePointer prefix, @Cast("char**") @ByPtrPtr BytePointer filename, int log_offset, Pointer log_ctx); -@NoException public static native @Deprecated int av_tempfile(String prefix, @Cast("char**") @ByPtrPtr ByteBuffer filename, int log_offset, Pointer log_ctx); -@NoException public static native @Deprecated int av_tempfile(@Cast("const char*") BytePointer prefix, @Cast("char**") @ByPtrPtr byte[] filename, int log_offset, Pointer log_ctx); -@NoException public static native @Deprecated int av_tempfile(String prefix, @Cast("char**") @ByPtrPtr BytePointer filename, int log_offset, Pointer log_ctx); -@NoException public static native @Deprecated int av_tempfile(@Cast("const char*") BytePointer prefix, @Cast("char**") @ByPtrPtr ByteBuffer filename, int log_offset, Pointer log_ctx); -@NoException public static native @Deprecated int av_tempfile(String prefix, @Cast("char**") @ByPtrPtr byte[] filename, int log_offset, Pointer log_ctx); -// #endif - // #endif /* AVUTIL_FILE_H */ @@ -12263,13 +12227,13 @@ allocated with av_malloc() or another memory allocation function. */ * Serialize dynamic HDR10+ metadata to a user data registered ITU-T T.35 buffer, * excluding the first 48 bytes of the header, and beginning with the application mode. * @param s A pointer containing the decoded AVDynamicHDRPlus structure. - * @param data[in,out] A pointer to pointer to a byte buffer to be filled with the + * @param data [in,out] A pointer to pointer to a byte buffer to be filled with the * serialized metadata. * If *data is NULL, a buffer be will be allocated and a pointer to * it stored in its place. The caller assumes ownership of the buffer. * May be NULL, in which case the function will only store the * required buffer size in *size. - * @param size[in,out] A pointer to a size to be set to the returned buffer's size. + * @param size [in,out] A pointer to a size to be set to the returned buffer's size. * If *data is not NULL, *size must contain the size of the input * buffer. May be NULL only if *data is NULL. * @@ -12910,9 +12874,7 @@ allocated with av_malloc() or another memory allocation function. */ // #endif /* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be - * naturally aligned. They may be implemented using MMX, - * so emms_c() must be called before using any float code - * afterwards. + * naturally aligned. */ // #define AV_COPY(n, d, s) @@ -13891,8 +13853,8 @@ allocated with av_malloc() or another memory allocation function. */ /** * Load timecode string in buf. * - * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long * @param tc timecode data correctly initialized + * @param buf destination buffer, must be at least AV_TIMECODE_STR_SIZE long * @param framenum frame number * @return the buf parameter * @@ -13950,13 +13912,13 @@ allocated with av_malloc() or another memory allocation function. */ /** * Init a timecode struct with the passed parameters. * - * @param log_ctx a pointer to an arbitrary struct of which the first field - * is a pointer to an AVClass struct (used for av_log) * @param tc pointer to an allocated AVTimecode * @param rate frame rate in rational form * @param flags miscellaneous flags such as drop frame, +24 hours, ... * (see AVTimecodeFlag) * @param frame_start the first frame number + * @param log_ctx a pointer to an arbitrary struct of which the first field + * is a pointer to an AVClass struct (used for av_log) * @return 0 on success, AVERROR otherwise */ @NoException public static native int av_timecode_init(AVTimecode tc, @ByVal AVRational rate, int flags, int frame_start, Pointer log_ctx); @@ -13964,8 +13926,6 @@ allocated with av_malloc() or another memory allocation function. */ /** * Init a timecode struct from the passed timecode components. * - * @param log_ctx a pointer to an arbitrary struct of which the first field - * is a pointer to an AVClass struct (used for av_log) * @param tc pointer to an allocated AVTimecode * @param rate frame rate in rational form * @param flags miscellaneous flags such as drop frame, +24 hours, ... @@ -13974,6 +13934,8 @@ allocated with av_malloc() or another memory allocation function. */ * @param mm minutes * @param ss seconds * @param ff frames + * @param log_ctx a pointer to an arbitrary struct of which the first field + * is a pointer to an AVClass struct (used for av_log) * @return 0 on success, AVERROR otherwise */ @NoException public static native int av_timecode_init_from_components(AVTimecode tc, @ByVal AVRational rate, int flags, int hh, int mm, int ss, int ff, Pointer log_ctx); @@ -13981,11 +13943,11 @@ allocated with av_malloc() or another memory allocation function. */ /** * Parse timecode representation (hh:mm:ss[:;.]ff). * - * @param log_ctx a pointer to an arbitrary struct of which the first field is a - * pointer to an AVClass struct (used for av_log). * @param tc pointer to an allocated AVTimecode * @param rate frame rate in rational form * @param str timecode string which will determine the frame start + * @param log_ctx a pointer to an arbitrary struct of which the first field is a + * pointer to an AVClass struct (used for av_log). * @return 0 on success, AVERROR otherwise */ @NoException public static native int av_timecode_init_from_string(AVTimecode tc, @ByVal AVRational rate, @Cast("const char*") BytePointer str, Pointer log_ctx); @@ -14064,9 +14026,22 @@ allocated with av_malloc() or another memory allocation function. */ * @param tb the timebase of the timestamp * @return the buffer in input */ -@NoException public static native @Cast("char*") BytePointer av_ts_make_time_string(@Cast("char*") BytePointer buf, @Cast("int64_t") long ts, AVRational tb); -@NoException public static native @Cast("char*") ByteBuffer av_ts_make_time_string(@Cast("char*") ByteBuffer buf, @Cast("int64_t") long ts, AVRational tb); -@NoException public static native @Cast("char*") byte[] av_ts_make_time_string(@Cast("char*") byte[] buf, @Cast("int64_t") long ts, AVRational tb); +@NoException public static native @Cast("char*") BytePointer av_ts_make_time_string2(@Cast("char*") BytePointer buf, @Cast("int64_t") long ts, @ByVal AVRational tb); +@NoException public static native @Cast("char*") ByteBuffer av_ts_make_time_string2(@Cast("char*") ByteBuffer buf, @Cast("int64_t") long ts, @ByVal AVRational tb); +@NoException public static native @Cast("char*") byte[] av_ts_make_time_string2(@Cast("char*") byte[] buf, @Cast("int64_t") long ts, @ByVal AVRational tb); + +/** + * Fill the provided buffer with a string containing a timestamp + * representation. + * + * @see av_ts_make_time_string2 + */ +@NoException public static native @Cast("char*") BytePointer av_ts_make_time_string(@Cast("char*") BytePointer buf, @Cast("int64_t") long ts, + @Const AVRational tb); +@NoException public static native @Cast("char*") ByteBuffer av_ts_make_time_string(@Cast("char*") ByteBuffer buf, @Cast("int64_t") long ts, + @Const AVRational tb); +@NoException public static native @Cast("char*") byte[] av_ts_make_time_string(@Cast("char*") byte[] buf, @Cast("int64_t") long ts, + @Const AVRational tb); /** * Convenience macro, the return value should be used only directly in @@ -14478,8 +14453,8 @@ allocated with av_malloc() or another memory allocation function. */ * \{ */ -public static final int LIBAVUTIL_VERSION_MAJOR = 58; -public static final int LIBAVUTIL_VERSION_MINOR = 29; +public static final int LIBAVUTIL_VERSION_MAJOR = 59; +public static final int LIBAVUTIL_VERSION_MINOR = 8; public static final int LIBAVUTIL_VERSION_MICRO = 100; public static native @MemberGetter int LIBAVUTIL_VERSION_INT(); @@ -14505,20 +14480,13 @@ allocated with av_malloc() or another memory allocation function. */ * \{ */ -public static final boolean FF_API_FIFO_PEEK2 = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_FIFO_OLD_API = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_XVMC = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_OLD_CHANNEL_LAYOUT = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_AV_FOPEN_UTF8 = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_PKT_DURATION = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_REORDERED_OPAQUE = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_FRAME_PICTURE_NUMBER = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_HDR_VIVID_THREE_SPLINE = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_FRAME_PKT = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_INTERLACED_FRAME = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_FRAME_KEY = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_PALETTE_HAS_CHANGED = (LIBAVUTIL_VERSION_MAJOR < 59); -public static final boolean FF_API_VULKAN_CONTIGUOUS_MEMORY = (LIBAVUTIL_VERSION_MAJOR < 59); +public static final boolean FF_API_HDR_VIVID_THREE_SPLINE = (LIBAVUTIL_VERSION_MAJOR < 60); +public static final boolean FF_API_FRAME_PKT = (LIBAVUTIL_VERSION_MAJOR < 60); +public static final boolean FF_API_INTERLACED_FRAME = (LIBAVUTIL_VERSION_MAJOR < 60); +public static final boolean FF_API_FRAME_KEY = (LIBAVUTIL_VERSION_MAJOR < 60); +public static final boolean FF_API_PALETTE_HAS_CHANGED = (LIBAVUTIL_VERSION_MAJOR < 60); +public static final boolean FF_API_VULKAN_CONTIGUOUS_MEMORY = (LIBAVUTIL_VERSION_MAJOR < 60); +public static final boolean FF_API_H274_FILM_GRAIN_VCS = (LIBAVUTIL_VERSION_MAJOR < 60); /** * \} diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/postproc.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/postproc.java index 8297a2cbfdd..86aa7b289d5 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/postproc.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/postproc.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -178,7 +178,7 @@ public class postproc extends org.bytedeco.ffmpeg.presets.postproc { * Libpostproc version macros */ -public static final int LIBPOSTPROC_VERSION_MAJOR = 57; +public static final int LIBPOSTPROC_VERSION_MAJOR = 58; // #endif /* POSTPROC_VERSION_MAJOR_H */ @@ -217,7 +217,7 @@ public class postproc extends org.bytedeco.ffmpeg.presets.postproc { // #include "version_major.h" -public static final int LIBPOSTPROC_VERSION_MINOR = 3; +public static final int LIBPOSTPROC_VERSION_MINOR = 1; public static final int LIBPOSTPROC_VERSION_MICRO = 100; // #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swresample.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swresample.java index efdabb9ac28..49d2f1652f9 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swresample.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swresample.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -253,34 +253,6 @@ public class swresample extends org.bytedeco.ffmpeg.presets.swresample { */ @NoException public static native int swr_is_initialized(SwrContext s); -// #if FF_API_OLD_CHANNEL_LAYOUT -/** - * Allocate SwrContext if needed and set/reset common parameters. - * - * This function does not require s to be allocated with swr_alloc(). On the - * other hand, swr_alloc() can use swr_alloc_set_opts() to set the parameters - * on the allocated context. - * - * @param s existing Swr context if available, or NULL if not - * @param out_ch_layout output channel layout (AV_CH_LAYOUT_*) - * @param out_sample_fmt output sample format (AV_SAMPLE_FMT_*). - * @param out_sample_rate output sample rate (frequency in Hz) - * @param in_ch_layout input channel layout (AV_CH_LAYOUT_*) - * @param in_sample_fmt input sample format (AV_SAMPLE_FMT_*). - * @param in_sample_rate input sample rate (frequency in Hz) - * @param log_offset logging level offset - * @param log_ctx parent logging context, can be NULL - * - * @see swr_init(), swr_free() - * @return NULL on error, allocated context otherwise - * @deprecated use \ref swr_alloc_set_opts2() - */ -@NoException public static native @Deprecated SwrContext swr_alloc_set_opts(SwrContext s, - @Cast("int64_t") long out_ch_layout, @Cast("AVSampleFormat") int out_sample_fmt, int out_sample_rate, - @Cast("int64_t") long in_ch_layout, @Cast("AVSampleFormat") int in_sample_fmt, int in_sample_rate, - int log_offset, Pointer log_ctx); -// #endif - /** * Allocate SwrContext if needed and set/reset common parameters. * @@ -363,14 +335,14 @@ public class swresample extends org.bytedeco.ffmpeg.presets.swresample { * * @return number of samples output per channel, negative value on error */ -@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t**") PointerPointer out, int out_count, - @Cast("const uint8_t**") PointerPointer in, int in_count); -@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t**") @ByPtrPtr BytePointer out, int out_count, - @Cast("const uint8_t**") @ByPtrPtr BytePointer in, int in_count); -@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t**") @ByPtrPtr ByteBuffer out, int out_count, - @Cast("const uint8_t**") @ByPtrPtr ByteBuffer in, int in_count); -@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t**") @ByPtrPtr byte[] out, int out_count, - @Cast("const uint8_t**") @ByPtrPtr byte[] in, int in_count); +@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t*const*") PointerPointer out, int out_count, + @Cast("const uint8_t*const*") PointerPointer in, int in_count); +@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t*const*") @ByPtrPtr BytePointer out, int out_count, + @Cast("const uint8_t*const*") @ByPtrPtr BytePointer in, int in_count); +@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t*const*") @ByPtrPtr ByteBuffer out, int out_count, + @Cast("const uint8_t*const*") @ByPtrPtr ByteBuffer in, int in_count); +@NoException public static native int swr_convert(SwrContext s, @Cast("uint8_t*const*") @ByPtrPtr byte[] out, int out_count, + @Cast("const uint8_t*const*") @ByPtrPtr byte[] in, int in_count); /** * Convert the next timestamp from input to output @@ -430,51 +402,6 @@ public class swresample extends org.bytedeco.ffmpeg.presets.swresample { @NoException public static native int swr_set_channel_mapping(SwrContext s, @Const IntBuffer channel_map); @NoException public static native int swr_set_channel_mapping(SwrContext s, @Const int[] channel_map); -// #if FF_API_OLD_CHANNEL_LAYOUT -/** - * Generate a channel mixing matrix. - * - * This function is the one used internally by libswresample for building the - * default mixing matrix. It is made public just as a utility function for - * building custom matrices. - * - * @param in_layout input channel layout - * @param out_layout output channel layout - * @param center_mix_level mix level for the center channel - * @param surround_mix_level mix level for the surround channel(s) - * @param lfe_mix_level mix level for the low-frequency effects channel - * @param rematrix_maxval if 1.0, coefficients will be normalized to prevent - * overflow. if INT_MAX, coefficients will not be - * normalized. - * @param matrix [out] mixing coefficients; matrix[i + stride * o] is - * the weight of input channel i in output channel o. - * @param stride distance between adjacent input channels in the - * matrix array - * @param matrix_encoding matrixed stereo downmix mode (e.g. dplii) - * @param log_ctx parent logging context, can be NULL - * @return 0 on success, negative AVERROR code on failure - * @deprecated use \ref swr_build_matrix2() - */ -@NoException public static native @Deprecated int swr_build_matrix(@Cast("uint64_t") long in_layout, @Cast("uint64_t") long out_layout, - double center_mix_level, double surround_mix_level, - double lfe_mix_level, double rematrix_maxval, - double rematrix_volume, DoublePointer matrix, - int stride, @Cast("AVMatrixEncoding") int matrix_encoding, - Pointer log_ctx); -@NoException public static native @Deprecated int swr_build_matrix(@Cast("uint64_t") long in_layout, @Cast("uint64_t") long out_layout, - double center_mix_level, double surround_mix_level, - double lfe_mix_level, double rematrix_maxval, - double rematrix_volume, DoubleBuffer matrix, - int stride, @Cast("AVMatrixEncoding") int matrix_encoding, - Pointer log_ctx); -@NoException public static native @Deprecated int swr_build_matrix(@Cast("uint64_t") long in_layout, @Cast("uint64_t") long out_layout, - double center_mix_level, double surround_mix_level, - double lfe_mix_level, double rematrix_maxval, - double rematrix_volume, double[] matrix, - int stride, @Cast("AVMatrixEncoding") int matrix_encoding, - Pointer log_ctx); -// #endif - /** * Generate a channel mixing matrix. * @@ -736,7 +663,7 @@ public class swresample extends org.bytedeco.ffmpeg.presets.swresample { * Libswresample version macros */ -public static final int LIBSWRESAMPLE_VERSION_MAJOR = 4; +public static final int LIBSWRESAMPLE_VERSION_MAJOR = 5; // #endif /* SWRESAMPLE_VERSION_MAJOR_H */ @@ -775,7 +702,7 @@ public class swresample extends org.bytedeco.ffmpeg.presets.swresample { // #include "version_major.h" -public static final int LIBSWRESAMPLE_VERSION_MINOR = 12; +public static final int LIBSWRESAMPLE_VERSION_MINOR = 1; public static final int LIBSWRESAMPLE_VERSION_MICRO = 100; public static native @MemberGetter int LIBSWRESAMPLE_VERSION_INT(); diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swscale.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swscale.java index dc9021ea04a..fc6a932619e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swscale.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/global/swscale.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.global; @@ -520,7 +520,7 @@ public class swscale extends org.bytedeco.ffmpeg.presets.swscale { * swscale version macros */ -public static final int LIBSWSCALE_VERSION_MAJOR = 7; +public static final int LIBSWSCALE_VERSION_MAJOR = 8; /** * FF_API_* defines may be placed below to indicate public API that will be @@ -563,7 +563,7 @@ public class swscale extends org.bytedeco.ffmpeg.presets.swscale { // #include "version_major.h" -public static final int LIBSWSCALE_VERSION_MINOR = 5; +public static final int LIBSWSCALE_VERSION_MINOR = 1; public static final int LIBSWSCALE_VERSION_MICRO = 100; public static native @MemberGetter int LIBSWSCALE_VERSION_INT(); diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_context.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_context.java index dfaa0521a7d..4189d167885 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_context.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_context.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.postproc; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_mode.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_mode.java index 165acfff410..3e28ad68b7e 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_mode.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/postproc/pp_mode.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.postproc; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swresample/SwrContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swresample/SwrContext.java index b866b24d8a0..f30fb8f18f9 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swresample/SwrContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swresample/SwrContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.swresample; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsContext.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsContext.java index e96e6bc7787..d7f15140105 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsContext.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsContext.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.swscale; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsFilter.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsFilter.java index 726bd595bc2..bfb107d3e02 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsFilter.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsFilter.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.swscale; diff --git a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsVector.java b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsVector.java index e9b2e4fc83b..c9a33222707 100644 --- a/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsVector.java +++ b/ffmpeg/src/gen/java/org/bytedeco/ffmpeg/swscale/SwsVector.java @@ -1,4 +1,4 @@ -// Targeted by JavaCPP version 1.5.10: DO NOT EDIT THIS FILE +// Targeted by JavaCPP version 1.5.11-SNAPSHOT: DO NOT EDIT THIS FILE package org.bytedeco.ffmpeg.swscale; diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avcodec.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avcodec.java index 5c9b6e65ec8..753f22e0d9c 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avcodec.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avcodec.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -39,9 +39,9 @@ value = { @Platform(cinclude = {"", "", "", "", "", "", "", "", "", "", "", ""}, - link = "avcodec@.60"), + link = "avcodec@.61"), @Platform(value = "linux-arm", preload = {"asound@.2", "vchiq_arm", "vcos", "vcsm", "bcm_host", "mmal_core", "mmal_util", "mmal_vc_client"}), - @Platform(value = "windows", preload = "avcodec-60") + @Platform(value = "windows", preload = "avcodec-61") } ) public class avcodec implements InfoMapper { @@ -55,7 +55,8 @@ public void map(InfoMap infoMap) { "FF_API_MPEGVIDEO_OPTS", "FF_API_FLAG_TRUNCATED", "FF_API_SUB_TEXT_FORMAT", "FF_API_IDCT_NONE", "FF_API_SVTAV1_OPTS", "FF_API_AYUV_CODECID", "FF_API_VT_OUTPUT_CALLBACK", "FF_API_AVCODEC_CHROMA_POS", "FF_API_VT_HWACCEL_CONTEXT", "FF_API_AVCTX_FRAME_NUMBER", "FF_CODEC_CRYSTAL_HD", "FF_API_SLICE_OFFSET", "FF_API_SUBFRAMES", "FF_API_TICKS_PER_FRAME", - "FF_API_DROPCHANGED", "FF_API_AVFFT", "FF_API_FF_PROFILE_LEVEL").define().translate().cppTypes("bool")) + "FF_API_DROPCHANGED", "FF_API_AVFFT", "FF_API_FF_PROFILE_LEVEL", "FF_API_AVCODEC_CLOSE", "FF_API_BUFFER_MIN_SIZE", + "FF_API_VDPAU_ALLOC_GET_SET").define().translate().cppTypes("bool")) .put(new Info("AVCodecInternal", "AVCodecHWConfigInternal").cast().pointerTypes("Pointer")) .put(new Info("AVCodec::hw_configs", "av_mdct_init", "av_imdct_calc", "av_imdct_half", "av_mdct_calc", "av_mdct_end").skip()) .putFirst(new Info("AVPanScan").pointerTypes("AVPanScan")) diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avdevice.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avdevice.java index c7ed9c73e77..fa3675bd859 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avdevice.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avdevice.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -37,8 +37,8 @@ target = "org.bytedeco.ffmpeg.avdevice", global = "org.bytedeco.ffmpeg.global.avdevice", value = { - @Platform(cinclude = {"", "", ""}, link = "avdevice@.60"), - @Platform(value = "windows", preload = "avdevice-60") + @Platform(cinclude = {"", "", ""}, link = "avdevice@.61"), + @Platform(value = "windows", preload = "avdevice-61") } ) public class avdevice implements InfoMapper { @@ -47,7 +47,7 @@ public void map(InfoMap infoMap) { .putFirst(new Info("AVDeviceCapabilitiesQuery").pointerTypes("AVDeviceCapabilitiesQuery")) .put(new Info("LIBAVDEVICE_VERSION").cppTypes()) .put(new Info("LIBAVDEVICE_VERSION_INT", "LIBAVDEVICE_IDENT").translate(false)) - .put(new Info("FF_API_DEVICE_CAPABILITIES").define().translate().cppTypes("bool")) + .put(new Info("FF_API_DEVICE_CAPABILITIES", "FF_API_BKTR_DEVICE", "FF_API_OPENGL_DEVICE", "FF_API_SDL2_DEVICE").define().translate().cppTypes("bool")) .put(new Info("av_device_capabilities").skip()); } } diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avfilter.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avfilter.java index ccc0dd8307a..87ff8806674 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avfilter.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avfilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -37,8 +37,8 @@ target = "org.bytedeco.ffmpeg.avfilter", global = "org.bytedeco.ffmpeg.global.avfilter", value = { - @Platform(cinclude = {"", "", "", "", ""}, link = "avfilter@.9"), - @Platform(value = "windows", preload = "avfilter-9") + @Platform(cinclude = {"", "", "", "", ""}, link = "avfilter@.10"), + @Platform(value = "windows", preload = "avfilter-10") } ) public class avfilter implements InfoMapper { @@ -46,7 +46,8 @@ public void map(InfoMap infoMap) { infoMap.put(new Info("AVFilterPool", "AVFilterCommand", "AVFilterChannelLayouts", "FFFrameQueue").cast().pointerTypes("Pointer")) .put(new Info("LIBAVFILTER_VERSION").cppTypes()) .put(new Info("LIBAVFILTER_VERSION_INT", "LIBAVFILTER_IDENT").translate(false)) - .put(new Info("FF_API_SWS_PARAM_OPTION", "FF_API_BUFFERSINK_ALLOC", "FF_API_PAD_COUNT", "FF_API_LIBPLACEBO_OPTS").define().translate().cppTypes("bool")) + .put(new Info("FF_API_SWS_PARAM_OPTION", "FF_API_BUFFERSINK_ALLOC", "FF_API_PAD_COUNT", "FF_API_LIBPLACEBO_OPTS", + "FF_API_LINK_PUBLIC").define().translate().cppTypes("bool")) .put(new Info("AV_HAVE_INCOMPATIBLE_LIBAV_ABI || !FF_API_OLD_GRAPH_PARSE").define(true)) .put(new Info("!FF_API_FOO_COUNT", "FF_INTERNAL_FIELDS").define(false)); } diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avformat.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avformat.java index 70956dea605..ff89413614a 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avformat.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avformat.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -37,8 +37,8 @@ target = "org.bytedeco.ffmpeg.avformat", global = "org.bytedeco.ffmpeg.global.avformat", value = { - @Platform(cinclude = {"", "", "", ""}, link = "avformat@.60"), - @Platform(value = "windows", preload = "avformat-60") + @Platform(cinclude = {"", "", "", ""}, link = "avformat@.61"), + @Platform(value = "windows", preload = "avformat-61") } ) public class avformat implements InfoMapper { @@ -49,7 +49,7 @@ public void map(InfoMap infoMap) { .put(new Info("FF_API_LAVF_PRIV_OPT", "FF_API_COMPUTE_PKT_FIELDS2", "FF_API_AVIOCONTEXT_WRITTEN", "FF_HLS_TS_OPTIONS", "FF_HTTP_CACHE_REDIRECT_DEFAULT", "FF_API_GET_END_PTS", "FF_API_AVIODIRCONTEXT", "FF_API_AVFORMAT_IO_CLOSE", "FF_API_AVIO_WRITE_NONCONST", "FF_API_LAVF_SHORTEST", "FF_API_ALLOW_FLUSH", - "FF_API_AVSTREAM_SIDE_DATA").define().translate().cppTypes("bool")) + "FF_API_AVSTREAM_SIDE_DATA", "FF_API_GET_DUR_ESTIMATE_METHOD").define().translate().cppTypes("bool")) .put(new Info("LIBAVFORMAT_VERSION_MAJOR <= 54", "FF_API_ALLOC_OUTPUT_CONTEXT", "FF_API_FORMAT_PARAMETERS", "FF_API_READ_PACKET", "FF_API_CLOSE_INPUT_FILE", "FF_API_NEW_STREAM", "FF_API_SET_PTS_INFO", "FF_API_AVSTREAM_CLASS").define(false).translate().cppTypes("bool")); diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java index 7fe7a45478d..e64b279fa5b 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -62,10 +62,10 @@ "", "", "", "", "", "", "", "", "log_callback.h"}, includepath = {"/usr/local/include/ffmpeg/", "/opt/local/include/ffmpeg/", "/usr/include/ffmpeg/"}, - link = "avutil@.58", compiler = {"default", "nodeprecated"}), + link = "avutil@.59", compiler = {"default", "nodeprecated"}), @Platform(value = "linux-x86", preload = {"va@.1", "drm@.2", "va-drm@.1"}, preloadpath = {"/usr/lib32/", "/usr/lib/"}), @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}), - @Platform(value = "windows", includepath = {"C:/MinGW/local/include/ffmpeg/", "C:/MinGW/include/ffmpeg/"}, preload = "avutil-58"), + @Platform(value = "windows", includepath = {"C:/MinGW/local/include/ffmpeg/", "C:/MinGW/include/ffmpeg/"}, preload = "avutil-59"), @Platform(extension = "-gpl") } ) @@ -84,7 +84,8 @@ public void map(InfoMap infoMap) { .put(new Info("FF_API_D2STR", "FF_API_DECLARE_ALIGNED", "FF_API_COLORSPACE_NAME", "FF_API_AV_MALLOCZ_ARRAY", "FF_API_FIFO_PEEK2", "FF_API_FIFO_OLD_API", "FF_API_XVMC", "FF_API_OLD_CHANNEL_LAYOUT", "FF_API_AV_FOPEN_UTF8", "FF_API_PKT_DURATION", "FF_API_REORDERED_OPAQUE", "FF_API_FRAME_PICTURE_NUMBER", "FF_API_HDR_VIVID_THREE_SPLINE", "FF_API_FRAME_PKT", - "FF_API_INTERLACED_FRAME", "FF_API_FRAME_KEY", "FF_API_PALETTE_HAS_CHANGED", "FF_API_VULKAN_CONTIGUOUS_MEMORY").define().translate().cppTypes("bool")) + "FF_API_INTERLACED_FRAME", "FF_API_FRAME_KEY", "FF_API_PALETTE_HAS_CHANGED", "FF_API_VULKAN_CONTIGUOUS_MEMORY", + "FF_API_H274_FILM_GRAIN_VCS").define().translate().cppTypes("bool")) .put(new Info("av_const").annotations("@Const")) .put(new Info("FF_CONST_AVUTIL55").annotations()) .put(new Info("av_malloc_attrib", "av_alloc_size", "av_always_inline", "av_warn_unused_result", "av_alias").cppTypes().annotations()) @@ -199,6 +200,8 @@ public void map(InfoMap infoMap) { "AV_CHANNEL_LAYOUT_5POINT1POINT4_BACK", "AV_CHANNEL_LAYOUT_7POINT1POINT2", "AV_CHANNEL_LAYOUT_7POINT1POINT4_BACK", + "AV_CHANNEL_LAYOUT_7POINT2POINT3", + "AV_CHANNEL_LAYOUT_9POINT1POINT4_BACK", "AV_CHANNEL_LAYOUT_HEXADECAGONAL", "AV_CHANNEL_LAYOUT_STEREO_DOWNMIX", "AV_CHANNEL_LAYOUT_22POINT2", diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java index cf9cecb576d..87906b50f36 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/postproc.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -38,8 +38,8 @@ global = "org.bytedeco.ffmpeg.global.postproc", value = { // GPL only - @Platform(cinclude = {"", "", ""}, link = "postproc@.57", extension = "-gpl"), - @Platform(value = "windows", preload = "postproc-57", extension = "-gpl") + @Platform(cinclude = {"", "", ""}, link = "postproc@.58", extension = "-gpl"), + @Platform(value = "windows", preload = "postproc-58", extension = "-gpl") } ) public class postproc implements InfoMapper { diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swresample.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swresample.java index 82c72cbd357..417d25814f1 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swresample.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swresample.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2022 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -37,8 +37,8 @@ target = "org.bytedeco.ffmpeg.swresample", global = "org.bytedeco.ffmpeg.global.swresample", value = { - @Platform(cinclude = {"", "", ""}, link = "swresample@.4"), - @Platform(value = "windows", preload = "swresample-4") + @Platform(cinclude = {"", "", ""}, link = "swresample@.5"), + @Platform(value = "windows", preload = "swresample-5") } ) public class swresample implements InfoMapper { diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swscale.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swscale.java index 0fcb09eaf4b..d45b3214af8 100644 --- a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swscale.java +++ b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/swscale.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2023 Samuel Audet + * Copyright (C) 2013-2024 Samuel Audet * * Licensed either under the Apache License, Version 2.0, or (at your option) * under the terms of the GNU General Public License as published by @@ -37,8 +37,8 @@ target = "org.bytedeco.ffmpeg.swscale", global = "org.bytedeco.ffmpeg.global.swscale", value = { - @Platform(cinclude = {"", "", ""}, link = "swscale@.7"), - @Platform(value = "windows", preload = "swscale-7") + @Platform(cinclude = {"", "", ""}, link = "swscale@.8"), + @Platform(value = "windows", preload = "swscale-8") } ) public class swscale implements InfoMapper { diff --git a/platform/pom.xml b/platform/pom.xml index 9b8aacd378a..bdff66b2111 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -92,7 +92,7 @@ org.bytedeco ffmpeg-platform - 6.1.1-${project.version} + 7.0-${project.version}