@@ -28,6 +28,7 @@
#include "config_components.h"
#include "riff.h"
#include "mpegts.h"
+#include "rawutils.h"
#include "libavformat/avlanguage.h"
#include "libavutil/avstring.h"
#include "libavutil/avutil.h"
@@ -901,33 +901,6 @@ int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int
*/
int ff_standardize_creation_time(AVFormatContext *s);
-#define CONTAINS_PAL 2
-/**
- * Reshuffles the lines to use the user specified stride.
- *
- * @param ppkt input and output packet
- * @return negative error code or
- * 0 if no new packet was allocated
- * non-zero if a new packet was allocated and ppkt has to be freed
- * CONTAINS_PAL if in addition to a new packet the old contained a palette
- */
-int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecParameters *par, 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 packet before calling ff_reshuffle_raw_rgb()
- * @param ret return value from ff_reshuffle_raw_rgb(), or 0
- * @param palette pointer to palette buffer
- * @return negative error code or
- * 1 if the packet has a palette, else 0
- */
-int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t *palette);
-
struct AVBPrint;
/**
* Finalize buf into extradata and set its size appropriately.
@@ -62,6 +62,7 @@
#include "mov_chan.h"
#include "movenc_ttml.h"
#include "mux.h"
+#include "rawutils.h"
#include "ttmlenc.h"
#include "version.h"
#include "vpcc.h"
@@ -19,8 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/intreadwrite.h"
+#include "libavcodec/packet.h"
#include "avformat.h"
-#include "internal.h"
+#include "rawutils.h"
int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecParameters *par, int expected_stride)
{
@@ -65,3 +67,27 @@ fail:
return ret;
}
+
+int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t *palette)
+{
+ uint8_t *side_data;
+ size_t size;
+
+ side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_PALETTE, &size);
+ if (side_data) {
+ if (size != AVPALETTE_SIZE) {
+ av_log(s, AV_LOG_ERROR, "Invalid palette side data\n");
+ return AVERROR_INVALIDDATA;
+ }
+ memcpy(palette, side_data, AVPALETTE_SIZE);
+ return 1;
+ }
+
+ if (ret == CONTAINS_PAL) {
+ for (int i = 0; i < AVPALETTE_COUNT; i++)
+ palette[i] = AV_RL32(pkt->data + pkt->size - AVPALETTE_SIZE + i*4);
+ return 1;
+ }
+
+ return 0;
+}
new file mode 100644
@@ -0,0 +1,56 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_RAWUTILS_H
+#define AVFORMAT_RAWUTILS_H
+
+#include <stdint.h>
+#include "libavcodec/codec_par.h"
+#include "libavcodec/packet.h"
+#include "avformat.h"
+
+#define CONTAINS_PAL 2
+/**
+ * Reshuffles the lines to use the user specified stride.
+ *
+ * @param ppkt input and output packet
+ * @return negative error code or
+ * 0 if no new packet was allocated
+ * non-zero if a new packet was allocated and ppkt has to be freed
+ * CONTAINS_PAL if in addition to a new packet the old contained a palette
+ */
+int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecParameters *par, 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 packet before calling ff_reshuffle_raw_rgb()
+ * @param ret return value from ff_reshuffle_raw_rgb(), or 0
+ * @param palette pointer to palette buffer
+ * @return negative error code or
+ * 1 if the packet has a palette, else 0
+ */
+int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t *palette);
+
+#endif /* AVFORMAT_RAWUTILS_H */
@@ -1715,30 +1715,6 @@ int ff_standardize_creation_time(AVFormatContext *s)
return ret;
}
-int ff_get_packet_palette(AVFormatContext *s, AVPacket *pkt, int ret, uint32_t *palette)
-{
- uint8_t *side_data;
- size_t size;
-
- side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_PALETTE, &size);
- if (side_data) {
- if (size != AVPALETTE_SIZE) {
- av_log(s, AV_LOG_ERROR, "Invalid palette side data\n");
- return AVERROR_INVALIDDATA;
- }
- memcpy(palette, side_data, AVPALETTE_SIZE);
- return 1;
- }
-
- if (ret == CONTAINS_PAL) {
- for (int i = 0; i < AVPALETTE_COUNT; i++)
- palette[i] = AV_RL32(pkt->data + pkt->size - AVPALETTE_SIZE + i*4);
- return 1;
- }
-
- return 0;
-}
-
int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint *buf)
{
int ret;
ff_get_packet_palette() and ff_reshuffle_raw_rgb() belong together: E.g. the former takes the return value of the latter as argument. So move ff_get_packet_palette() to rawutils.c (which consists solely of ff_reshuffle_raw_rgb()). Also add a separate header for these two functions. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavformat/avienc.c | 1 + libavformat/internal.h | 27 -------------------- libavformat/movenc.c | 1 + libavformat/rawutils.c | 28 ++++++++++++++++++++- libavformat/rawutils.h | 56 ++++++++++++++++++++++++++++++++++++++++++ libavformat/utils.c | 24 ------------------ 6 files changed, 85 insertions(+), 52 deletions(-) create mode 100644 libavformat/rawutils.h