#include "h264_sei.h"
#include "h2645_parse.h"
#include "hevc.h"
+#include "hevc_sei.h"
static int cbs_read_ue_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc,
- const char *name, uint32_t *write_to,
+ const char *name, const int *subscripts,
+ uint32_t *write_to,
uint32_t range_min, uint32_t range_max)
{
uint32_t value;
--value;
if (ctx->trace_enable)
- ff_cbs_trace_syntax_element(ctx, position, name, bits, value);
+ ff_cbs_trace_syntax_element(ctx, position, name, subscripts,
+ bits, value);
if (value < range_min || value > range_max) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "%s out of range: "
}
static int cbs_read_se_golomb(CodedBitstreamContext *ctx, GetBitContext *gbc,
- const char *name, int32_t *write_to,
+ const char *name, const int *subscripts,
+ int32_t *write_to,
int32_t range_min, int32_t range_max)
{
int32_t value;
value = v / 2;
if (ctx->trace_enable)
- ff_cbs_trace_syntax_element(ctx, position, name, bits, value);
+ ff_cbs_trace_syntax_element(ctx, position, name, subscripts,
+ bits, value);
if (value < range_min || value > range_max) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "%s out of range: "
}
static int cbs_write_ue_golomb(CodedBitstreamContext *ctx, PutBitContext *pbc,
- const char *name, uint32_t value,
+ const char *name, const int *subscripts,
+ uint32_t value,
uint32_t range_min, uint32_t range_max)
{
int len;
bits[len + i + 1] = (value + 1) >> (len - i - 1) & 1 ? '1' : '0';
bits[len + len + 1] = 0;
- ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc), name, bits, value);
+ ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc),
+ name, subscripts, bits, value);
}
put_bits(pbc, len, 0);
}
static int cbs_write_se_golomb(CodedBitstreamContext *ctx, PutBitContext *pbc,
- const char *name, int32_t value,
+ const char *name, const int *subscripts,
+ int32_t value,
int32_t range_min, int32_t range_max)
{
int len;
bits[len + i + 1] = (uvalue + 1) >> (len - i - 1) & 1 ? '1' : '0';
bits[len + len + 1] = 0;
- ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc), name, bits, value);
+ ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc),
+ name, subscripts, bits, value);
}
put_bits(pbc, len, 0);
#define FUNC_H264(rw, name) FUNC_NAME(rw, h264, name)
#define FUNC_H265(rw, name) FUNC_NAME(rw, h265, name)
+#define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL)
+
+#define u(width, name, range_min, range_max) \
+ xu(width, name, current->name, range_min, range_max, 0)
+#define flag(name) u(1, name, 0, 1)
+#define ue(name, range_min, range_max) \
+ xue(name, current->name, range_min, range_max, 0)
+#define se(name, range_min, range_max) \
+ xse(name, current->name, range_min, range_max, 0)
+
+#define us(width, name, range_min, range_max, subs, ...) \
+ xu(width, name, current->name, range_min, range_max, subs, __VA_ARGS__)
+#define flags(name, subs, ...) \
+ xu(1, name, current->name, 0, 1, subs, __VA_ARGS__)
+#define ues(name, range_min, range_max, subs, ...) \
+ xue(name, current->name, range_min, range_max, subs, __VA_ARGS__)
+#define ses(name, range_min, range_max, subs, ...) \
+ xse(name, current->name, range_min, range_max, subs, __VA_ARGS__)
+
+#define fixed(width, name, value) do { \
+ av_unused uint32_t fixed_value = value; \
+ xu(width, name, fixed_value, value, value, 0); \
+ } while (0)
+
#define READ
#define READWRITE read
#define RWContext GetBitContext
-#define xu(width, name, var, range_min, range_max) do { \
+#define xu(width, name, var, range_min, range_max, subs, ...) do { \
uint32_t value = range_min; \
CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), \
&value, range_min, range_max)); \
var = value; \
} while (0)
-#define xue(name, var, range_min, range_max) do { \
+#define xue(name, var, range_min, range_max, subs, ...) do { \
uint32_t value = range_min; \
CHECK(cbs_read_ue_golomb(ctx, rw, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), \
&value, range_min, range_max)); \
var = value; \
} while (0)
-#define xse(name, var, range_min, range_max) do { \
+#define xse(name, var, range_min, range_max, subs, ...) do { \
int32_t value = range_min; \
CHECK(cbs_read_se_golomb(ctx, rw, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), \
&value, range_min, range_max)); \
var = value; \
} while (0)
-#define u(width, name, range_min, range_max) \
- xu(width, name, current->name, range_min, range_max)
-#define flag(name) u(1, name, 0, 1)
-#define ue(name, range_min, range_max) \
- xue(name, current->name, range_min, range_max)
-#define se(name, range_min, range_max) \
- xse(name, current->name, range_min, range_max)
-
#define infer(name, value) do { \
current->name = value; \
} while (0)
#define byte_alignment(rw) (get_bits_count(rw) % 8)
#define allocate(name, size) do { \
- name ## _ref = av_buffer_allocz(size); \
+ name ## _ref = av_buffer_allocz(size + \
+ AV_INPUT_BUFFER_PADDING_SIZE); \
if (!name ## _ref) \
return AVERROR(ENOMEM); \
name = name ## _ref->data; \
#undef xu
#undef xue
#undef xse
-#undef u
-#undef flag
-#undef ue
-#undef se
#undef infer
#undef more_rbsp_data
#undef byte_alignment
#define READWRITE write
#define RWContext PutBitContext
-#define xu(width, name, var, range_min, range_max) do { \
+#define xu(width, name, var, range_min, range_max, subs, ...) do { \
uint32_t value = var; \
CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), \
value, range_min, range_max)); \
} while (0)
-#define xue(name, var, range_min, range_max) do { \
+#define xue(name, var, range_min, range_max, subs, ...) do { \
uint32_t value = var; \
CHECK(cbs_write_ue_golomb(ctx, rw, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), \
value, range_min, range_max)); \
} while (0)
-#define xse(name, var, range_min, range_max) do { \
+#define xse(name, var, range_min, range_max, subs, ...) do { \
int32_t value = var; \
CHECK(cbs_write_se_golomb(ctx, rw, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), \
value, range_min, range_max)); \
} while (0)
-#define u(width, name, range_min, range_max) \
- xu(width, name, current->name, range_min, range_max)
-#define flag(name) u(1, name, 0, 1)
-#define ue(name, range_min, range_max) \
- xue(name, current->name, range_min, range_max)
-#define se(name, range_min, range_max) \
- xse(name, current->name, range_min, range_max)
-
#define infer(name, value) do { \
if (current->name != (value)) { \
av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \
switch (payload->payload_type) {
case H264_SEI_TYPE_BUFFERING_PERIOD:
case H264_SEI_TYPE_PIC_TIMING:
+ case H264_SEI_TYPE_PAN_SCAN_RECT:
case H264_SEI_TYPE_RECOVERY_POINT:
case H264_SEI_TYPE_DISPLAY_ORIENTATION:
+ case H264_SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME:
break;
case H264_SEI_TYPE_USER_DATA_REGISTERED:
av_buffer_unref(&payload->payload.user_data_registered.data_ref);
av_freep(&content);
}
+static void cbs_h265_free_sei_payload(H265RawSEIPayload *payload)
+{
+ switch (payload->payload_type) {
+ case HEVC_SEI_TYPE_BUFFERING_PERIOD:
+ case HEVC_SEI_TYPE_PICTURE_TIMING:
+ case HEVC_SEI_TYPE_PAN_SCAN_RECT:
+ case HEVC_SEI_TYPE_RECOVERY_POINT:
+ case HEVC_SEI_TYPE_DISPLAY_ORIENTATION:
+ case HEVC_SEI_TYPE_ACTIVE_PARAMETER_SETS:
+ case HEVC_SEI_TYPE_DECODED_PICTURE_HASH:
+ case HEVC_SEI_TYPE_TIME_CODE:
+ case HEVC_SEI_TYPE_MASTERING_DISPLAY_INFO:
+ case HEVC_SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO:
+ case HEVC_SEI_TYPE_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
+ break;
+ case HEVC_SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35:
+ av_buffer_unref(&payload->payload.user_data_registered.data_ref);
+ break;
+ case HEVC_SEI_TYPE_USER_DATA_UNREGISTERED:
+ av_buffer_unref(&payload->payload.user_data_unregistered.data_ref);
+ break;
+ default:
+ av_buffer_unref(&payload->payload.other.data_ref);
+ break;
+ }
+}
+
+static void cbs_h265_free_sei(void *unit, uint8_t *content)
+{
+ H265RawSEI *sei = (H265RawSEI*)content;
+ int i;
+ for (i = 0; i < sei->payload_count; i++)
+ cbs_h265_free_sei_payload(&sei->payload[i]);
+ av_freep(&content);
+}
+
static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx,
CodedBitstreamFragment *frag,
const H2645Packet *packet)
for (i = 0; i < packet->nb_nals; i++) {
const H2645NAL *nal = &packet->nals[i];
size_t size = nal->size;
- uint8_t *data;
// Remove trailing zeroes.
while (size > 0 && nal->data[size - 1] == 0)
--size;
av_assert0(size > 0);
- data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
- if (!data)
- return AVERROR(ENOMEM);
- memcpy(data, nal->data, size);
- memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ if (nal->data == nal->raw_data) {
+ err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type,
+ (uint8_t*)nal->data, size, frag->data_ref);
+ if (err < 0)
+ return err;
+ } else {
+ uint8_t *data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!data)
+ return AVERROR(ENOMEM);
+ memcpy(data, nal->data, size);
+ memset(data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
- err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type,
- data, size, NULL);
- if (err < 0) {
- av_freep(&data);
- return err;
+ err = ff_cbs_insert_unit_data(ctx, frag, -1, nal->type,
+ data, size, NULL);
+ if (err < 0) {
+ av_freep(&data);
+ return err;
+ }
}
}
#define cbs_h2645_replace_ps(h26n, ps_name, ps_var, id_element) \
static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \
- const H26 ## h26n ## Raw ## ps_name *ps_var) \
+ CodedBitstreamUnit *unit) \
{ \
CodedBitstreamH26 ## h26n ## Context *priv = ctx->priv_data; \
+ H26 ## h26n ## Raw ## ps_name *ps_var = unit->content; \
unsigned int id = ps_var->id_element; \
if (id > FF_ARRAY_ELEMS(priv->ps_var)) { \
av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid " #ps_name \
} \
if (priv->ps_var[id] == priv->active_ ## ps_var) \
priv->active_ ## ps_var = NULL ; \
- av_freep(&priv->ps_var[id]); \
- priv->ps_var[id] = av_malloc(sizeof(*ps_var)); \
- if (!priv->ps_var[id]) \
+ av_buffer_unref(&priv->ps_var ## _ref[id]); \
+ if (unit->content_ref) \
+ priv->ps_var ## _ref[id] = av_buffer_ref(unit->content_ref); \
+ else \
+ priv->ps_var ## _ref[id] = av_buffer_alloc(sizeof(*ps_var)); \
+ if (!priv->ps_var ## _ref[id]) \
return AVERROR(ENOMEM); \
- memcpy(priv->ps_var[id], ps_var, sizeof(*ps_var)); \
+ priv->ps_var[id] = (H26 ## h26n ## Raw ## ps_name *)priv->ps_var ## _ref[id]->data; \
+ if (!unit->content_ref) \
+ memcpy(priv->ps_var[id], ps_var, sizeof(*ps_var)); \
return 0; \
}
if (err < 0)
return err;
- err = cbs_h264_replace_sps(ctx, sps);
+ err = cbs_h264_replace_sps(ctx, unit);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h264_replace_pps(ctx, pps);
+ err = cbs_h264_replace_pps(ctx, unit);
if (err < 0)
return err;
}
}
slice->data_size = len - pos / 8;
- slice->data_ref = av_buffer_alloc(slice->data_size +
- AV_INPUT_BUFFER_PADDING_SIZE);
+ slice->data_ref = av_buffer_ref(unit->data_ref);
if (!slice->data_ref)
return AVERROR(ENOMEM);
- slice->data = slice->data_ref->data;
- memcpy(slice->data,
- unit->data + pos / 8, slice->data_size);
- memset(slice->data + slice->data_size, 0,
- AV_INPUT_BUFFER_PADDING_SIZE);
+ slice->data = unit->data + pos / 8;
slice->data_bit_start = pos % 8;
}
break;
}
break;
+ case H264_NAL_END_SEQUENCE:
+ case H264_NAL_END_STREAM:
+ {
+ err = ff_cbs_alloc_unit_content(ctx, unit,
+ sizeof(H264RawNALUnitHeader),
+ NULL);
+ if (err < 0)
+ return err;
+
+ err = (unit->type == H264_NAL_END_SEQUENCE ?
+ cbs_h264_read_end_of_sequence :
+ cbs_h264_read_end_of_stream)(ctx, &gbc, unit->content);
+ if (err < 0)
+ return err;
+ }
+ break;
+
default:
return AVERROR(ENOSYS);
}
if (err < 0)
return err;
- err = cbs_h265_replace_vps(ctx, vps);
+ err = cbs_h265_replace_vps(ctx, unit);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h265_replace_sps(ctx, sps);
+ err = cbs_h265_replace_sps(ctx, unit);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h265_replace_pps(ctx, pps);
+ err = cbs_h265_replace_pps(ctx, unit);
if (err < 0)
return err;
}
}
slice->data_size = len - pos / 8;
- slice->data_ref = av_buffer_alloc(slice->data_size +
- AV_INPUT_BUFFER_PADDING_SIZE);
+ slice->data_ref = av_buffer_ref(unit->data_ref);
if (!slice->data_ref)
return AVERROR(ENOMEM);
- slice->data = slice->data_ref->data;
- memcpy(slice->data,
- unit->data + pos / 8, slice->data_size);
- memset(slice->data + slice->data_size, 0,
- AV_INPUT_BUFFER_PADDING_SIZE);
+ slice->data = unit->data + pos / 8;
slice->data_bit_start = pos % 8;
}
break;
}
break;
+ case HEVC_NAL_SEI_PREFIX:
+ case HEVC_NAL_SEI_SUFFIX:
+ {
+ err = ff_cbs_alloc_unit_content(ctx, unit, sizeof(H265RawSEI),
+ &cbs_h265_free_sei);
+
+ if (err < 0)
+ return err;
+
+ err = cbs_h265_read_sei(ctx, &gbc, unit->content,
+ unit->type == HEVC_NAL_SEI_PREFIX);
+
+ if (err < 0)
+ return err;
+ }
+ break;
+
default:
return AVERROR(ENOSYS);
}
return 0;
}
+static int cbs_h2645_write_slice_data(CodedBitstreamContext *ctx,
+ PutBitContext *pbc, const uint8_t *data,
+ size_t data_size, int data_bit_start)
+{
+ size_t rest = data_size - (data_bit_start + 7) / 8;
+ const uint8_t *pos = data + data_bit_start / 8;
+
+ av_assert0(data_bit_start >= 0 &&
+ 8 * data_size > data_bit_start);
+
+ if (data_size * 8 + 8 > put_bits_left(pbc))
+ return AVERROR(ENOSPC);
+
+ if (!rest)
+ goto rbsp_stop_one_bit;
+
+ // First copy the remaining bits of the first byte
+ // The above check ensures that we do not accidentally
+ // copy beyond the rbsp_stop_one_bit.
+ if (data_bit_start % 8)
+ put_bits(pbc, 8 - data_bit_start % 8,
+ *pos++ & MAX_UINT_BITS(8 - data_bit_start % 8));
+
+ if (put_bits_count(pbc) % 8 == 0) {
+ // If the writer is aligned at this point,
+ // memcpy can be used to improve performance.
+ // This happens normally for CABAC.
+ flush_put_bits(pbc);
+ memcpy(put_bits_ptr(pbc), pos, rest);
+ skip_put_bytes(pbc, rest);
+ } else {
+ // If not, we have to copy manually.
+ // rbsp_stop_one_bit forces us to special-case
+ // the last byte.
+ uint8_t temp;
+ int i;
+
+ for (; rest > 4; rest -= 4, pos += 4)
+ put_bits32(pbc, AV_RB32(pos));
+
+ for (; rest > 1; rest--, pos++)
+ put_bits(pbc, 8, *pos);
+
+ rbsp_stop_one_bit:
+ temp = rest ? *pos : *pos & MAX_UINT_BITS(8 - data_bit_start % 8);
+
+ av_assert0(temp);
+ i = ff_ctz(*pos);
+ temp = temp >> i;
+ i = rest ? (8 - i) : (8 - i - data_bit_start % 8);
+ put_bits(pbc, i, temp);
+ if (put_bits_count(pbc) % 8)
+ put_bits(pbc, 8 - put_bits_count(pbc) % 8, 0);
+ }
+
+ return 0;
+}
+
static int cbs_h264_write_nal_unit(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit,
PutBitContext *pbc)
if (err < 0)
return err;
- err = cbs_h264_replace_sps(ctx, sps);
+ err = cbs_h264_replace_sps(ctx, unit);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h264_replace_pps(ctx, pps);
+ err = cbs_h264_replace_pps(ctx, unit);
if (err < 0)
return err;
}
case H264_NAL_AUXILIARY_SLICE:
{
H264RawSlice *slice = unit->content;
- GetBitContext gbc;
- int bits_left, end, zeroes;
err = cbs_h264_write_slice_header(ctx, pbc, &slice->header);
if (err < 0)
return err;
if (slice->data) {
- if (slice->data_size * 8 + 8 > put_bits_left(pbc))
- return AVERROR(ENOSPC);
-
- init_get_bits(&gbc, slice->data, slice->data_size * 8);
- skip_bits_long(&gbc, slice->data_bit_start);
-
- // Copy in two-byte blocks, but stop before copying the
- // rbsp_stop_one_bit in the final byte.
- while (get_bits_left(&gbc) > 23)
- put_bits(pbc, 16, get_bits(&gbc, 16));
-
- bits_left = get_bits_left(&gbc);
- end = get_bits(&gbc, bits_left);
-
- // rbsp_stop_one_bit must be present here.
- av_assert0(end);
- zeroes = ff_ctz(end);
- if (bits_left > zeroes + 1)
- put_bits(pbc, bits_left - zeroes - 1,
- end >> (zeroes + 1));
- put_bits(pbc, 1, 1);
- while (put_bits_count(pbc) % 8 != 0)
- put_bits(pbc, 1, 0);
+ err = cbs_h2645_write_slice_data(ctx, pbc, slice->data,
+ slice->data_size,
+ slice->data_bit_start);
+ if (err < 0)
+ return err;
} else {
// No slice data - that was just the header.
// (Bitstream may be unaligned!)
}
break;
+ case H264_NAL_END_SEQUENCE:
+ {
+ err = cbs_h264_write_end_of_sequence(ctx, pbc, unit->content);
+ if (err < 0)
+ return err;
+ }
+ break;
+
+ case H264_NAL_END_STREAM:
+ {
+ err = cbs_h264_write_end_of_stream(ctx, pbc, unit->content);
+ if (err < 0)
+ return err;
+ }
+ break;
+
default:
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write unimplemented for "
"NAL unit type %"PRIu32".\n", unit->type);
if (err < 0)
return err;
- err = cbs_h265_replace_vps(ctx, vps);
+ err = cbs_h265_replace_vps(ctx, unit);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h265_replace_sps(ctx, sps);
+ err = cbs_h265_replace_sps(ctx, unit);
if (err < 0)
return err;
}
if (err < 0)
return err;
- err = cbs_h265_replace_pps(ctx, pps);
+ err = cbs_h265_replace_pps(ctx, unit);
if (err < 0)
return err;
}
case HEVC_NAL_CRA_NUT:
{
H265RawSlice *slice = unit->content;
- GetBitContext gbc;
- int bits_left, end, zeroes;
err = cbs_h265_write_slice_segment_header(ctx, pbc, &slice->header);
if (err < 0)
return err;
if (slice->data) {
- if (slice->data_size * 8 + 8 > put_bits_left(pbc))
- return AVERROR(ENOSPC);
-
- init_get_bits(&gbc, slice->data, slice->data_size * 8);
- skip_bits_long(&gbc, slice->data_bit_start);
-
- // Copy in two-byte blocks, but stop before copying the
- // rbsp_stop_one_bit in the final byte.
- while (get_bits_left(&gbc) > 23)
- put_bits(pbc, 16, get_bits(&gbc, 16));
-
- bits_left = get_bits_left(&gbc);
- end = get_bits(&gbc, bits_left);
-
- // rbsp_stop_one_bit must be present here.
- av_assert0(end);
- zeroes = ff_ctz(end);
- if (bits_left > zeroes + 1)
- put_bits(pbc, bits_left - zeroes - 1,
- end >> (zeroes + 1));
- put_bits(pbc, 1, 1);
- while (put_bits_count(pbc) % 8 != 0)
- put_bits(pbc, 1, 0);
+ err = cbs_h2645_write_slice_data(ctx, pbc, slice->data,
+ slice->data_size,
+ slice->data_bit_start);
+ if (err < 0)
+ return err;
} else {
// No slice data - that was just the header.
}
}
break;
+ case HEVC_NAL_SEI_PREFIX:
+ case HEVC_NAL_SEI_SUFFIX:
+ {
+ err = cbs_h265_write_sei(ctx, pbc, unit->content,
+ unit->type == HEVC_NAL_SEI_PREFIX);
+
+ if (err < 0)
+ return err;
+ }
+ break;
+
default:
av_log(ctx->log_ctx, AV_LOG_ERROR, "Write unimplemented for "
"NAL unit type %"PRIu32".\n", unit->type);
av_freep(&h264->common.write_buffer);
for (i = 0; i < FF_ARRAY_ELEMS(h264->sps); i++)
- av_freep(&h264->sps[i]);
+ av_buffer_unref(&h264->sps_ref[i]);
for (i = 0; i < FF_ARRAY_ELEMS(h264->pps); i++)
- av_freep(&h264->pps[i]);
+ av_buffer_unref(&h264->pps_ref[i]);
}
static void cbs_h265_close(CodedBitstreamContext *ctx)
av_freep(&h265->common.write_buffer);
for (i = 0; i < FF_ARRAY_ELEMS(h265->vps); i++)
- av_freep(&h265->vps[i]);
+ av_buffer_unref(&h265->vps_ref[i]);
for (i = 0; i < FF_ARRAY_ELEMS(h265->sps); i++)
- av_freep(&h265->sps[i]);
+ av_buffer_unref(&h265->sps_ref[i]);
for (i = 0; i < FF_ARRAY_ELEMS(h265->pps); i++)
- av_freep(&h265->pps[i]);
+ av_buffer_unref(&h265->pps_ref[i]);
}
const CodedBitstreamType ff_cbs_type_h264 = {
projects / ffmpeg / blobdiff