ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/dovi_rpu: add ff_dovi_get_metadata()

Browse Source 
Provides direct access to the AVDOVIMetadata without having to attach it
to a frame.
This commit is contained in:
Niklas Haas 2024-06-14 20:32:58 +02:00
parent ae3a78593d
commit 765f29c61e
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/dovi_rpu.h
View File

@ -108,8 +108,17 @@ void ff_dovi_ctx_flush(DOVIContext *s);
int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size,
int err_recognition);
/**
* Get the decoded AVDOVIMetadata. Ownership passes to the caller.
*
* Returns the size of *out_metadata, a negative error code, or 0 if no
* metadata is available to return.
*/
int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata);
/**
* Attach the decoded AVDOVIMetadata as side data to an AVFrame.
* Returns 0 or a negative error code.
*/
int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame);

40
libavcodec/dovi_rpudec.c
View File

@ -30,10 +30,8 @@
#include "get_bits.h"
#include "refstruct.h"
int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame)
int ff_dovi_get_metadata(DOVIContext *s, AVDOVIMetadata **out_metadata)
{
AVFrameSideData *sd;
AVBufferRef *buf;
AVDOVIMetadata *dovi;
size_t dovi_size, ext_sz;
@ -44,7 +42,32 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame)
if (!dovi)
return AVERROR(ENOMEM);
buf = av_buffer_create((uint8_t *) dovi, dovi_size, NULL, NULL, 0);
/* Copy only the parts of these structs known to us at compiler-time. */
#define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last))
COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, ext_mapping_idc_5_7);
COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots);
COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal);
ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size);
for (int i = 0; i < s->num_ext_blocks; i++)
memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz);
dovi->num_ext_blocks = s->num_ext_blocks;
*out_metadata = dovi;
return dovi_size;
}
int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame)
{
AVFrameSideData *sd;
AVDOVIMetadata *dovi;
AVBufferRef *buf;
int size;
size = ff_dovi_get_metadata(s, &dovi);
if (size <= 0)
return size;
buf = av_buffer_create((uint8_t *) dovi, size, NULL, NULL, 0);
if (!buf) {
av_free(dovi);
return AVERROR(ENOMEM);
@ -56,15 +79,6 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame)
return AVERROR(ENOMEM);
}
/* Copy only the parts of these structs known to us at compiler-time. */
#define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last))
COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, ext_mapping_idc_5_7);
COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots);
COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal);
ext_sz = FFMIN(sizeof(AVDOVIDmData), dovi->ext_block_size);
for (int i = 0; i < s->num_ext_blocks; i++)
memcpy(av_dovi_get_ext(dovi, i), &s->ext_blocks[i], ext_sz);
dovi->num_ext_blocks = s->num_ext_blocks;
return 0;
}