| Message ID | 20230620235052.1878524-1-airlied@gmail.com |
|---|---|
| State | Accepted |
| Commit | 343716bd744a44cb15205af73c6e6ad0fdaa0b7b |
| Headers | show |
| Series | [FFmpeg-devel] vulkan/av1: fix tile upload offsets. | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | fail | Make fate failed |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | fail | Make fate failed |
Jun 21, 2023, 01:51 by airlied@gmail.com: > From: Dave Airlie <airlied@redhat.com> > > This fixes decoding av1-1-b8-22-svc-L2T1.ivf > while not breaking other videos. > --- > libavcodec/vulkan_av1.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c > index 91e44ba803..005998b1bd 100644 > --- a/libavcodec/vulkan_av1.c > +++ b/libavcodec/vulkan_av1.c > @@ -513,13 +513,15 @@ static int vk_av1_decode_slice(AVCodecContext *avctx, > .tg_end = s->tg_end, > }; > > - err = ff_vk_decode_add_slice(avctx, vp, data, size, 0, > + err = ff_vk_decode_add_slice(avctx, vp, > + data + s->tile_group_info[i].tile_offset, > + s->tile_group_info[i].tile_size, 0, > &ap->tile_list.nb_tiles, > &ap->tile_offsets); > if (err < 0) > return err; > > -// ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; > + ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; > } > > return 0; > Pushed. Thanks.
diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c index 91e44ba803..005998b1bd 100644 --- a/libavcodec/vulkan_av1.c +++ b/libavcodec/vulkan_av1.c @@ -513,13 +513,15 @@ static int vk_av1_decode_slice(AVCodecContext *avctx, .tg_end = s->tg_end, }; - err = ff_vk_decode_add_slice(avctx, vp, data, size, 0, + err = ff_vk_decode_add_slice(avctx, vp, + data + s->tile_group_info[i].tile_offset, + s->tile_group_info[i].tile_size, 0, &ap->tile_list.nb_tiles, &ap->tile_offsets); if (err < 0) return err; -// ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; + ap->tiles[ap->tile_list.nb_tiles - 1].offset = ap->tile_offsets[ap->tile_list.nb_tiles - 1]; } return 0;
From: Dave Airlie <airlied@redhat.com> This fixes decoding av1-1-b8-22-svc-L2T1.ivf while not breaking other videos. --- libavcodec/vulkan_av1.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)