diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-10-01 15:25:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 15:25:44 +0200 |
| commit | 8e8fcee4a55de171303ebe526d3cf051522111bf (patch) | |
| tree | fef75d382fc6216a093eeaf80560473dff19d883 /media/ffvpx/libavcodec/vp9.c | |
| parent | 79b00fc33b5cb6d56d29b50efac6d62ce3a89018 (diff) | |
| parent | 45c24f05d023a2cd8289ed40a13708392ce2e6a4 (diff) | |
| download | UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.gz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.lz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.xz UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.zip | |
Merge pull request #805 from MoonchildProductions/revert-801-update-from-upstream
Revert "Update ffvpx code to 4.0.2"
Diffstat (limited to 'media/ffvpx/libavcodec/vp9.c')
| -rw-r--r-- | media/ffvpx/libavcodec/vp9.c | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/media/ffvpx/libavcodec/vp9.c b/media/ffvpx/libavcodec/vp9.c index b1178c9c0..f2cf19424 100644 --- a/media/ffvpx/libavcodec/vp9.c +++ b/media/ffvpx/libavcodec/vp9.c @@ -23,7 +23,6 @@ #include "avcodec.h" #include "get_bits.h" -#include "hwaccel.h" #include "internal.h" #include "profiles.h" #include "thread.h" @@ -170,10 +169,7 @@ fail: static int update_size(AVCodecContext *avctx, int w, int h) { -#define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + \ - CONFIG_VP9_D3D11VA_HWACCEL * 2 + \ - CONFIG_VP9_NVDEC_HWACCEL + \ - CONFIG_VP9_VAAPI_HWACCEL) +#define HWACCEL_MAX (CONFIG_VP9_DXVA2_HWACCEL + CONFIG_VP9_D3D11VA_HWACCEL * 2 + CONFIG_VP9_VAAPI_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmtp = pix_fmts; VP9Context *s = avctx->priv_data; uint8_t *p; @@ -188,7 +184,6 @@ static int update_size(AVCodecContext *avctx, int w, int h) switch (s->pix_fmt) { case AV_PIX_FMT_YUV420P: - case AV_PIX_FMT_YUV420P10: #if CONFIG_VP9_DXVA2_HWACCEL *fmtp++ = AV_PIX_FMT_DXVA2_VLD; #endif @@ -196,17 +191,12 @@ static int update_size(AVCodecContext *avctx, int w, int h) *fmtp++ = AV_PIX_FMT_D3D11VA_VLD; *fmtp++ = AV_PIX_FMT_D3D11; #endif -#if CONFIG_VP9_NVDEC_HWACCEL - *fmtp++ = AV_PIX_FMT_CUDA; -#endif #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; #endif break; + case AV_PIX_FMT_YUV420P10: case AV_PIX_FMT_YUV420P12: -#if CONFIG_VP9_NVDEC_HWACCEL - *fmtp++ = AV_PIX_FMT_CUDA; -#endif #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; #endif @@ -1797,23 +1787,4 @@ AVCodec ff_vp9_decoder = { .init_thread_copy = ONLY_IF_THREADS_ENABLED(vp9_decode_init_thread_copy), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context), .profiles = NULL_IF_CONFIG_SMALL(ff_vp9_profiles), - .bsfs = "vp9_superframe_split", - .hw_configs = (const AVCodecHWConfigInternal*[]) { -#if CONFIG_VP9_DXVA2_HWACCEL - HWACCEL_DXVA2(vp9), -#endif -#if CONFIG_VP9_D3D11VA_HWACCEL - HWACCEL_D3D11VA(vp9), -#endif -#if CONFIG_VP9_D3D11VA2_HWACCEL - HWACCEL_D3D11VA2(vp9), -#endif -#if CONFIG_VP9_NVDEC_HWACCEL - HWACCEL_NVDEC(vp9), -#endif -#if CONFIG_VP9_VAAPI_HWACCEL - HWACCEL_VAAPI(vp9), -#endif - NULL - }, }; |