mirror of
https://github.com/librempeg/librempeg
synced 2024-11-22 00:51:37 +00:00
lavu: add video_hint API
Add side data type to provide hint to the video encoders about unchanged portions of each frame. Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
parent
c0709706dd
commit
5012b4ab4c
@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
|
||||
|
||||
API changes, most recent first:
|
||||
|
||||
2023-08-08 - xxxxxxxxxx - lavu 58.15.100 - video_hint.h
|
||||
Add AVVideoHint API.
|
||||
|
||||
2023-07-xx - xxxxxxxxxx - lavc 60 - avcodec.h
|
||||
Deprecate AV_CODEC_FLAG_DROPCHANGED without replacement.
|
||||
|
||||
|
@ -91,6 +91,7 @@ HEADERS = adler32.h \
|
||||
tea.h \
|
||||
tx.h \
|
||||
film_grain_params.h \
|
||||
video_hint.h
|
||||
|
||||
ARCH_HEADERS = bswap.h \
|
||||
intmath.h \
|
||||
@ -181,6 +182,7 @@ OBJS = adler32.o \
|
||||
uuid.o \
|
||||
version.o \
|
||||
video_enc_params.o \
|
||||
video_hint.o \
|
||||
film_grain_params.o \
|
||||
|
||||
|
||||
|
@ -214,6 +214,16 @@ enum AVFrameSideDataType {
|
||||
* Ambient viewing environment metadata, as defined by H.274.
|
||||
*/
|
||||
AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT,
|
||||
|
||||
/**
|
||||
* Provide encoder-specific hinting information about changed/unchanged
|
||||
* portions of a frame. It can be used to pass information about which
|
||||
* macroblocks can be skipped because they didn't change from the
|
||||
* corresponding ones in the previous frame. This could be useful for
|
||||
* applications which know this information in advance to speed up
|
||||
* encoding.
|
||||
*/
|
||||
AV_FRAME_DATA_VIDEO_HINT,
|
||||
};
|
||||
|
||||
enum AVActiveFormatDescription {
|
||||
|
@ -79,7 +79,7 @@
|
||||
*/
|
||||
|
||||
#define LIBAVUTIL_VERSION_MAJOR 58
|
||||
#define LIBAVUTIL_VERSION_MINOR 14
|
||||
#define LIBAVUTIL_VERSION_MINOR 15
|
||||
#define LIBAVUTIL_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
||||
|
81
libavutil/video_hint.c
Normal file
81
libavutil/video_hint.c
Normal file
@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright 2023 Elias Carotti <eliascrt at amazon dot it>
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* FFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with FFmpeg; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "avstring.h"
|
||||
#include "frame.h"
|
||||
#include "macros.h"
|
||||
#include "mem.h"
|
||||
#include "video_hint.h"
|
||||
|
||||
AVVideoHint *av_video_hint_alloc(size_t nb_rects,
|
||||
size_t *out_size)
|
||||
{
|
||||
struct TestStruct {
|
||||
AVVideoHint hint;
|
||||
AVVideoRect rect;
|
||||
};
|
||||
const size_t rect_offset = offsetof(struct TestStruct, rect);
|
||||
size_t size = rect_offset;
|
||||
AVVideoHint *hint;
|
||||
|
||||
*out_size = 0;
|
||||
if (nb_rects > (SIZE_MAX - size) / sizeof(AVVideoRect))
|
||||
return NULL;
|
||||
size += sizeof(AVVideoRect) * nb_rects;
|
||||
|
||||
hint = av_mallocz(size);
|
||||
if (!hint)
|
||||
return NULL;
|
||||
|
||||
hint->nb_rects = nb_rects;
|
||||
hint->rect_offset = rect_offset;
|
||||
hint->rect_size = sizeof(AVVideoRect);
|
||||
|
||||
*out_size = size;
|
||||
|
||||
return hint;
|
||||
}
|
||||
|
||||
AVVideoHint *av_video_hint_create_side_data(AVFrame *frame,
|
||||
size_t nb_rects)
|
||||
{
|
||||
AVVideoHint *hint;
|
||||
AVBufferRef *buf;
|
||||
size_t size = 0;
|
||||
|
||||
hint = av_video_hint_alloc(nb_rects, &size);
|
||||
if (!hint)
|
||||
return NULL;
|
||||
|
||||
buf = av_buffer_create((uint8_t *)hint, size, NULL, NULL, 0);
|
||||
if (!buf) {
|
||||
av_freep(&hint);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_VIDEO_HINT, buf)) {
|
||||
av_buffer_unref(&buf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return hint;
|
||||
}
|
107
libavutil/video_hint.h
Normal file
107
libavutil/video_hint.h
Normal file
@ -0,0 +1,107 @@
|
||||
/**
|
||||
* Copyright 2023 Elias Carotti <eliascrt at amazon dot it>
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* FFmpeg is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with FFmpeg; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#ifndef AVUTIL_VIDEO_HINT_H
|
||||
#define AVUTIL_VIDEO_HINT_H
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/frame.h"
|
||||
|
||||
typedef struct AVVideoRect {
|
||||
uint32_t x, y;
|
||||
uint32_t width, height;
|
||||
} AVVideoRect;
|
||||
|
||||
typedef enum AVVideoHintType {
|
||||
/* rectangled delimit the constant areas (unchanged), default is changed */
|
||||
AV_VIDEO_HINT_TYPE_CONSTANT,
|
||||
|
||||
/* rectangled delimit the constant areas (changed), default is not changed */
|
||||
AV_VIDEO_HINT_TYPE_CHANGED,
|
||||
} AVVideoHintType;
|
||||
|
||||
typedef struct AVVideoHint {
|
||||
/**
|
||||
* Number of AVVideoRect present.
|
||||
*
|
||||
* May be 0, in which case no per-rectangle information is present. In this
|
||||
* case the values of rect_offset / rect_size are unspecified and should
|
||||
* not be accessed.
|
||||
*/
|
||||
size_t nb_rects;
|
||||
|
||||
/**
|
||||
* Offset in bytes from the beginning of this structure at which the array
|
||||
* of AVVideoRect starts.
|
||||
*/
|
||||
size_t rect_offset;
|
||||
|
||||
/**
|
||||
* Size in bytes of AVVideoRect.
|
||||
*/
|
||||
size_t rect_size;
|
||||
|
||||
AVVideoHintType type;
|
||||
} AVVideoHint;
|
||||
|
||||
static av_always_inline AVVideoRect *
|
||||
av_video_hint_rects(const AVVideoHint *hints) {
|
||||
return (AVVideoRect *)((uint8_t *)hints + hints->rect_offset);
|
||||
}
|
||||
|
||||
static av_always_inline AVVideoRect *
|
||||
av_video_hint_get_rect(const AVVideoHint *hints, size_t idx) {
|
||||
return (AVVideoRect *)((uint8_t *)hints + hints->rect_offset + idx * hints->rect_size);
|
||||
}
|
||||
|
||||
/**
|
||||
* Allocate memory for the AVVideoHint struct along with an nb_rects-sized
|
||||
* arrays of AVVideoRect.
|
||||
*
|
||||
* The side data contains a list of rectangles for the portions of the frame
|
||||
* which changed from the last encoded one (and the remainder are assumed to be
|
||||
* changed), or, alternately (depending on the type parameter) the unchanged
|
||||
* ones (and the remanining ones are those which changed).
|
||||
* Macroblocks will thus be hinted either to be P_SKIP-ped or go through the
|
||||
* regular encoding procedure.
|
||||
*
|
||||
* It's responsibility of the caller to fill the AVRects accordingly, and to set
|
||||
* the proper AVVideoHintType field.
|
||||
*
|
||||
* @param out_size if non-NULL, the size in bytes of the resulting data array is
|
||||
* written here
|
||||
*
|
||||
* @return newly allocated AVVideoHint struct (must be freed by the caller using
|
||||
* av_free()) on success, NULL on memory allocation failure
|
||||
*/
|
||||
AVVideoHint *av_video_hint_alloc(size_t nb_rects,
|
||||
size_t *out_size);
|
||||
|
||||
/**
|
||||
* Same as av_video_hint_alloc(), except newly-allocated AVVideoHint is attached
|
||||
* as side data of type AV_FRAME_DATA_VIDEO_HINT_INFO to frame.
|
||||
*/
|
||||
AVVideoHint *av_video_hint_create_side_data(AVFrame *frame,
|
||||
size_t nb_rects);
|
||||
|
||||
|
||||
#endif /* AVUTIL_VIDEO_HINT_H */
|
Loading…
Reference in New Issue
Block a user