Commit 77eba7bd authored by Mark Thompson's avatar Mark Thompson

Merge commit 'a2ca8ed9'

* commit 'a2ca8ed9':
  cbs_h264: Add utility functions to insert/delete SEI messages
Merged-by: 's avatarMark Thompson <sw@jkqxz.net>
parents 0cc8e34a a2ca8ed9
......@@ -22,6 +22,7 @@
#include <stddef.h>
#include <stdint.h>
#include "cbs.h"
#include "cbs_h2645.h"
#include "h264.h"
......@@ -428,4 +429,22 @@ typedef struct CodedBitstreamH264Context {
} CodedBitstreamH264Context;
/**
* Add an SEI message to an access unit.
*/
int ff_cbs_h264_add_sei_message(CodedBitstreamContext *ctx,
CodedBitstreamFragment *access_unit,
const H264RawSEIPayload *payload);
/**
* Delete an SEI message from an access unit.
*
* Deletes from nal_unit, which must be an SEI NAL unit. If this is the
* last message in nal_unit, also deletes it from access_unit.
*/
int ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx,
CodedBitstreamFragment *access_unit,
CodedBitstreamUnit *nal_unit,
int position);
#endif /* AVCODEC_CBS_H264_H */
......@@ -1393,3 +1393,98 @@ const CodedBitstreamType ff_cbs_type_h265 = {
.close = &cbs_h265_close,
};
int ff_cbs_h264_add_sei_message(CodedBitstreamContext *ctx,
CodedBitstreamFragment *au,
const H264RawSEIPayload *payload)
{
H264RawSEI *sei;
CodedBitstreamUnit *nal = NULL;
int err, i;
// Find an existing SEI NAL unit to add to.
for (i = 0; i < au->nb_units; i++) {
if (au->units[i].type == H264_NAL_SEI) {
nal = &au->units[i];
break;
}
}
if (nal) {
sei = nal->content;
} else {
// Need to make a new SEI NAL unit. Insert it before the first
// slice data NAL unit; if no slice data, add at the end.
AVBufferRef *sei_ref;
sei = av_mallocz(sizeof(*sei));
if (!sei)
return AVERROR(ENOMEM);
sei->nal_unit_header.nal_unit_type = H264_NAL_SEI;
sei->nal_unit_header.nal_ref_idc = 0;
sei_ref = av_buffer_create((uint8_t*)sei, sizeof(*sei),
&cbs_h264_free_sei, ctx, 0);
if (!sei_ref) {
av_freep(&sei);
return AVERROR(ENOMEM);
}
for (i = 0; i < au->nb_units; i++) {
if (au->units[i].type == H264_NAL_SLICE ||
au->units[i].type == H264_NAL_IDR_SLICE)
break;
}
err = ff_cbs_insert_unit_content(ctx, au, i, H264_NAL_SEI,
sei, sei_ref);
av_buffer_unref(&sei_ref);
if (err < 0)
return err;
}
if (sei->payload_count >= H264_MAX_SEI_PAYLOADS) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Too many payloads in "
"SEI NAL unit.\n");
return AVERROR(EINVAL);
}
memcpy(&sei->payload[sei->payload_count], payload, sizeof(*payload));
++sei->payload_count;
return 0;
}
int ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx,
CodedBitstreamFragment *au,
CodedBitstreamUnit *nal,
int position)
{
H264RawSEI *sei = nal->content;
av_assert0(nal->type == H264_NAL_SEI);
av_assert0(position >= 0 && position < sei->payload_count);
if (position == 0 && sei->payload_count == 1) {
// Deleting NAL unit entirely.
int i;
for (i = 0; i < au->nb_units; i++) {
if (&au->units[i] == nal)
break;
}
av_assert0(i < au->nb_units && "NAL unit not in access unit.");
return ff_cbs_delete_unit(ctx, au, i);
} else {
cbs_h264_free_sei_payload(&sei->payload[position]);
--sei->payload_count;
memmove(sei->payload + position,
sei->payload + position + 1,
(sei->payload_count - position) * sizeof(*sei->payload));
return 0;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment