diff --git a/JavaAV/pom.xml b/JavaAV/pom.xml index c8d519e..6ed1d91 100644 --- a/JavaAV/pom.xml +++ b/JavaAV/pom.xml @@ -78,58 +78,16 @@ - - - JavaCV - http://maven2.javacv.googlecode.com/git/ - - - - com.googlecode.javacv + org.bytedeco javacv - 0.6 - - - org.apache.logging.log4j - log4j-api - 2.0-beta9 - - - org.apache.logging.log4j - log4j-core - 2.0-beta9 - - - com.github.hoary.ffmpeg - FFmpeg-android-arm - 2.0.1.1 - - - com.github.hoary.ffmpeg - FFmpeg-linux-x86 - 2.0.1.1 - - - com.github.hoary.ffmpeg - FFmpeg-linux-x86_64 - 2.0.1.1 - - - com.github.hoary.ffmpeg - FFmpeg-macosx-x86_64 - 2.0.1.1 - - - com.github.hoary.ffmpeg - FFmpeg-windows-x86 - 2.0.1.1 + 0.8 - com.github.hoary.ffmpeg - FFmpeg-windows-x86_64 - 2.0.1.1 + org.slf4j + slf4j-api + 1.7.7 junit diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Audio.java b/JavaAV/src/main/java/com/github/hoary/javaav/Audio.java index 162e8dd..09e3c1a 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Audio.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Audio.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.BytePointer; +import org.bytedeco.javacpp.BytePointer; import java.nio.ByteBuffer; diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/AudioFrame.java b/JavaAV/src/main/java/com/github/hoary/javaav/AudioFrame.java index 5e88079..75e47a6 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/AudioFrame.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/AudioFrame.java @@ -21,10 +21,13 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.BytePointer; -import com.googlecode.javacpp.PointerPointer; +import org.bytedeco.javacpp.BytePointer; +import org.bytedeco.javacpp.PointerPointer; -import static com.googlecode.javacv.cpp.avutil.*; +import static org.bytedeco.javacpp.avutil.av_free; +import static org.bytedeco.javacpp.avutil.av_get_bytes_per_sample; +import static org.bytedeco.javacpp.avutil.av_malloc; +import static org.bytedeco.javacpp.avutil.av_sample_fmt_is_planar; /** * An {@code AudioFrame} contains audio samples with a specific {@code AudioFormat} diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/AudioResampler.java b/JavaAV/src/main/java/com/github/hoary/javaav/AudioResampler.java index 3b28634..8d745d0 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/AudioResampler.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/AudioResampler.java @@ -21,16 +21,25 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.PointerPointer; -import com.googlecode.javacv.cpp.swresample.*; +import org.bytedeco.javacpp.PointerPointer; +import org.bytedeco.javacpp.swresample.SwrContext; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import static com.googlecode.javacv.cpp.avutil.*; -import static com.googlecode.javacv.cpp.swresample.*; +import static org.bytedeco.javacpp.avutil.AV_ROUND_DOWN; +import static org.bytedeco.javacpp.avutil.AV_SAMPLE_FMT_NONE; +import static org.bytedeco.javacpp.avutil.av_get_bytes_per_sample; +import static org.bytedeco.javacpp.avutil.av_get_channel_layout_nb_channels; +import static org.bytedeco.javacpp.avutil.av_opt_set_int; +import static org.bytedeco.javacpp.avutil.av_rescale_rnd; +import static org.bytedeco.javacpp.avutil.av_sample_fmt_is_planar; +import static org.bytedeco.javacpp.swresample.swr_alloc; +import static org.bytedeco.javacpp.swresample.swr_convert; +import static org.bytedeco.javacpp.swresample.swr_free; +import static org.bytedeco.javacpp.swresample.swr_init; /** * The AudioResampler converts audio samples from one audio format to another. diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/CameraCapabilities.java b/JavaAV/src/main/java/com/github/hoary/javaav/CameraCapabilities.java index eff34d2..b395e04 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/CameraCapabilities.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/CameraCapabilities.java @@ -21,15 +21,21 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.Pointer; +import org.bytedeco.javacpp.Pointer; import java.util.Iterator; import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static com.googlecode.javacv.cpp.avformat.*; -import static com.googlecode.javacv.cpp.avutil.*; +import static org.bytedeco.javacpp.avformat.AVFormatContext; +import static org.bytedeco.javacpp.avformat.AVInputFormat; +import static org.bytedeco.javacpp.avformat.av_find_input_format; +import static org.bytedeco.javacpp.avformat.avformat_close_input; +import static org.bytedeco.javacpp.avformat.avformat_open_input; +import static org.bytedeco.javacpp.avutil.AVDictionary; +import static org.bytedeco.javacpp.avutil.av_dict_set; +import static org.bytedeco.javacpp.avutil.av_log_format_line; /** * Convenience class to get video input device capabilities. diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/ChannelLayout.java b/JavaAV/src/main/java/com/github/hoary/javaav/ChannelLayout.java index 559c4eb..efc1099 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/ChannelLayout.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/ChannelLayout.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avutil; +import org.bytedeco.javacpp.avutil; /** * Enumeration of all supported channel layouts. A {@code ChannelLayout} can be diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Codec.java b/JavaAV/src/main/java/com/github/hoary/javaav/Codec.java index 44cb87b..6a6e9eb 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Codec.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Codec.java @@ -21,16 +21,29 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.IntPointer; -import com.googlecode.javacpp.LongPointer; -import com.googlecode.javacv.cpp.avcodec.*; -import com.googlecode.javacv.cpp.avutil.AVDictionary; - -import java.util.*; - -import static com.googlecode.javacv.cpp.avcodec.*; -import static com.googlecode.javacv.cpp.avutil.AVRational; -import static com.googlecode.javacv.cpp.avutil.av_q2d; +import org.bytedeco.javacpp.IntPointer; +import org.bytedeco.javacpp.LongPointer; +import org.bytedeco.javacpp.avcodec.AVCodec; +import org.bytedeco.javacpp.avcodec.AVCodecContext; +import org.bytedeco.javacpp.avutil.AVDictionary; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; + +import static org.bytedeco.javacpp.avcodec.av_codec_is_decoder; +import static org.bytedeco.javacpp.avcodec.av_codec_is_encoder; +import static org.bytedeco.javacpp.avcodec.av_codec_next; +import static org.bytedeco.javacpp.avcodec.avcodec_alloc_context3; +import static org.bytedeco.javacpp.avcodec.avcodec_find_decoder; +import static org.bytedeco.javacpp.avcodec.avcodec_find_decoder_by_name; +import static org.bytedeco.javacpp.avcodec.avcodec_find_encoder; +import static org.bytedeco.javacpp.avcodec.avcodec_find_encoder_by_name; +import static org.bytedeco.javacpp.avcodec.avcodec_open2; +import static org.bytedeco.javacpp.avutil.AVRational; +import static org.bytedeco.javacpp.avutil.av_q2d; /** * {@code Codecs} are usually used by encoders and decoders. To create a {@code Codec} use diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/CodecCapability.java b/JavaAV/src/main/java/com/github/hoary/javaav/CodecCapability.java index 5b9ac30..1737b5e 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/CodecCapability.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/CodecCapability.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avcodec; +import org.bytedeco.javacpp.avcodec; /** * Enumeration of all possible codec capabilities. diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/CodecFlag.java b/JavaAV/src/main/java/com/github/hoary/javaav/CodecFlag.java index 7fdc964..3bb14f3 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/CodecFlag.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/CodecFlag.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avcodec; +import org.bytedeco.javacpp.avcodec; /** * Enumeration of all possible codec flags. diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/CodecID.java b/JavaAV/src/main/java/com/github/hoary/javaav/CodecID.java index 2f5a5af..75d9986 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/CodecID.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/CodecID.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avcodec; +import org.bytedeco.javacpp.avcodec; /** * Enumeration of all possible codec id's. diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Coder.java b/JavaAV/src/main/java/com/github/hoary/javaav/Coder.java index 3cc080b..4874d71 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Coder.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Coder.java @@ -21,17 +21,31 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avcodec; -import com.googlecode.javacv.cpp.avcodec.*; -import com.googlecode.javacv.cpp.avutil.*; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.bytedeco.javacpp.avcodec; +import org.bytedeco.javacpp.avcodec.AVCodecContext; +import org.bytedeco.javacpp.avcodec.AVPacket; +import org.bytedeco.javacpp.avutil.AVDictionary; +import org.bytedeco.javacpp.avutil.AVFrame; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; import java.util.Map.Entry; -import static com.googlecode.javacv.cpp.avcodec.*; -import static com.googlecode.javacv.cpp.avutil.*; +import static org.bytedeco.javacpp.avcodec.avcodec_alloc_context3; +import static org.bytedeco.javacpp.avcodec.avcodec_alloc_frame; +import static org.bytedeco.javacpp.avcodec.avcodec_close; +import static org.bytedeco.javacpp.avcodec.avcodec_flush_buffers; +import static org.bytedeco.javacpp.avcodec.avcodec_free_frame; +import static org.bytedeco.javacpp.avutil.FF_QP2LAMBDA; +import static org.bytedeco.javacpp.avutil.av_d2q; +import static org.bytedeco.javacpp.avutil.av_dict_free; +import static org.bytedeco.javacpp.avutil.av_dict_set; +import static org.bytedeco.javacpp.avutil.av_free; +import static org.bytedeco.javacpp.avutil.av_get_bytes_per_sample; +import static org.bytedeco.javacpp.avutil.av_get_default_channel_layout; +import static org.bytedeco.javacpp.avutil.av_inv_q; +import static org.bytedeco.javacpp.avutil.av_q2d; /** * {@code Coder} is an abstract representation of an encoder or decoder. This class @@ -43,7 +57,7 @@ public abstract class Coder extends Configurable { /** The logger. */ - private final static Logger logger = LogManager.getLogger(Coder.class.getName()); + private final static Logger logger = LoggerFactory.getLogger(Coder.class.getName()); /** Coder state indicates whether the {@code Coder} is opened or closed. */ public enum State { diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Decoder.java b/JavaAV/src/main/java/com/github/hoary/javaav/Decoder.java index 7a2aea9..0728cbb 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Decoder.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Decoder.java @@ -21,14 +21,25 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.BytePointer; -import com.googlecode.javacv.cpp.avutil.*; +import org.bytedeco.javacpp.BytePointer; +import org.bytedeco.javacpp.avutil.AVRational; import java.nio.ByteBuffer; import java.util.Map; -import static com.googlecode.javacv.cpp.avcodec.*; -import static com.googlecode.javacv.cpp.avutil.*; +import static org.bytedeco.javacpp.avcodec.AVCodecContext; +import static org.bytedeco.javacpp.avcodec.AVPacket; +import static org.bytedeco.javacpp.avcodec.AVPicture; +import static org.bytedeco.javacpp.avcodec.av_copy_packet; +import static org.bytedeco.javacpp.avcodec.av_free_packet; +import static org.bytedeco.javacpp.avcodec.avcodec_decode_audio4; +import static org.bytedeco.javacpp.avcodec.avcodec_decode_video2; +import static org.bytedeco.javacpp.avcodec.avcodec_get_frame_defaults; +import static org.bytedeco.javacpp.avcodec.avpicture_alloc; +import static org.bytedeco.javacpp.avcodec.avpicture_free; +import static org.bytedeco.javacpp.avutil.av_frame_get_best_effort_timestamp; +import static org.bytedeco.javacpp.avutil.av_sample_fmt_is_planar; +import static org.bytedeco.javacpp.avutil.av_samples_get_buffer_size; /** * Media decoder that currently supports audio and video decoding. A {@code Decoder} @@ -335,5 +346,5 @@ private void createImageBuffer() throws JavaAVException { if (avpicture_alloc(picture, format, width, height) < 0) throw new JavaAVException("Could not allocate picture."); } - + } diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Demuxer.java b/JavaAV/src/main/java/com/github/hoary/javaav/Demuxer.java index 68da44d..f9747cc 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Demuxer.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Demuxer.java @@ -24,9 +24,24 @@ import java.util.HashMap; import java.util.Map; -import static com.googlecode.javacv.cpp.avcodec.*; -import static com.googlecode.javacv.cpp.avformat.*; -import static com.googlecode.javacv.cpp.avutil.*; +import static org.bytedeco.javacpp.avcodec.AVCodecContext; +import static org.bytedeco.javacpp.avcodec.AVPacket; +import static org.bytedeco.javacpp.avcodec.av_free_packet; +import static org.bytedeco.javacpp.avformat.AVFormatContext; +import static org.bytedeco.javacpp.avformat.AVInputFormat; +import static org.bytedeco.javacpp.avformat.AVStream; +import static org.bytedeco.javacpp.avformat.av_find_input_format; +import static org.bytedeco.javacpp.avformat.av_read_frame; +import static org.bytedeco.javacpp.avformat.avformat_close_input; +import static org.bytedeco.javacpp.avformat.avformat_find_stream_info; +import static org.bytedeco.javacpp.avformat.avformat_open_input; +import static org.bytedeco.javacpp.avutil.AVDictionary; +import static org.bytedeco.javacpp.avutil.AVMEDIA_TYPE_AUDIO; +import static org.bytedeco.javacpp.avutil.AVMEDIA_TYPE_VIDEO; +import static org.bytedeco.javacpp.avutil.AVRational; +import static org.bytedeco.javacpp.avutil.av_d2q; +import static org.bytedeco.javacpp.avutil.av_dict_free; +import static org.bytedeco.javacpp.avutil.av_dict_set; /** * {@code Demuxer} is used to read single media streams from an input source. Media diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Encoder.java b/JavaAV/src/main/java/com/github/hoary/javaav/Encoder.java index f78224f..426513b 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Encoder.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Encoder.java @@ -21,10 +21,9 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.BytePointer; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.bytedeco.javacpp.BytePointer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -32,12 +31,38 @@ import java.util.List; import java.util.Map; -import static com.googlecode.javacv.cpp.avcodec.*; -import static com.googlecode.javacv.cpp.avutil.*; +import static org.bytedeco.javacpp.avcodec.AVCodecContext; +import static org.bytedeco.javacpp.avcodec.AVPacket; +import static org.bytedeco.javacpp.avcodec.AVPicture; +import static org.bytedeco.javacpp.avcodec.AV_CODEC_ID_MJPEG; +import static org.bytedeco.javacpp.avcodec.AV_FIELD_BB; +import static org.bytedeco.javacpp.avcodec.AV_FIELD_BT; +import static org.bytedeco.javacpp.avcodec.AV_FIELD_PROGRESSIVE; +import static org.bytedeco.javacpp.avcodec.AV_FIELD_TB; +import static org.bytedeco.javacpp.avcodec.AV_FIELD_TT; +import static org.bytedeco.javacpp.avcodec.CODEC_CAP_DELAY; +import static org.bytedeco.javacpp.avcodec.av_copy_packet; +import static org.bytedeco.javacpp.avcodec.av_init_packet; +import static org.bytedeco.javacpp.avcodec.avcodec_encode_audio2; +import static org.bytedeco.javacpp.avcodec.avcodec_encode_video2; +import static org.bytedeco.javacpp.avcodec.avcodec_get_frame_defaults; +import static org.bytedeco.javacpp.avcodec.avpicture_alloc; +import static org.bytedeco.javacpp.avcodec.avpicture_fill; +import static org.bytedeco.javacpp.avcodec.avpicture_get_size; +import static org.bytedeco.javacpp.avutil.AVFrame; +import static org.bytedeco.javacpp.avutil.AVRational; +import static org.bytedeco.javacpp.avutil.AV_NOPTS_VALUE; +import static org.bytedeco.javacpp.avutil.av_d2q; +import static org.bytedeco.javacpp.avutil.av_find_nearest_q_idx; +import static org.bytedeco.javacpp.avutil.av_free; +import static org.bytedeco.javacpp.avutil.av_get_channel_layout_nb_channels; +import static org.bytedeco.javacpp.avutil.av_get_default_channel_layout; +import static org.bytedeco.javacpp.avutil.av_malloc; +import static org.bytedeco.javacpp.avutil.av_q2d; public class Encoder extends Coder { - private final static Logger LOGGER = LogManager.getLogger(Encoder.class.getName()); + private final static Logger LOGGER = LoggerFactory.getLogger(Encoder.class.getName()); /** Encoded audio packet buffer */ private BytePointer audioBuffer; diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Image.java b/JavaAV/src/main/java/com/github/hoary/javaav/Image.java index 2db97a9..df7a6e9 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Image.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Image.java @@ -21,8 +21,24 @@ package com.github.hoary.javaav; -import java.awt.image.*; -import java.nio.*; +import java.awt.image.BufferedImage; +import java.awt.image.ComponentSampleModel; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.DataBufferDouble; +import java.awt.image.DataBufferFloat; +import java.awt.image.DataBufferInt; +import java.awt.image.DataBufferShort; +import java.awt.image.DataBufferUShort; +import java.awt.image.MultiPixelPackedSampleModel; +import java.awt.image.Raster; +import java.awt.image.SampleModel; +import java.awt.image.SinglePixelPackedSampleModel; +import java.nio.ByteBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.nio.ShortBuffer; public final class Image { diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/JavaAV.java b/JavaAV/src/main/java/com/github/hoary/javaav/JavaAV.java index cf146ae..b168b61 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/JavaAV.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/JavaAV.java @@ -21,10 +21,11 @@ package com.github.hoary.javaav; -import static com.googlecode.javacv.cpp.avcodec.avcodec_register_all; -import static com.googlecode.javacv.cpp.avdevice.avdevice_register_all; -import static com.googlecode.javacv.cpp.avutil.av_log_set_callback; -import static com.googlecode.javacv.cpp.avformat.*; +import static org.bytedeco.javacpp.avcodec.avcodec_register_all; +import static org.bytedeco.javacpp.avdevice.avdevice_register_all; +import static org.bytedeco.javacpp.avformat.av_register_all; +import static org.bytedeco.javacpp.avformat.avformat_network_init; +import static org.bytedeco.javacpp.avutil.av_log_set_callback; public final class JavaAV { diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/LogCallback.java b/JavaAV/src/main/java/com/github/hoary/javaav/LogCallback.java index 4987e5e..2ce09a2 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/LogCallback.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/LogCallback.java @@ -21,17 +21,16 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.Pointer; -import com.googlecode.javacv.cpp.avutil.Arg0_Pointer_int_String_Pointer; +import org.bytedeco.javacpp.Pointer; +import org.bytedeco.javacpp.avutil.Callback_Pointer_int_String_Pointer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import static org.bytedeco.javacpp.avutil.av_log_format_line; -import static com.googlecode.javacv.cpp.avutil.av_log_format_line; +public class LogCallback extends Callback_Pointer_int_String_Pointer { -public class LogCallback extends Arg0_Pointer_int_String_Pointer { - - private final static Logger LOGGER = LogManager.getLogger(LogCallback.class.getName()); + private final static Logger LOGGER = LoggerFactory.getLogger(LogCallback.class.getName()); private boolean printPrefix = true; diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/LogLevel.java b/JavaAV/src/main/java/com/github/hoary/javaav/LogLevel.java index 4934131..aa9c205 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/LogLevel.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/LogLevel.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avutil; +import org.bytedeco.javacpp.avutil; public enum LogLevel { diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/MediaPacket.java b/JavaAV/src/main/java/com/github/hoary/javaav/MediaPacket.java index 23509d2..98f4931 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/MediaPacket.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/MediaPacket.java @@ -21,11 +21,11 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avcodec.AVPacket; +import org.bytedeco.javacpp.avcodec.AVPacket; import java.nio.ByteBuffer; -import static com.googlecode.javacv.cpp.avcodec.av_free_packet; +import static org.bytedeco.javacpp.avcodec.av_free_packet; public class MediaPacket { diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/MediaType.java b/JavaAV/src/main/java/com/github/hoary/javaav/MediaType.java index ca03ac0..8ad0053 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/MediaType.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/MediaType.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avutil; +import org.bytedeco.javacpp.avutil; /** * Enumeration of all media types. {@code MediaType} describes the type of media content diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/Muxer.java b/JavaAV/src/main/java/com/github/hoary/javaav/Muxer.java index 5c98711..1169d1e 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/Muxer.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/Muxer.java @@ -21,13 +21,32 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avcodec.AVCodecContext; -import com.googlecode.javacv.cpp.avcodec.AVPacket; -import com.googlecode.javacv.cpp.avformat.*; - -import static com.googlecode.javacv.cpp.avcodec.AV_PKT_FLAG_KEY; -import static com.googlecode.javacv.cpp.avformat.*; -import static com.googlecode.javacv.cpp.avutil.*; +import org.bytedeco.javacpp.avcodec.AVCodecContext; +import org.bytedeco.javacpp.avcodec.AVPacket; +import org.bytedeco.javacpp.avformat.AVFormatContext; +import org.bytedeco.javacpp.avformat.AVIOContext; +import org.bytedeco.javacpp.avformat.AVOutputFormat; +import org.bytedeco.javacpp.avformat.AVStream; + +import static org.bytedeco.javacpp.avcodec.AV_PKT_FLAG_KEY; +import static org.bytedeco.javacpp.avformat.AVFMT_GLOBALHEADER; +import static org.bytedeco.javacpp.avformat.AVFMT_NOFILE; +import static org.bytedeco.javacpp.avformat.AVIO_FLAG_WRITE; +import static org.bytedeco.javacpp.avformat.av_dump_format; +import static org.bytedeco.javacpp.avformat.av_guess_format; +import static org.bytedeco.javacpp.avformat.av_interleaved_write_frame; +import static org.bytedeco.javacpp.avformat.av_write_frame; +import static org.bytedeco.javacpp.avformat.av_write_trailer; +import static org.bytedeco.javacpp.avformat.avformat_alloc_context; +import static org.bytedeco.javacpp.avformat.avformat_new_stream; +import static org.bytedeco.javacpp.avformat.avformat_write_header; +import static org.bytedeco.javacpp.avformat.avio_close; +import static org.bytedeco.javacpp.avformat.avio_open; +import static org.bytedeco.javacpp.avutil.AVDictionary; +import static org.bytedeco.javacpp.avutil.AVRational; +import static org.bytedeco.javacpp.avutil.AV_NOPTS_VALUE; +import static org.bytedeco.javacpp.avutil.av_free; +import static org.bytedeco.javacpp.avutil.av_rescale_q; public class Muxer extends Configurable { @@ -367,5 +386,5 @@ private void release() throws JavaAVException { videoStream = null; audioStream = null; } - + } diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/PictureResampler.java b/JavaAV/src/main/java/com/github/hoary/javaav/PictureResampler.java index f128bbb..beff476 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/PictureResampler.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/PictureResampler.java @@ -21,11 +21,14 @@ package com.github.hoary.javaav; -import com.googlecode.javacpp.PointerPointer; -import com.googlecode.javacv.cpp.avcodec.AVPicture; -import com.googlecode.javacv.cpp.swscale.*; +import org.bytedeco.javacpp.PointerPointer; +import org.bytedeco.javacpp.avcodec.AVPicture; +import org.bytedeco.javacpp.swscale.SwsContext; -import static com.googlecode.javacv.cpp.swscale.*; +import static org.bytedeco.javacpp.swscale.SWS_BILINEAR; +import static org.bytedeco.javacpp.swscale.sws_freeContext; +import static org.bytedeco.javacpp.swscale.sws_getCachedContext; +import static org.bytedeco.javacpp.swscale.sws_scale; public class PictureResampler { @@ -69,5 +72,5 @@ public void close() { convertContext = null; } } - + } diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/PixelFormat.java b/JavaAV/src/main/java/com/github/hoary/javaav/PixelFormat.java index 88139c9..34b324e 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/PixelFormat.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/PixelFormat.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avutil; +import org.bytedeco.javacpp.avutil; public enum PixelFormat { diff --git a/JavaAV/src/main/java/com/github/hoary/javaav/SampleFormat.java b/JavaAV/src/main/java/com/github/hoary/javaav/SampleFormat.java index 512290d..9704756 100644 --- a/JavaAV/src/main/java/com/github/hoary/javaav/SampleFormat.java +++ b/JavaAV/src/main/java/com/github/hoary/javaav/SampleFormat.java @@ -21,7 +21,7 @@ package com.github.hoary.javaav; -import com.googlecode.javacv.cpp.avutil; +import org.bytedeco.javacpp.avutil; public enum SampleFormat {