* commit '8655c54160767de1a6b96f8bc310d6e4eaceff48': libvpx: Support the vp9 extended profiles Conflicts: Changelog configure libavcodec/libvpx.c libavcodec/libvpx.h libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/version.h mostly not merged, as requested by jamrial See:tags/n2.801e59d48ed
See:079b7f6eac
and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
@@ -5141,13 +5141,33 @@ enabled libvidstab && require_pkg_config "vidstab >= 0.98" vid.stab/libvi | |||
enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc | |||
enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc | |||
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg | |||
enabled libvpx && { | |||
enabled libvpx_vp8_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || | |||
die "ERROR: libvpx decoder version must be >=0.9.1"; } | |||
enabled libvpx_vp8_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx || | |||
die "ERROR: libvpx encoder version must be >=0.9.7"; } | |||
enabled libvpx_vp9_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || disable libvpx_vp9_decoder; } | |||
enabled libvpx_vp9_encoder && { check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx || disable libvpx_vp9_encoder; } } | |||
enabled libvpx_vp8_decoder && { | |||
use_pkg_config "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx || | |||
check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || | |||
die "ERROR: libvpx decoder version must be >=0.9.1"; | |||
} | |||
enabled libvpx_vp8_encoder && { | |||
use_pkg_config "vpx >= 0.9.7" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp8_cx || | |||
check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver VP8E_SET_MAX_INTRA_BITRATE_PCT" -lvpx || | |||
die "ERROR: libvpx encoder version must be >=0.9.7"; | |||
} | |||
enabled libvpx_vp9_decoder && { | |||
use_pkg_config "vpx >= 1.3.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp9_dx || | |||
check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_vp9_dx" -lvpx || | |||
disable libvpx_vp9_decoder; | |||
} | |||
enabled libvpx_vp9_encoder && { | |||
use_pkg_config "vpx >= 1.3.0" "vpx/vpx_encoder.h vpx/vp8cx.h" vpx_codec_vp9_cx || | |||
check_lib2 "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VP9E_SET_AQ_MODE" -lvpx || | |||
disable libvpx_vp9_encoder; | |||
} | |||
if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then | |||
die "libvpx enabled but no supported decoders found" | |||
fi | |||
} | |||
enabled libwavpack && require libwavpack wavpack/wavpack.h WavpackOpenFileOutput -lwavpack | |||
enabled libwebp && { | |||
enabled libwebp_encoder && require_pkg_config "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion | |||
@@ -2924,17 +2924,16 @@ typedef struct AVCodecContext { | |||
#define FF_PROFILE_JPEG2000_DCINEMA_2K 3 | |||
#define FF_PROFILE_JPEG2000_DCINEMA_4K 4 | |||
#define FF_PROFILE_VP9_0 0 | |||
#define FF_PROFILE_VP9_1 1 | |||
#define FF_PROFILE_VP9_2 2 | |||
#define FF_PROFILE_VP9_3 3 | |||
#define FF_PROFILE_HEVC_MAIN 1 | |||
#define FF_PROFILE_HEVC_MAIN_10 2 | |||
#define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 | |||
#define FF_PROFILE_HEVC_REXT 4 | |||
#define FF_PROFILE_VP9_0 0 | |||
#define FF_PROFILE_VP9_1 1 | |||
#define FF_PROFILE_VP9_2 2 | |||
#define FF_PROFILE_VP9_3 3 | |||
/** | |||
* level | |||
* - encoding: Set by user. | |||
@@ -77,3 +77,60 @@ av_cold void ff_vp9_init_static(AVCodec *codec) | |||
} | |||
#endif | |||
} | |||
#if 0 | |||
enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img) | |||
{ | |||
switch (img) { | |||
case VPX_IMG_FMT_RGB24: return AV_PIX_FMT_RGB24; | |||
case VPX_IMG_FMT_RGB565: return AV_PIX_FMT_RGB565BE; | |||
case VPX_IMG_FMT_RGB555: return AV_PIX_FMT_RGB555BE; | |||
case VPX_IMG_FMT_UYVY: return AV_PIX_FMT_UYVY422; | |||
case VPX_IMG_FMT_YUY2: return AV_PIX_FMT_YUYV422; | |||
case VPX_IMG_FMT_YVYU: return AV_PIX_FMT_YVYU422; | |||
case VPX_IMG_FMT_BGR24: return AV_PIX_FMT_BGR24; | |||
case VPX_IMG_FMT_ARGB: return AV_PIX_FMT_ARGB; | |||
case VPX_IMG_FMT_ARGB_LE: return AV_PIX_FMT_BGRA; | |||
case VPX_IMG_FMT_RGB565_LE: return AV_PIX_FMT_RGB565LE; | |||
case VPX_IMG_FMT_RGB555_LE: return AV_PIX_FMT_RGB555LE; | |||
case VPX_IMG_FMT_I420: return AV_PIX_FMT_YUV420P; | |||
case VPX_IMG_FMT_I422: return AV_PIX_FMT_YUV422P; | |||
case VPX_IMG_FMT_I444: return AV_PIX_FMT_YUV444P; | |||
case VPX_IMG_FMT_444A: return AV_PIX_FMT_YUVA444P; | |||
#ifdef VPX_IMAGE_ABI_VERSION >= 3 | |||
case VPX_IMG_FMT_I440: return AV_PIX_FMT_YUV440P; | |||
case VPX_IMG_FMT_I42016: return AV_PIX_FMT_YUV420P16BE; | |||
case VPX_IMG_FMT_I42216: return AV_PIX_FMT_YUV422P16BE; | |||
case VPX_IMG_FMT_I44416: return AV_PIX_FMT_YUV444P16BE; | |||
#endif | |||
default: return AV_PIX_FMT_NONE; | |||
} | |||
} | |||
vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix) | |||
{ | |||
switch (pix) { | |||
case AV_PIX_FMT_RGB24: return VPX_IMG_FMT_RGB24; | |||
case AV_PIX_FMT_RGB565BE: return VPX_IMG_FMT_RGB565; | |||
case AV_PIX_FMT_RGB555BE: return VPX_IMG_FMT_RGB555; | |||
case AV_PIX_FMT_UYVY422: return VPX_IMG_FMT_UYVY; | |||
case AV_PIX_FMT_YUYV422: return VPX_IMG_FMT_YUY2; | |||
case AV_PIX_FMT_YVYU422: return VPX_IMG_FMT_YVYU; | |||
case AV_PIX_FMT_BGR24: return VPX_IMG_FMT_BGR24; | |||
case AV_PIX_FMT_ARGB: return VPX_IMG_FMT_ARGB; | |||
case AV_PIX_FMT_BGRA: return VPX_IMG_FMT_ARGB_LE; | |||
case AV_PIX_FMT_RGB565LE: return VPX_IMG_FMT_RGB565_LE; | |||
case AV_PIX_FMT_RGB555LE: return VPX_IMG_FMT_RGB555_LE; | |||
case AV_PIX_FMT_YUV420P: return VPX_IMG_FMT_I420; | |||
case AV_PIX_FMT_YUV422P: return VPX_IMG_FMT_I422; | |||
case AV_PIX_FMT_YUV444P: return VPX_IMG_FMT_I444; | |||
case AV_PIX_FMT_YUVA444P: return VPX_IMG_FMT_444A; | |||
#ifdef VPX_IMAGE_ABI_VERSION >= 3 | |||
case AV_PIX_FMT_YUV440P: return VPX_IMG_FMT_I440; | |||
case AV_PIX_FMT_YUV420P16BE: return VPX_IMG_FMT_I42016; | |||
case AV_PIX_FMT_YUV422P16BE: return VPX_IMG_FMT_I42216; | |||
case AV_PIX_FMT_YUV444P16BE: return VPX_IMG_FMT_I44416; | |||
#endif | |||
default: return VPX_IMG_FMT_NONE; | |||
} | |||
} | |||
#endif |
@@ -24,5 +24,7 @@ | |||
#include "avcodec.h" | |||
void ff_vp9_init_static(AVCodec *codec); | |||
enum AVPixelFormat ff_vpx_imgfmt_to_pixfmt(vpx_img_fmt_t img); | |||
vpx_img_fmt_t ff_vpx_pixfmt_to_imgfmt(enum AVPixelFormat pix); | |||
#endif /* AVCODEC_LIBVPX_H */ |
@@ -381,7 +381,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, | |||
const struct vpx_codec_iface *iface) | |||
{ | |||
VP8Context *ctx = avctx->priv_data; | |||
struct vpx_codec_enc_cfg enccfg; | |||
struct vpx_codec_enc_cfg enccfg = { 0 }; | |||
struct vpx_codec_enc_cfg enccfg_alpha; | |||
vpx_codec_flags_t flags = (avctx->flags & CODEC_FLAG_PSNR) ? VPX_CODEC_USE_PSNR : 0; | |||
int res; | |||
@@ -1056,6 +1056,14 @@ static const AVClass class_vp9 = { | |||
.version = LIBAVUTIL_VERSION_INT, | |||
}; | |||
static const AVProfile profiles[] = { | |||
{ FF_PROFILE_VP9_0, "Profile 0" }, | |||
{ FF_PROFILE_VP9_1, "Profile 1" }, | |||
{ FF_PROFILE_VP9_2, "Profile 2" }, | |||
{ FF_PROFILE_VP9_3, "Profile 3" }, | |||
{ FF_PROFILE_UNKNOWN }, | |||
}; | |||
AVCodec ff_libvpx_vp9_encoder = { | |||
.name = "libvpx-vp9", | |||
.long_name = NULL_IF_CONFIG_SMALL("libvpx VP9"), | |||
@@ -1066,6 +1074,7 @@ AVCodec ff_libvpx_vp9_encoder = { | |||
.encode2 = vp8_encode, | |||
.close = vp8_free, | |||
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_AUTO_THREADS, | |||
.profiles = NULL_IF_CONFIG_SMALL(profiles), | |||
.priv_class = &class_vp9, | |||
.defaults = defaults, | |||
.init_static_data = ff_vp9_init_static, | |||
@@ -30,7 +30,7 @@ | |||
#define LIBAVCODEC_VERSION_MAJOR 56 | |||
#define LIBAVCODEC_VERSION_MINOR 42 | |||
#define LIBAVCODEC_VERSION_MICRO 100 | |||
#define LIBAVCODEC_VERSION_MICRO 101 | |||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | |||
LIBAVCODEC_VERSION_MINOR, \ | |||