virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/av1dec: add an option to select an operating point

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-11-15 18:55:41 -03:00
parent f951d47563
commit 5f9632e491
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/decoders.texi
View File

@ -25,6 +25,19 @@ enabled decoders.
A description of some of the currently available video decoders
follows.
@section av1
AOMedia Video 1 (AV1) decoder.
@subsection Options
@table @option
@item operating_point
Select an operating point of a scalable AV1 bitstream (0 - 31). Default is 0.
@end table
@section rawvideo
Raw video decoder.

27
libavcodec/av1dec.c
View File

@ -20,6 +20,7 @@
#include "libavutil/film_grain_params.h"
#include "libavutil/pixdesc.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "av1dec.h"
#include "bytestream.h"
@ -653,6 +654,8 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
if (ret < 0)
return ret;
av_opt_set_int(s->cbc->priv_data, "operating_point", s->operating_point, 0);
if (avctx->extradata && avctx->extradata_size) {
ret = ff_cbs_read_extradata_from_codec(s->cbc,
&s->current_obu,
@ -805,6 +808,11 @@ static int set_output_frame(AVCodecContext *avctx, AVFrame *frame,
const AVFrame *srcframe = s->cur_frame.tf.f;
int ret;
// TODO: all layers
if (s->operating_point_idc &&
av_log2(s->operating_point_idc >> 8) > s->cur_frame.spatial_id)
return 0;
ret = av_frame_ref(frame, srcframe);
if (ret < 0)
return ret;
@ -919,6 +927,8 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame,
goto end;
}
s->operating_point_idc = s->raw_seq->operating_point_idc[s->operating_point];
if (s->pix_fmt == AV_PIX_FMT_NONE) {
ret = get_pixel_format(avctx);
if (ret < 0) {
@ -1089,12 +1099,28 @@ static void av1_decode_flush(AVCodecContext *avctx)
av1_frame_unref(avctx, &s->ref[i]);
av1_frame_unref(avctx, &s->cur_frame);
s->operating_point_idc = 0;
s->raw_frame_header = NULL;
s->raw_seq = NULL;
ff_cbs_flush(s->cbc);
}
#define OFFSET(x) offsetof(AV1DecContext, x)
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
static const AVOption av1_options[] = {
{ "operating_point", "Select an operating point of the scalable bitstream",
OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, AV1_MAX_OPERATING_POINTS - 1, VD },
{ NULL }
};
static const AVClass av1_class = {
.class_name = "AV1 decoder",
.item_name = av_default_item_name,
.option = av1_options,
.version = LIBAVUTIL_VERSION_INT,
};
AVCodec ff_av1_decoder = {
.name = "av1",
.long_name = NULL_IF_CONFIG_SMALL("Alliance for Open Media AV1"),
@ -1110,6 +1136,7 @@ AVCodec ff_av1_decoder = {
FF_CODEC_CAP_SETS_PKT_DTS,
.flush = av1_decode_flush,
.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles),
.priv_class = &av1_class,
.hw_configs = (const AVCodecHWConfigInternal *const []) {
#if CONFIG_AV1_DXVA2_HWACCEL
HWACCEL_DXVA2(av1),

4
libavcodec/av1dec.h
View File

@ -76,9 +76,13 @@ typedef struct AV1DecContext {
uint16_t tg_start;
uint16_t tg_end;
int operating_point_idc;
AV1Frame ref[AV1_NUM_REF_FRAMES];
AV1Frame cur_frame;
// AVOptions
int operating_point;
} AV1DecContext;
#endif /* AVCODEC_AV1DEC_H */