From: "Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Cc: Haihao Xiang <haihao.xiang@intel.com>
Subject: [FFmpeg-devel] [PATCH 3/3] lavc/qsvenc: make sure continuous allocation
Date: Thu, 18 May 2023 14:54:38 +0800
Message-ID: <20230518065438.144156-3-haihao.xiang@intel.com> (raw)
In-Reply-To: <20230518065438.144156-1-haihao.xiang@intel.com>
From: Haihao Xiang <haihao.xiang@intel.com>
Intel MediaSDK and oneVPL expect continuous allocation for data[i],
however there are mandatory padding bytes between data[i] and data[i+1].
when calling av_frame_get_buffer. This patch removes all extra padding
bytes.
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavcodec/qsvenc.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index b6813b3023..4ae9a92490 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -1882,6 +1882,62 @@ static int qsvenc_fill_padding_area(AVFrame *frame, int new_w, int new_h)
return 0;
}
+/* frame width / height have been aligned with the alignment */
+static int qsvenc_get_continuous_buffer(AVFrame *frame)
+{
+ int total_size;
+
+ switch (frame->format) {
+ case AV_PIX_FMT_NV12:
+ frame->linesize[0] = frame->width;
+ frame->linesize[1] = frame->linesize[0];
+ total_size = frame->linesize[0] * frame->height + frame->linesize[1] * frame->height / 2;
+ break;
+
+ case AV_PIX_FMT_P010:
+ case AV_PIX_FMT_P012:
+ frame->linesize[0] = 2 * frame->width;
+ frame->linesize[1] = frame->linesize[0];
+ total_size = frame->linesize[0] * frame->height + frame->linesize[1] * frame->height / 2;
+ break;
+
+ case AV_PIX_FMT_YUYV422:
+ frame->linesize[0] = 2 * frame->width;
+ frame->linesize[1] = 0;
+ total_size = frame->linesize[0] * frame->height;
+ break;
+
+ case AV_PIX_FMT_Y210:
+ case AV_PIX_FMT_VUYX:
+ case AV_PIX_FMT_XV30:
+ case AV_PIX_FMT_BGRA:
+ case AV_PIX_FMT_X2RGB10:
+ frame->linesize[0] = 4 * frame->width;
+ frame->linesize[1] = 0;
+ total_size = frame->linesize[0] * frame->height;
+ break;
+
+ default:
+ // This should never be reached
+ av_assert0(0);
+ return AVERROR(EINVAL);
+ }
+
+ frame->buf[0] = av_buffer_alloc(total_size);
+ if (!frame->buf[0])
+ return AVERROR(ENOMEM);
+
+ frame->data[0] = frame->buf[0]->data;
+ frame->extended_data = frame->data;
+
+ if (frame->format == AV_PIX_FMT_NV12 ||
+ frame->format == AV_PIX_FMT_P010 ||
+ frame->format == AV_PIX_FMT_P012)
+ frame->data[1] = frame->data[0] + frame->linesize[0] * frame->height;
+
+ return 0;
+}
+
static int submit_frame(QSVEncContext *q, const AVFrame *frame,
QSVFrame **new_frame)
{
@@ -1919,7 +1975,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame,
qf->frame->format = frame->format;
if (!qf->frame->data[0]) {
- ret = av_frame_get_buffer(qf->frame, q->width_align);
+ ret = qsvenc_get_continuous_buffer(qf->frame);
if (ret < 0)
return ret;
}
--
2.34.1
_______________________________________________
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 prev parent reply other threads:[~2023-05-18 6:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 6:54 [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: use the right alignment instead of hard coded value Xiang, Haihao
2023-05-18 6:54 ` [FFmpeg-devel] [PATCH 2/3] lavc/qsvenc: avoid data copy if possible Xiang, Haihao
2023-05-18 6:54 ` Xiang, Haihao [this message]
2023-05-22 1:38 ` [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: use the right alignment instead of hard coded value Xiang, Haihao
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=20230518065438.144156-3-haihao.xiang@intel.com \
--to=haihao.xiang-at-intel.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=haihao.xiang@intel.com \
/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