| Message ID | 20220323135426.32530-1-robux4@ycbcr.xyz |
|---|---|
| State | Accepted |
| Commit | 723065a3466c7a05ef9c7cecda501115e789d261 |
| Headers | show |
| Series | [FFmpeg-devel] dxva2_hevc: don't use frames as reference if they are not marked as such | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
This makes my previous path "avcodec/dxva2: don't call GetDesc on a NULL ID3D11VideoDecoderOutputView" unnecessary. While it avoids a crash in release builds, it should still assert because a bogus reference is used. With this patch no bogus reference is used for that sample file, and playback seems correct. On 2022-03-23 14:54, Steve Lhomme wrote: > Similar to how a frame is considered for referencing for the RefPicList array. > This will do the same for RefPicSetStCurrBefore, RefPicSetStCurrAfter and > RefPicSetLtCurr. > > Fixes playback of http://www.gbbsoft.pl/!download/!/Film1.mp4 > Ref. VLC issue https://code.videolan.org/videolan/vlc/-/issues/26738 > > Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> > --- > libavcodec/dxva2_hevc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c > index c91bcf3eeb..6b239d9917 100644 > --- a/libavcodec/dxva2_hevc.c > +++ b/libavcodec/dxva2_hevc.c > @@ -184,7 +184,7 @@ static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext * > const HEVCFrame *frame = NULL; \ > while (!frame && j < rpl->nb_refs) \ > frame = rpl->ref[j++]; \ > - if (frame) \ > + if (frame && frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF)) \ > pp->ref_list[i] = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, frame->frame)); \ > else \ > pp->ref_list[i] = 0xff; \ > -- > 2.29.2 > > _______________________________________________ > 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 Wed, Mar 23, 2022 at 2:54 PM Steve Lhomme <robux4@ycbcr.xyz> wrote: > > Similar to how a frame is considered for referencing for the RefPicList array. > This will do the same for RefPicSetStCurrBefore, RefPicSetStCurrAfter and > RefPicSetLtCurr. > > Fixes playback of http://www.gbbsoft.pl/!download/!/Film1.mp4 > Ref. VLC issue https://code.videolan.org/videolan/vlc/-/issues/26738 > > Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> > --- > libavcodec/dxva2_hevc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c > index c91bcf3eeb..6b239d9917 100644 > --- a/libavcodec/dxva2_hevc.c > +++ b/libavcodec/dxva2_hevc.c > @@ -184,7 +184,7 @@ static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext * > const HEVCFrame *frame = NULL; \ > while (!frame && j < rpl->nb_refs) \ > frame = rpl->ref[j++]; \ > - if (frame) \ > + if (frame && frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF)) \ > pp->ref_list[i] = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, frame->frame)); \ > else \ > pp->ref_list[i] = 0xff; \ > -- > 2.29.2 > LGTM
diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c index c91bcf3eeb..6b239d9917 100644 --- a/libavcodec/dxva2_hevc.c +++ b/libavcodec/dxva2_hevc.c @@ -184,7 +184,7 @@ static void fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext * const HEVCFrame *frame = NULL; \ while (!frame && j < rpl->nb_refs) \ frame = rpl->ref[j++]; \ - if (frame) \ + if (frame && frame->flags & (HEVC_FRAME_FLAG_LONG_REF | HEVC_FRAME_FLAG_SHORT_REF)) \ pp->ref_list[i] = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, frame->frame)); \ else \ pp->ref_list[i] = 0xff; \
Similar to how a frame is considered for referencing for the RefPicList array. This will do the same for RefPicSetStCurrBefore, RefPicSetStCurrAfter and RefPicSetLtCurr. Fixes playback of http://www.gbbsoft.pl/!download/!/Film1.mp4 Ref. VLC issue https://code.videolan.org/videolan/vlc/-/issues/26738 Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> --- libavcodec/dxva2_hevc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)