| Message ID | 20220111065538.750653-1-wenbin.chen@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,V5,1/2] libavcodec/vaapi_decode: fix the problem that init_pool_size < nb_surface | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
> For vaapi if the init_pool_size is not zero, the pool size is fixed. > This means max surfaces is init_pool_size, but when mapping vaapi > frame to qsv frame, the init_pool_size < nb_surface. The cause is that > vaapi_decode_make_config() config the init_pool_size and it is called > twice. The first time is to init frame_context and the second time is to > init codec. On the second time the init_pool_size is changed to original > value so the init_pool_size is lower than the reall size because > pool_size used to initialize frame_context need to plus thread_count and > 3 (guarantee 4 base work surfaces). Now add code to make sure > init_pool_size is only set once. Now the following commandline works: > > ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ > -hwaccel_output_format vaapi -i input.264 \ > -vf "hwmap=derive_device=qsv,format=qsv" \ > -c:v h264_qsv output.264 > > Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> > --- > libavcodec/vaapi_decode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c > index 665af370ed..da0e72b10b 100644 > --- a/libavcodec/vaapi_decode.c > +++ b/libavcodec/vaapi_decode.c > @@ -650,7 +650,7 @@ int ff_vaapi_decode_init(AVCodecContext *avctx) > ctx->hwctx = ctx->device->hwctx; > > err = vaapi_decode_make_config(avctx, ctx->frames->device_ref, > - &ctx->va_config, avctx->hw_frames_ctx); > + &ctx->va_config, NULL); > if (err) > goto fail; > > -- > 2.25.1 > ping > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
On Tue, 2022-01-11 at 14:55 +0800, Wenbin Chen wrote: > For vaapi if the init_pool_size is not zero, the pool size is fixed. > This means max surfaces is init_pool_size, but when mapping vaapi > frame to qsv frame, the init_pool_size < nb_surface. The cause is that > vaapi_decode_make_config() config the init_pool_size and it is called > twice. The first time is to init frame_context and the second time is to > init codec. On the second time the init_pool_size is changed to original > value so the init_pool_size is lower than the reall size because > pool_size used to initialize frame_context need to plus thread_count and > 3 (guarantee 4 base work surfaces). Now add code to make sure > init_pool_size is only set once. Now the following commandline works: > > ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ > -hwaccel_output_format vaapi -i input.264 \ > -vf "hwmap=derive_device=qsv,format=qsv" \ > -c:v h264_qsv output.264 > > Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> > --- > libavcodec/vaapi_decode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c > index 665af370ed..da0e72b10b 100644 > --- a/libavcodec/vaapi_decode.c > +++ b/libavcodec/vaapi_decode.c > @@ -650,7 +650,7 @@ int ff_vaapi_decode_init(AVCodecContext *avctx) > ctx->hwctx = ctx->device->hwctx; > > err = vaapi_decode_make_config(avctx, ctx->frames->device_ref, > - &ctx->va_config, avctx->hw_frames_ctx); > + &ctx->va_config, NULL); > if (err) > goto fail; > LGTM, and the command works well for me now. Will aplly Thanks Haihao
diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index 665af370ed..da0e72b10b 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -650,7 +650,7 @@ int ff_vaapi_decode_init(AVCodecContext *avctx) ctx->hwctx = ctx->device->hwctx; err = vaapi_decode_make_config(avctx, ctx->frames->device_ref, - &ctx->va_config, avctx->hw_frames_ctx); + &ctx->va_config, NULL); if (err) goto fail;
For vaapi if the init_pool_size is not zero, the pool size is fixed. This means max surfaces is init_pool_size, but when mapping vaapi frame to qsv frame, the init_pool_size < nb_surface. The cause is that vaapi_decode_make_config() config the init_pool_size and it is called twice. The first time is to init frame_context and the second time is to init codec. On the second time the init_pool_size is changed to original value so the init_pool_size is lower than the reall size because pool_size used to initialize frame_context need to plus thread_count and 3 (guarantee 4 base work surfaces). Now add code to make sure init_pool_size is only set once. Now the following commandline works: ffmpeg -hwaccel vaapi -hwaccel_device /dev/dri/renderD128 \ -hwaccel_output_format vaapi -i input.264 \ -vf "hwmap=derive_device=qsv,format=qsv" \ -c:v h264_qsv output.264 Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> --- libavcodec/vaapi_decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)