* [FFmpeg-devel] [PATCH] lavc/qsvenc: fill the padding area
@ 2022-10-10 8:05 Xiang, Haihao
2022-10-17 1:38 ` Xiang, Haihao
0 siblings, 1 reply; 2+ messages in thread
From: Xiang, Haihao @ 2022-10-10 8:05 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
qsvenc makes a copy when the input in system memory is not padded as the
SDK requires, however the padding area is not filled with right data
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavcodec/qsvenc.c | 69 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 67 insertions(+), 2 deletions(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index dc5479d0f3..15e6936a65 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -1514,6 +1514,64 @@ static int get_free_frame(QSVEncContext *q, QSVFrame **f)
return 0;
}
+static int qsvenc_fill_padding_area(AVFrame *frame, int new_w, int new_h)
+{
+ const AVPixFmtDescriptor *desc;
+ int max_step[4], filled[4] = { 0 };
+
+ desc = av_pix_fmt_desc_get(frame->format);
+ av_assert0(desc);
+ av_image_fill_max_pixsteps(max_step, NULL, desc);
+
+ for (int i = 0; i < desc->nb_components; i++) {
+ const AVComponentDescriptor *comp = &desc->comp[i];
+ int sheight, dheight, plane = comp->plane;
+ ptrdiff_t swidth = av_image_get_linesize(frame->format,
+ frame->width,
+ plane);
+ ptrdiff_t dwidth = av_image_get_linesize(frame->format,
+ new_w,
+ plane);
+
+ if (swidth < 0 || dwidth < 0) {
+ av_log(NULL, AV_LOG_ERROR, "av_image_get_linesize failed\n");
+ return AVERROR(EINVAL);
+ }
+
+ if (filled[plane])
+ continue;
+
+ sheight = frame->height;
+ dheight = new_h;
+
+ if (plane) {
+ sheight = AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h);
+ dheight = AV_CEIL_RSHIFT(new_h, desc->log2_chroma_h);
+ }
+
+ // Fill right padding
+ if (new_w > frame->width) {
+ for (int j = 0; j < sheight; j++) {
+ void *line_ptr = frame->data[plane] + j * frame->linesize[plane] + swidth;
+
+ av_memcpy_backptr(line_ptr,
+ max_step[plane],
+ new_w - frame->width);
+ }
+ }
+
+ // Fill bottom padding
+ for (int j = sheight; j < dheight; j++)
+ memcpy(frame->data[plane] + j * frame->linesize[plane],
+ frame->data[plane] + (sheight - 1) * frame->linesize[plane],
+ dwidth);
+
+ filled[plane] = 1;
+ }
+
+ return 0;
+}
+
static int submit_frame(QSVEncContext *q, const AVFrame *frame,
QSVFrame **new_frame)
{
@@ -1543,8 +1601,9 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame,
/* and to make allocation continious for data[0]/data[1] */
if ((frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) ||
(frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align))) {
- qf->frame->height = FFALIGN(frame->height, q->height_align);
- qf->frame->width = FFALIGN(frame->width, q->width_align);
+ int tmp_w, tmp_h;
+ qf->frame->height = tmp_h = FFALIGN(frame->height, q->height_align);
+ qf->frame->width = tmp_w = FFALIGN(frame->width, q->width_align);
qf->frame->format = frame->format;
@@ -1562,6 +1621,12 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame,
av_frame_unref(qf->frame);
return ret;
}
+
+ ret = qsvenc_fill_padding_area(qf->frame, tmp_w, tmp_h);
+ if (ret < 0) {
+ av_frame_unref(qf->frame);
+ return ret;
+ }
} else {
av_frame_unref(qf->frame);
ret = av_frame_ref(qf->frame, frame);
--
2.17.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".
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavc/qsvenc: fill the padding area
2022-10-10 8:05 [FFmpeg-devel] [PATCH] lavc/qsvenc: fill the padding area Xiang, Haihao
@ 2022-10-17 1:38 ` Xiang, Haihao
0 siblings, 0 replies; 2+ messages in thread
From: Xiang, Haihao @ 2022-10-17 1:38 UTC (permalink / raw)
To: ffmpeg-devel
On Mon, 2022-10-10 at 16:05 +0800, Xiang, Haihao wrote:
> From: Haihao Xiang <haihao.xiang@intel.com>
>
> qsvenc makes a copy when the input in system memory is not padded as the
> SDK requires, however the padding area is not filled with right data
>
> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> ---
> libavcodec/qsvenc.c | 69 +++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 67 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index dc5479d0f3..15e6936a65 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -1514,6 +1514,64 @@ static int get_free_frame(QSVEncContext *q, QSVFrame
> **f)
> return 0;
> }
>
> +static int qsvenc_fill_padding_area(AVFrame *frame, int new_w, int new_h)
> +{
> + const AVPixFmtDescriptor *desc;
> + int max_step[4], filled[4] = { 0 };
> +
> + desc = av_pix_fmt_desc_get(frame->format);
> + av_assert0(desc);
> + av_image_fill_max_pixsteps(max_step, NULL, desc);
> +
> + for (int i = 0; i < desc->nb_components; i++) {
> + const AVComponentDescriptor *comp = &desc->comp[i];
> + int sheight, dheight, plane = comp->plane;
> + ptrdiff_t swidth = av_image_get_linesize(frame->format,
> + frame->width,
> + plane);
> + ptrdiff_t dwidth = av_image_get_linesize(frame->format,
> + new_w,
> + plane);
> +
> + if (swidth < 0 || dwidth < 0) {
> + av_log(NULL, AV_LOG_ERROR, "av_image_get_linesize failed\n");
> + return AVERROR(EINVAL);
> + }
> +
> + if (filled[plane])
> + continue;
> +
> + sheight = frame->height;
> + dheight = new_h;
> +
> + if (plane) {
> + sheight = AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h);
> + dheight = AV_CEIL_RSHIFT(new_h, desc->log2_chroma_h);
> + }
> +
> + // Fill right padding
> + if (new_w > frame->width) {
> + for (int j = 0; j < sheight; j++) {
> + void *line_ptr = frame->data[plane] + j * frame-
> >linesize[plane] + swidth;
> +
> + av_memcpy_backptr(line_ptr,
> + max_step[plane],
> + new_w - frame->width);
> + }
> + }
> +
> + // Fill bottom padding
> + for (int j = sheight; j < dheight; j++)
> + memcpy(frame->data[plane] + j * frame->linesize[plane],
> + frame->data[plane] + (sheight - 1) * frame-
> >linesize[plane],
> + dwidth);
> +
> + filled[plane] = 1;
> + }
> +
> + return 0;
> +}
> +
> static int submit_frame(QSVEncContext *q, const AVFrame *frame,
> QSVFrame **new_frame)
> {
> @@ -1543,8 +1601,9 @@ static int submit_frame(QSVEncContext *q, const AVFrame
> *frame,
> /* and to make allocation continious for data[0]/data[1] */
> if ((frame->height & 31 || frame->linesize[0] & (q->width_align -
> 1)) ||
> (frame->data[1] - frame->data[0] != frame->linesize[0] *
> FFALIGN(qf->frame->height, q->height_align))) {
> - qf->frame->height = FFALIGN(frame->height, q->height_align);
> - qf->frame->width = FFALIGN(frame->width, q->width_align);
> + int tmp_w, tmp_h;
> + qf->frame->height = tmp_h = FFALIGN(frame->height, q-
> >height_align);
> + qf->frame->width = tmp_w = FFALIGN(frame->width, q-
> >width_align);
>
> qf->frame->format = frame->format;
>
> @@ -1562,6 +1621,12 @@ static int submit_frame(QSVEncContext *q, const AVFrame
> *frame,
> av_frame_unref(qf->frame);
> return ret;
> }
> +
> + ret = qsvenc_fill_padding_area(qf->frame, tmp_w, tmp_h);
> + if (ret < 0) {
> + av_frame_unref(qf->frame);
> + return ret;
> + }
> } else {
> av_frame_unref(qf->frame);
> ret = av_frame_ref(qf->frame, frame);
Will apply,
-Haihao
_______________________________________________
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".
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-17 1:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-10 8:05 [FFmpeg-devel] [PATCH] lavc/qsvenc: fill the padding area Xiang, Haihao
2022-10-17 1:38 ` Xiang, Haihao
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