diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2018-11-02 15:33:20 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2018-11-05 12:39:23 -0500 |
| commit | d37faad0cdbb5577b6ce72625847cae5bf110db9 (patch) | |
| tree | 11319725eb49cd95b4d52dbba3cf6f6b5be8c1f5 | |
| parent | aefbb2bf029f3a01cc4198c9470550f7b007e868 (diff) | |
| download | ffmpeg-d37faad0cdbb5577b6ce72625847cae5bf110db9.tar.gz | |
mjpeg: Use profile names in the encoder and decoder
| -rw-r--r-- | libavcodec/codec_desc.c | 1 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mjpegenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/profiles.c | 9 | ||||
| -rw-r--r-- | libavcodec/profiles.h | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
6 files changed, 16 insertions, 1 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index ce9d39d924..4850e4fb43 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -81,6 +81,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, .mime_types= MT("image/jpeg"), + .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), }, { .id = AV_CODEC_ID_MJPEGB, diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b0cb3ffc83..96c425515a 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -43,6 +43,7 @@ #include "mjpeg.h" #include "mjpegdec.h" #include "jpeglsdec.h" +#include "profiles.h" #include "put_bits.h" #include "tiff.h" #include "exif.h" @@ -2796,6 +2797,7 @@ AVCodec ff_mjpeg_decoder = { .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, .priv_class = &mjpegdec_class, + .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .hw_configs = (const AVCodecHWConfigInternal*[]) { diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d2fcb8e191..0ea7bd3d10 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -38,6 +38,7 @@ #include "mpegvideo.h" #include "mjpeg.h" #include "mjpegenc.h" +#include "profiles.h" static int alloc_huffman(MpegEncContext *s) { @@ -418,6 +419,7 @@ AVCodec ff_mjpeg_encoder = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, .priv_class = &mjpeg_class, + .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), }; #endif diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 8a4447e438..e6f937fdb4 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -161,4 +161,13 @@ const AVProfile ff_prores_profiles[] = { { FF_PROFILE_UNKNOWN } }; +const AVProfile ff_mjpeg_profiles[] = { + { FF_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT, "Baseline" }, + { FF_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT, "Sequential" }, + { FF_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT, "Progressive" }, + { FF_PROFILE_MJPEG_HUFFMAN_LOSSLESS, "Lossless" }, + { FF_PROFILE_MJPEG_JPEG_LS, "JPEG LS" }, + { FF_PROFILE_UNKNOWN } +}; + #endif /* !CONFIG_SMALL */ diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 4669dad8d5..ab61e03e15 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -34,5 +34,6 @@ extern const AVProfile ff_vp9_profiles[]; extern const AVProfile ff_av1_profiles[]; extern const AVProfile ff_sbc_profiles[]; extern const AVProfile ff_prores_profiles[]; +extern const AVProfile ff_mjpeg_profiles[]; #endif /* AVCODEC_PROFILES_H */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 0351b36c2b..b4916fb724 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 38 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |