[FFmpeg-devel] [PATCH 4/4 v2] avcodec/av1dec: add an option to select an operating point
James Almer
jamrial at gmail.com
Fri Oct 2 21:37:08 EEST 2020
Signed-off-by: James Almer <jamrial at gmail.com>
---
doc/decoders.texi | 13 +++++++++++++
libavcodec/av1dec.c | 34 ++++++++++++++++++++++++++++++++++
libavcodec/av1dec.h | 7 +++++++
3 files changed, 54 insertions(+)
diff --git a/doc/decoders.texi b/doc/decoders.texi
index 8649f83e28..667941652c 100644
--- a/doc/decoders.texi
+++ b/doc/decoders.texi
@@ -25,6 +25,19 @@ enabled decoders.
A description of some of the currently available video decoders
follows.
+ at section av1
+
+AOMedia Video 1 (AV1) decoder.
+
+ at subsection Options
+
+ at table @option
+
+ at item operating_point
+Select an operating point of a scalable AV1 bitstream (0 - 31). Default is 0.
+
+ at end table
+
@section rawvideo
Raw video decoder.
diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
index 07026b7aeb..eff2fc1232 100644
--- a/libavcodec/av1dec.c
+++ b/libavcodec/av1dec.c
@@ -19,6 +19,7 @@
*/
#include "libavutil/pixdesc.h"
+#include "libavutil/opt.h"
#include "avcodec.h"
#include "av1dec.h"
#include "bytestream.h"
@@ -343,6 +344,7 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f)
ff_thread_release_buffer(avctx, &f->tf);
av_buffer_unref(&f->hwaccel_priv_buf);
f->hwaccel_picture_private = NULL;
+ f->spatial_id = f->temporal_id = 0;
}
static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *src)
@@ -360,6 +362,8 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s
dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data;
}
+ dst->spatial_id = src->spatial_id;
+ dst->temporal_id = src->temporal_id;
dst->loop_filter_delta_enabled = src->loop_filter_delta_enabled;
memcpy(dst->loop_filter_ref_deltas,
src->loop_filter_ref_deltas,
@@ -505,6 +509,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(s->cbc, &s->current_obu, avctx->extradata,
avctx->extradata_size);
@@ -588,6 +594,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;
@@ -670,6 +681,7 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame,
for (int i = 0; i < s->current_obu.nb_units; i++) {
CodedBitstreamUnit *unit = &s->current_obu.units[i];
AV1RawOBU *obu = unit->content;
+ const AV1RawOBUHeader *header = &obu->header;
av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type);
switch (unit->type) {
@@ -689,6 +701,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) {
@@ -763,6 +777,9 @@ static int av1_decode_frame(AVCodecContext *avctx, void *frame,
goto end;
}
+ s->cur_frame.spatial_id = header->spatial_id;
+ s->cur_frame.temporal_id = header->temporal_id;
+
if (avctx->hwaccel) {
ret = avctx->hwaccel->start_frame(avctx, unit->data,
unit->data_size);
@@ -852,12 +869,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"),
@@ -873,6 +906,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 * []) {
NULL
},
diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h
index 3604870299..67ae4c2c9f 100644
--- a/libavcodec/av1dec.h
+++ b/libavcodec/av1dec.h
@@ -36,6 +36,9 @@ typedef struct AV1Frame {
AVBufferRef *hwaccel_priv_buf;
void *hwaccel_picture_private;
+ int temporal_id;
+ int spatial_id;
+
uint8_t loop_filter_delta_enabled;
int8_t loop_filter_ref_deltas[AV1_NUM_REF_FRAMES];
int8_t loop_filter_mode_deltas[2];
@@ -67,9 +70,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 */
--
2.27.0
More information about the ffmpeg-devel
mailing list