summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMats Peterson <matsp888@yahoo.com>2016-03-02 03:14:05 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-03-02 18:11:18 +0100
commit2be0366a7f5de926efac5a412268c824a6acbddf (patch)
treea0ac5db53e0bd200c70d2512a758e45d1bd5d538 /libavformat
parent554f6e930ce05a4c5449efcaae36bdafe2d9de74 (diff)
lavf/utils: Add ff_get_packet_palette()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/internal.h12
-rw-r--r--libavformat/utils.c16
2 files changed, 28 insertions, 0 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h
index bc6a6c2716..8e066552d2 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -573,4 +573,16 @@ int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int
*/
int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecContext *enc, int expected_stride);
+/**
+ * Retrieves the palette from a packet, either from side data, or
+ * appended to the video data in the packet itself (raw video only).
+ * It is commonly used after a call to ff_reshuffle_raw_rgb().
+ *
+ * Use 0 for the ret parameter to check for side data only.
+ *
+ * @param pkt pointer to the packet before calling ff_reshuffle_raw_rgb()
+ * @param ret return value from ff_reshuffle_raw_rgb(), or 0
+ */
+int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, const uint8_t **palette);
+
#endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/utils.c b/libavformat/utils.c
index fe2916ff97..771e878b75 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4759,3 +4759,19 @@ int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int
}
return 0;
}
+
+int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, const uint8_t **palette)
+{
+ int size;
+
+ *palette = av_packet_get_side_data(pkt, AV_PKT_DATA_PALETTE, &size);
+ if (*palette && size != AVPALETTE_SIZE) {
+ av_log(s, AV_LOG_ERROR, "Invalid palette side data\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (!*palette && ret == CONTAINS_PAL)
+ *palette = pkt->data + pkt->size - AVPALETTE_SIZE;
+
+ return 0;
+}