VP9 decoder should be able to handle resolution changing on inter
frame without re-initialization. For hardware decoder, re-allocate hardware
frame surface.
Fix #8068 for VA-API.
Signed-off-by: Linjie Fu <linjie...@intel.com>
---
Request for comments.
This works for VA-API, however for dxva2 it didn't cover all cases.
Another idea is to register a call-back function in AVHWAccel (such as
ff_vp9_dxva2_hwaccel) to handle surface re-allocation according to
the hardware decoder.
libavcodec/vp9.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 0fd15ef..a7b4c6a 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -34,6 +34,7 @@
#include "vp9dec.h"
#include "libavutil/avassert.h"
#include "libavutil/pixdesc.h"
+#include "decode.h"
#define VP9_SYNCCODE 0x498342
@@ -220,11 +221,20 @@ static int update_size(AVCodecContext *avctx, int w, int
h)
*fmtp++ = s->pix_fmt;
*fmtp = AV_PIX_FMT_NONE;
- ret = ff_thread_get_format(avctx, pix_fmts);
- if (ret < 0)
- return ret;
+ if (avctx->internal->hwaccel_priv_data && s->pix_fmt == s->gf_fmt &&
(s->w != w || s->h != h)) {
+ const AVHWDeviceContext *device_ctx =
+ (AVHWDeviceContext*)avctx->hw_device_ctx->data;
+ ret = ff_decode_get_hw_frames_ctx(avctx, device_ctx->type);
+ if (ret < 0)
+ return ret;
+ } else {
+ ret = ff_thread_get_format(avctx, pix_fmts);
+ if (ret < 0)
+ return ret;
+
+ avctx->pix_fmt = ret;
+ }
- avctx->pix_fmt = ret;
s->gf_fmt = s->pix_fmt;
s->w = w;
s->h = h;
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
