virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/cbs: add an AVClass to CodedBitstreamType for option handling

Browse Source 
So unit parsing may be configured with caller set options.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-11-15 18:55:38 -03:00
parent 0cd8769207
commit 9caf132462
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/cbs.c
View File

@ -23,6 +23,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/buffer.h" #include "libavutil/buffer.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/opt.h"
#include "cbs.h" #include "cbs.h"
#include "cbs_internal.h" #include "cbs_internal.h"
@ -101,6 +102,10 @@ int ff_cbs_init(CodedBitstreamContext **ctx_ptr,
av_freep(&ctx); av_freep(&ctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if (type->priv_class) {
*(const AVClass **)ctx->priv_data = type->priv_class;
av_opt_set_defaults(ctx->priv_data);
}
} }
ctx->decompose_unit_types = NULL; ctx->decompose_unit_types = NULL;
@ -129,6 +134,10 @@ void ff_cbs_close(CodedBitstreamContext **ctx_ptr)
ctx->codec->close(ctx); ctx->codec->close(ctx);
av_freep(&ctx->write_buffer); av_freep(&ctx->write_buffer);
if (ctx->codec->priv_class && ctx->priv_data)
av_opt_free(ctx->priv_data);
av_freep(&ctx->priv_data); av_freep(&ctx->priv_data);
av_freep(ctx_ptr); av_freep(ctx_ptr);
} }

6
libavcodec/cbs_internal.h
View File

@ -86,6 +86,12 @@ typedef const struct CodedBitstreamUnitTypeDescriptor {
typedef struct CodedBitstreamType { typedef struct CodedBitstreamType {
enum AVCodecID codec_id; enum AVCodecID codec_id;
// A class for the private data, used to declare private AVOptions.
// This field is NULL for types that do not declare any options.
// If this field is non-NULL, the first member of the filter private data
// must be a pointer to AVClass.
const AVClass *priv_class;
size_t priv_data_size; size_t priv_data_size;
// List of unit type descriptors for this codec. // List of unit type descriptors for this codec.