From: David Rosca <nowrep@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: David Rosca <nowrep@gmail.com>
Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_h264: Don't try to merge fields in DPB for non-field pics
Date: Sun, 5 May 2024 18:36:41 +0200
Message-ID: <20240505163656.765900-3-nowrep@gmail.com> (raw)
This path can be hit when there are missing references while decoding
progressive stream and would completely break the DPB contents.
---
libavcodec/vaapi_h264.c | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index b47531ce1c..ca0076f57a 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -98,22 +98,24 @@ static int dpb_add(DPB *dpb, const H264Picture *pic)
if (dpb->size >= dpb->max_size)
return -1;
- for (i = 0; i < dpb->size; i++) {
- VAPictureH264 * const va_pic = &dpb->va_pics[i];
- if (va_pic->picture_id == ff_vaapi_get_surface_id(pic->f)) {
- VAPictureH264 temp_va_pic;
- fill_vaapi_pic(&temp_va_pic, pic, 0);
-
- if ((temp_va_pic.flags ^ va_pic->flags) & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD)) {
- va_pic->flags |= temp_va_pic.flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD);
- /* Merge second field */
- if (temp_va_pic.flags & VA_PICTURE_H264_TOP_FIELD) {
- va_pic->TopFieldOrderCnt = temp_va_pic.TopFieldOrderCnt;
- } else {
- va_pic->BottomFieldOrderCnt = temp_va_pic.BottomFieldOrderCnt;
+ if (pic->field_picture) {
+ for (i = 0; i < dpb->size; i++) {
+ VAPictureH264 * const va_pic = &dpb->va_pics[i];
+ if (va_pic->picture_id == ff_vaapi_get_surface_id(pic->f)) {
+ VAPictureH264 temp_va_pic;
+ fill_vaapi_pic(&temp_va_pic, pic, 0);
+
+ if ((temp_va_pic.flags ^ va_pic->flags) & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD)) {
+ va_pic->flags |= temp_va_pic.flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD);
+ /* Merge second field */
+ if (temp_va_pic.flags & VA_PICTURE_H264_TOP_FIELD) {
+ va_pic->TopFieldOrderCnt = temp_va_pic.TopFieldOrderCnt;
+ } else {
+ va_pic->BottomFieldOrderCnt = temp_va_pic.BottomFieldOrderCnt;
+ }
}
+ return 0;
}
- return 0;
}
}
--
2.45.0
_______________________________________________
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".
next reply other threads:[~2024-05-05 16:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-05 16:36 David Rosca [this message]
2024-05-06 19:55 ` Mark Thompson
2024-05-07 6:02 ` David Rosca
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240505163656.765900-3-nowrep@gmail.com \
--to=nowrep@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git