@@ -474,6 +474,8 @@ av_cold int avcodec_close(AVCodecContext *avctx)
av_freep(&avctx->internal);
}
+ av_packet_side_data_set_free(&avctx->packet_side_data);
+
for (i = 0; i < avctx->nb_coded_side_data; i++)
av_freep(&avctx->coded_side_data[i].data);
av_freep(&avctx->coded_side_data);
@@ -2100,6 +2100,14 @@ typedef struct AVCodecContext {
* an error.
*/
int64_t frame_num;
+
+ /**
+ * Additional data associated with the entire stream.
+ *
+ * - decoding: set by user
+ * - encoding: unused
+ */
+ AVPacketSideDataSet packet_side_data;
} AVCodecContext;
/**
@@ -645,3 +645,106 @@ int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp)
return 0;
}
+
+AVPacketSideData *av_packet_side_data_set_get(const AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type)
+{
+ for (int i = 0; i < set->nb_sd; i++)
+ if (set->sd[i]->type == type)
+ return set->sd[i];
+
+ return NULL;
+}
+
+static int add_side_data_to_set(AVPacketSideDataSet *set,
+ AVPacketSideData **psd,
+ enum AVPacketSideDataType type,
+ uint8_t *data, size_t size)
+{
+ AVPacketSideData *sd, **tmp;
+
+ for (int i = 0; i < set->nb_sd; i++) {
+ sd = set->sd[i];
+
+ if (sd->type == type) {
+ av_freep(&sd->data);
+ sd->data = data;
+ sd->size = size;
+ *psd = sd;
+ return 0;
+ }
+ }
+
+ if (set->nb_sd + 1U > FFMIN(INT_MAX, SIZE_MAX / sizeof(*tmp)))
+ return AVERROR(ERANGE);
+
+ tmp = av_realloc_array(set->sd, set->nb_sd + 1, sizeof(*tmp));
+ if (!tmp)
+ return AVERROR(ENOMEM);
+
+ set->sd = tmp;
+
+ sd = av_mallocz(sizeof(*sd));
+ if (!sd)
+ return AVERROR(ENOMEM);
+
+ sd->type = type;
+ sd->data = data;
+ sd->size = size;
+
+ set->sd[set->nb_sd++] = sd;
+ *psd = sd;
+
+ return 0;
+}
+
+int av_packet_side_data_set_add(AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type,
+ uint8_t *data, size_t size)
+{
+ AVPacketSideData *sd;
+
+ return add_side_data_to_set(set, &sd, type, data, size);
+}
+
+AVPacketSideData *av_packet_side_data_set_new(AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type,
+ size_t size)
+{
+ AVPacketSideData *sd = NULL;
+ uint8_t *data = av_malloc(size);
+ int ret;
+
+ if (!data)
+ return NULL;
+
+ ret = add_side_data_to_set(set, &sd, type, data, size);
+ if (ret < 0)
+ av_freep(&data);
+
+ return sd;
+}
+
+void av_packet_side_data_set_remove(AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type)
+{
+ for (int i = set->nb_sd - 1; i >= 0; i--) {
+ AVPacketSideData *sd = set->sd[i];
+ if (sd->type != type)
+ continue;
+ av_free(set->sd[i]->data);
+ av_free(set->sd[i]);
+ set->sd[i] = set->sd[--set->nb_sd];
+ }
+}
+
+void av_packet_side_data_set_free(AVPacketSideDataSet *set)
+{
+ for (int i = 0; i < set->nb_sd; i++) {
+ av_free(set->sd[i]->data);
+ av_free(set->sd[i]);
+ }
+ set->nb_sd = 0;
+
+ av_freep(&set->sd);
+}
@@ -318,6 +318,14 @@ typedef struct AVPacketSideData {
enum AVPacketSideDataType type;
} AVPacketSideData;
+/**
+ * Structure to hold a set of AVPacketSideDataSet
+ */
+typedef struct AVPacketSideDataSet {
+ AVPacketSideData **sd;
+ int nb_sd;
+} AVPacketSideDataSet;
+
/**
* This structure stores compressed data. It is typically exported by demuxers
* and then passed as input to decoders, or received as output from encoders and
@@ -724,6 +732,62 @@ int av_packet_make_writable(AVPacket *pkt);
*/
void av_packet_rescale_ts(AVPacket *pkt, AVRational tb_src, AVRational tb_dst);
+/**
+ * Allocate a new side data entry into to a set.
+ *
+ * @param set a set to which the side data should be added
+ * @param type side data type
+ * @param size side data size
+ * @return pointer to freshly allocated side data entry or NULL otherwise.
+ */
+AVPacketSideData *av_packet_side_data_set_new(AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type,
+ size_t size);
+
+/**
+ * Wrap an existing array as a packet side data into a set.
+ *
+ * @param set a set to which the side data should be added
+ * @param type side information type
+ * @param data the side data array. It must be allocated with the av_malloc()
+ * family of functions. The ownership of the data is transferred to
+ * pkt.
+ * @param size side information size
+ * @return a non-negative number on success, a negative AVERROR code on
+ * failure. On failure, the set is unchanged and the data remains
+ * owned by the caller.
+ */
+int av_packet_side_data_set_add(AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type,
+ uint8_t *data, size_t size);
+
+/**
+ * Remove side data of the given type from a set.
+ *
+ * @param set a set from which the side data should be removed
+ * @param type side information type
+ */
+void av_packet_side_data_set_remove(AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type);
+
+/**
+ * Get side information from set.
+ *
+ * @param set a set from which the side data should be fetched
+ * @param type desired side information type
+ *
+ * @return pointer to side data if present or NULL otherwise
+ */
+AVPacketSideData *av_packet_side_data_set_get(const AVPacketSideDataSet *set,
+ enum AVPacketSideDataType type);
+
+/**
+ * Convenience function to free all the side data stored in a set.
+ *
+ * @param set the set to free
+ */
+void av_packet_side_data_set_free(AVPacketSideDataSet *set);
+
/**
* @}
*/
Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/avcodec.c | 2 + libavcodec/avcodec.h | 8 ++++ libavcodec/avpacket.c | 103 ++++++++++++++++++++++++++++++++++++++++++ libavcodec/packet.h | 64 ++++++++++++++++++++++++++ 4 files changed, 177 insertions(+)