MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc,doc: add libuavs3d video decoder wrapper 

Signed-off-by: hbj <hanbj@pku.edu.cn>
Signed-off-by: hwren <hwrenx@126.com>
This commit is contained in:
hwren 2020-10-05 20:16:25 +08:00
parent ff74ad2a4b
commit c952db9d68
7 changed files with 291 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -33,6 +33,7 @@ version <next>:
- libwavpack encoder removed
- ACE demuxer
- AVS3 demuxer
- AVS3 video decoder via libuavs3d
version 4.3:

4
configure vendored
View File

@ -277,6 +277,7 @@ External library support:
--enable-libtls enable LibreSSL (via libtls), needed for https support
if openssl, gnutls or mbedtls is not used [no]
--enable-libtwolame enable MP2 encoding via libtwolame [no]
--enable-libuavs3d enable AVS3 decoding via libuavs3d [no]
--enable-libv4l2 enable libv4l2/v4l-utils [no]
--enable-libvidstab enable video stabilization using vid.stab [no]
--enable-libvmaf enable vmaf filter via libvmaf [no]
@ -1810,6 +1811,7 @@ EXTERNAL_LIBRARY_LIST="
libtesseract
libtheora
libtwolame
libuavs3d
libv4l2
libvmaf
libvorbis
@ -3255,6 +3257,7 @@ libspeex_encoder_select="audio_frame_queue"
libsvtav1_encoder_deps="libsvtav1"
libtheora_encoder_deps="libtheora"
libtwolame_encoder_deps="libtwolame"
libuavs3d_decoder_deps="libuavs3d"
libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
libvorbis_decoder_deps="libvorbis"
libvorbis_encoder_deps="libvorbis libvorbisenc"
@ -6406,6 +6409,7 @@ enabled libtls && require_pkg_config libtls libtls tls.h tls_configur
enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame &&
{ check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
enabled libuavs3d && require_pkg_config libuavs3d "uavs3d >= 1.1.41" uavs3d.h uavs3d_decode
enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl
enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 1.5.2" libvmaf.h compute_vmaf

21
doc/decoders.texi
View File

@ -88,6 +88,27 @@ This decoder allows libavcodec to decode AVS2 streams with davs2 library.
@c man end VIDEO DECODERS
@section libuavs3d
AVS3-P2/IEEE1857.10 video decoder.
libuavs3d allows libavcodec to decode AVS3 streams.
Requires the presence of the libuavs3d headers and library during configuration.
You need to explicitly configure the build with @code{--enable-libuavs3d}.
@subsection Options
The following option is supported by the libuavs3d wrapper.
@table @option
@item frame_threads
Set amount of frame threads to use during decoding. The default value is 0 (autodetect).
@end table
@c man end VIDEO DECODERS
@chapter Audio Decoders
@c man begin AUDIO DECODERS

1
libavcodec/Makefile
View File

@ -1040,6 +1040,7 @@ OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o
OBJS-$(CONFIG_LIBSVTAV1_ENCODER) += libsvtav1.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o
OBJS-$(CONFIG_LIBUAVS3D_DECODER) += libuavs3d.o
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbisenc.o \

1
libavcodec/allcodecs.c
View File

@ -739,6 +739,7 @@ extern AVCodec ff_libspeex_decoder;
extern AVCodec ff_libsvtav1_encoder;
extern AVCodec ff_libtheora_encoder;
extern AVCodec ff_libtwolame_encoder;
extern AVCodec ff_libuavs3d_decoder;
extern AVCodec ff_libvo_amrwbenc_encoder;
extern AVCodec ff_libvorbis_encoder;
extern AVCodec ff_libvorbis_decoder;

262
libavcodec/libuavs3d.c Normal file
View File

@ -0,0 +1,262 @@
/*
* RAW AVS3-P2/IEEE1857.10 video demuxer
* Copyright (c) 2020 Zhenyu Wang <wangzhenyu@pkusz.edu.cn>
* Bingjie Han <hanbj@pkusz.edu.cn>
* Huiwen Ren <hwrenx@gmail.com>
*
* 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 "libavutil/avassert.h"
#include "libavutil/avutil.h"
#include "libavutil/common.h"
#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "avs3.h"
#include "internal.h"
#include "uavs3d.h"
typedef struct uavs3d_context {
AVCodecContext *avctx;
void *dec_handle;
int frame_threads;
int got_seqhdr;
uavs3d_io_frm_t dec_frame;
} uavs3d_context;
#define UAVS3D_CHECK_START_CODE(data_ptr, PIC_START_CODE) \
(AV_RL32(data_ptr) != (PIC_START_CODE << 24) + AVS3_NAL_START_CODE)
static int uavs3d_find_next_start_code(const unsigned char *bs_data, int bs_len, int *left)
{
const unsigned char *data_ptr = bs_data + 4;
int count = bs_len - 4;
while (count >= 4 &&
UAVS3D_CHECK_START_CODE(data_ptr, AVS3_INTER_PIC_START_CODE) &&
UAVS3D_CHECK_START_CODE(data_ptr, AVS3_INTRA_PIC_START_CODE) &&
UAVS3D_CHECK_START_CODE(data_ptr, AVS3_SEQ_START_CODE) &&
UAVS3D_CHECK_START_CODE(data_ptr, AVS3_FIRST_SLICE_START_CODE) &&
UAVS3D_CHECK_START_CODE(data_ptr, AVS3_SEQ_END_CODE)) {
data_ptr++;
count--;
}
if (count >= 4) {
*left = count;
return 1;
}
return 0;
}
static void uavs3d_output_callback(uavs3d_io_frm_t *dec_frame) {
uavs3d_io_frm_t frm_out;
AVFrame *frm = (AVFrame *)dec_frame->priv;
int i;
if (!frm || !frm->data[0]) {
dec_frame->got_pic = 0;
av_log(NULL, AV_LOG_ERROR, "Invalid AVFrame in uavs3d output.\n");
return;
}
frm->pts = dec_frame->pts;
frm->pkt_dts = dec_frame->dts;
frm->pkt_pos = dec_frame->pkt_pos;
frm->pkt_size = dec_frame->pkt_size;
frm->coded_picture_number = dec_frame->dtr;
frm->display_picture_number = dec_frame->ptr;
if (dec_frame->type < 0 || dec_frame->type >= 4) {
av_log(NULL, AV_LOG_WARNING, "Error frame type in uavs3d: %d.\n", dec_frame->type);
}
frm->pict_type = ff_avs3_image_type[dec_frame->type];
frm->key_frame = (frm->pict_type == AV_PICTURE_TYPE_I);
for (i = 0; i < 3; i++) {
frm_out.width [i] = dec_frame->width[i];
frm_out.height[i] = dec_frame->height[i];
frm_out.stride[i] = frm->linesize[i];
frm_out.buffer[i] = frm->data[i];
}
uavs3d_img_cpy_cvt(&frm_out, dec_frame, dec_frame->bit_depth);
}
static av_cold int libuavs3d_init(AVCodecContext *avctx)
{
uavs3d_context *h = avctx->priv_data;
uavs3d_cfg_t cdsc;
cdsc.frm_threads = avctx->thread_count > 0 ? avctx->thread_count : av_cpu_count();
cdsc.check_md5 = 0;
h->dec_handle = uavs3d_create(&cdsc, uavs3d_output_callback, NULL);
h->got_seqhdr = 0;
if (!h->dec_handle) {
return AVERROR(ENOMEM);
}
return 0;
}
static av_cold int libuavs3d_end(AVCodecContext *avctx)
{
uavs3d_context *h = avctx->priv_data;
if (h->dec_handle) {
uavs3d_flush(h->dec_handle, NULL);
uavs3d_delete(h->dec_handle);
h->dec_handle = NULL;
}
h->got_seqhdr = 0;
return 0;
}
static void libuavs3d_flush(AVCodecContext * avctx)
{
uavs3d_context *h = avctx->priv_data;
if (h->dec_handle) {
uavs3d_reset(h->dec_handle);
}
}
#define UAVS3D_CHECK_INVALID_RANGE(v, l, r) ((v)<(l)||(v)>(r))
static int libuavs3d_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt)
{
uavs3d_context *h = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
const uint8_t *buf_end;
const uint8_t *buf_ptr;
AVFrame *frm = data;
int left_bytes;
int ret, finish = 0;
*got_frame = 0;
frm->pts = -1;
frm->pict_type = AV_PICTURE_TYPE_NONE;
if (!buf_size) {
if (h->got_seqhdr) {
if (!frm->data[0] && (ret = ff_get_buffer(avctx, frm, 0)) < 0) {
return ret;
}
h->dec_frame.priv = data; // AVFrame
}
do {
ret = uavs3d_flush(h->dec_handle, &h->dec_frame);
} while (ret > 0 && !h->dec_frame.got_pic);
} else {
uavs3d_io_frm_t *frm_dec = &h->dec_frame;
buf_ptr = buf;
buf_end = buf + buf_size;
frm_dec->pkt_pos = avpkt->pos;
frm_dec->pkt_size = avpkt->size;
while (!finish) {
int bs_len;
if (h->got_seqhdr) {
if (!frm->data[0] && (ret = ff_get_buffer(avctx, frm, 0)) < 0) {
return ret;
}
h->dec_frame.priv = data; // AVFrame
}
if (uavs3d_find_next_start_code(buf_ptr, buf_end - buf_ptr, &left_bytes)) {
bs_len = buf_end - buf_ptr - left_bytes;
} else {
bs_len = buf_end - buf_ptr;
finish = 1;
}
frm_dec->bs = (unsigned char *)buf_ptr;
frm_dec->bs_len = bs_len;
frm_dec->pts = avpkt->pts;
frm_dec->dts = avpkt->dts;
uavs3d_decode(h->dec_handle, frm_dec);
buf_ptr += bs_len;
if (frm_dec->nal_type == NAL_SEQ_HEADER) {
struct uavs3d_com_seqh_t *seqh = frm_dec->seqhdr;
if (UAVS3D_CHECK_INVALID_RANGE(seqh->frame_rate_code, 0, 15)) {
av_log(avctx, AV_LOG_ERROR, "Invalid frame rate code: %d.\n", seqh->frame_rate_code);
seqh->frame_rate_code = 3; // default 25 fps
} else {
avctx->framerate.num = ff_avs3_frame_rate_tab[seqh->frame_rate_code].num;
avctx->framerate.den = ff_avs3_frame_rate_tab[seqh->frame_rate_code].den;
}
avctx->has_b_frames = !seqh->low_delay;
avctx->pix_fmt = seqh->bit_depth_internal == 8 ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV420P10LE;
ff_set_dimensions(avctx, seqh->horizontal_size, seqh->vertical_size);
h->got_seqhdr = 1;
if (seqh->colour_description) {
if (UAVS3D_CHECK_INVALID_RANGE(seqh->colour_primaries, 0, 9) ||
UAVS3D_CHECK_INVALID_RANGE(seqh->transfer_characteristics, 0, 14) ||
UAVS3D_CHECK_INVALID_RANGE(seqh->matrix_coefficients, 0, 11)) {
av_log(avctx, AV_LOG_ERROR,
"Invalid colour description: primaries: %d"
"transfer characteristics: %d"
"matrix coefficients: %d.\n",
seqh->colour_primaries,
seqh->transfer_characteristics,
seqh->matrix_coefficients);
} else {
avctx->color_primaries = ff_avs3_color_primaries_tab[seqh->colour_primaries];
avctx->color_trc = ff_avs3_color_transfer_tab [seqh->transfer_characteristics];
avctx->colorspace = ff_avs3_color_matrix_tab [seqh->matrix_coefficients];
}
}
}
if (frm_dec->got_pic) {
break;
}
}
}
*got_frame = h->dec_frame.got_pic;
if (!(*got_frame)) {
av_frame_unref(frm);
}
return buf_ptr - buf;
}
AVCodec ff_libuavs3d_decoder = {
.name = "libuavs3d",
.long_name = NULL_IF_CONFIG_SMALL("libuavs3d AVS3-P2/IEEE1857.10"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_AVS3,
.priv_data_size = sizeof(uavs3d_context),
.init = libuavs3d_init,
.close = libuavs3d_end,
.decode = libuavs3d_decode_frame,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AUTO_THREADS,
.flush = libuavs3d_flush,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV420P10LE,
AV_PIX_FMT_NONE },
.wrapper_name = "libuavs3d",
};

2
libavcodec/version.h
View File

@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 108
#define LIBAVCODEC_VERSION_MINOR 109
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \