Moving these type to avutil - analog to e.g. samplefmt, pixfmt
Signed-off-by: softworkz <softwo...@hotmail.com>
---
libavutil/Makefile | 2 +
libavutil/subfmt.c | 78 ++++++++++++++++++++++++++++
libavutil/subfmt.h | 125 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 205 insertions(+)
create mode 100644 libavutil/subfmt.c
create mode 100644 libavutil/subfmt.h
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 410ac636f7..04e1101bf3 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -74,6 +74,7 @@ HEADERS = adler32.h
\
sha512.h \
spherical.h \
stereo3d.h \
+ subfmt.h \
threadmessage.h \
time.h \
timecode.h \
@@ -159,6 +160,7 @@ OBJS = adler32.o
\
slicethread.o \
spherical.o \
stereo3d.o \
+ subfmt.o \
threadmessage.o \
time.o \
timecode.o \
diff --git a/libavutil/subfmt.c b/libavutil/subfmt.c
new file mode 100644
index 0000000000..8476c1a15d
--- /dev/null
+++ b/libavutil/subfmt.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2021 softworkz
+ *
+ * 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
+ */
+
+#include <string.h>
+#include "common.h"
+#include "subfmt.h"
+
+typedef struct SubtitleFmtInfo {
+ enum AVSubtitleType fmt;
+ char* name;
+} SubtitleFmtInfo;
+
+static const SubtitleFmtInfo sub_fmt_info[AV_SUBTITLE_FMT_NB] = {
+ {.fmt = AV_SUBTITLE_FMT_UNKNOWN, .name = "Unknown subtitle format", },
+ {.fmt = AV_SUBTITLE_FMT_BITMAP, .name = "Graphical subtitles", },
+ {.fmt = AV_SUBTITLE_FMT_TEXT, .name = "Text subtitles (plain)", },
+ {.fmt = AV_SUBTITLE_FMT_ASS, .name = "Text subtitles (ass)", },
+};
+
+const char *av_get_subtitle_fmt_name(enum AVSubtitleType sub_fmt)
+{
+ if (sub_fmt < 0 || sub_fmt >= AV_SUBTITLE_FMT_NB)
+ return NULL;
+ return sub_fmt_info[sub_fmt].name;
+}
+
+enum AVSubtitleType av_get_subtitle_fmt(const char *name)
+{
+ int i;
+
+ for (i = 0; i < AV_SUBTITLE_FMT_NB; i++)
+ if (!strcmp(sub_fmt_info[i].name, name))
+ return i;
+ return AV_SUBTITLE_FMT_NONE;
+}
+
+
+void avsubtitle_free(AVSubtitle *sub)
+{
+ unsigned i;
+
+ for (i = 0; i < sub->num_rects; i++) {
+ av_freep(&sub->rects[i]->data[0]);
+ av_freep(&sub->rects[i]->data[1]);
+ av_freep(&sub->rects[i]->data[2]);
+ av_freep(&sub->rects[i]->data[3]);
+ av_freep(&sub->rects[i]->text);
+ av_freep(&sub->rects[i]->ass);
+ av_freep(&sub->rects[i]);
+ }
+
+ av_freep(&sub->rects);
+
+ memset(sub, 0, sizeof(*sub));
+}
+
+void avsubtitle_free_ref(void *opaque, uint8_t *data)
+{
+ avsubtitle_free((AVSubtitle *)data);
+}
+
diff --git a/libavutil/subfmt.h b/libavutil/subfmt.h
new file mode 100644
index 0000000000..c6544433d0
--- /dev/null
+++ b/libavutil/subfmt.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2021 softworkz
+ *
+ * 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 AVUTIL_SUBFMT_H
+#define AVUTIL_SUBFMT_H
+
+#include <inttypes.h>
+
+#include "attributes.h"
+
+enum AVSubtitleType {
+
+ /**
+ * Subtitle format unknown.
+ */
+ AV_SUBTITLE_FMT_NONE = -1,
+
+ /**
+ * Subtitle format unknown.
+ */
+ AV_SUBTITLE_FMT_UNKNOWN = 0,
+
+ /**
+ * Bitmap area in AVSubtitleRect.data, pixfmt AV_PIX_FMT_PAL8.
+ */
+ AV_SUBTITLE_FMT_BITMAP = 1,
+
+ /**
+ * Plain text in AVSubtitleRect.text.
+ */
+ AV_SUBTITLE_FMT_TEXT = 2,
+
+ /**
+ * Text Formatted as per ASS specification, contained AVSubtitleRect.ass.
+ */
+ AV_SUBTITLE_FMT_ASS = 3,
+
+ AV_SUBTITLE_FMT_NB,
+};
+
+typedef struct AVSubtitleRect {
+ int x; ///< top left corner of pict, undefined when pict is not
set
+ int y; ///< top left corner of pict, undefined when pict is not
set
+ int w; ///< width of pict, undefined when pict is not
set
+ int h; ///< height of pict, undefined when pict is not
set
+ int nb_colors; ///< number of colors in pict, undefined when pict is not
set
+
+ /**
+ * data+linesize for the bitmap of this subtitle.
+ */
+ uint8_t *data[4];
+ int linesize[4];
+
+ enum AVSubtitleType type;
+
+ char *text; ///< 0 terminated plain UTF-8 text
+
+ /**
+ * 0-terminated ASS/SSA compatible event line.
+ */
+ char *ass;
+
+ int flags;
+} AVSubtitleRect;
+
+typedef struct AVSubtitle {
+ enum AVSubtitleType format;
+ uint32_t start_display_time; /* relative to packet pts, in ms */
+ uint32_t end_display_time; /* relative to packet pts, in ms */
+ unsigned num_rects;
+ AVSubtitleRect **rects;
+ int64_t pts; ///< Same as packet pts, in AV_TIME_BASE
+
+ /**
+ * Header containing style information for text subtitles.
+ */
+ char *header;
+} AVSubtitle;
+
+/**
+ * Return the name of sub_fmt, or NULL if sub_fmt is not
+ * recognized.
+ */
+const char *av_get_subtitle_fmt_name(enum AVSubtitleType sub_fmt);
+
+/**
+ * Return a subtitle format corresponding to name, or AV_SUBTITLE_FMT_NONE
+ * on error.
+ */
+enum AVSubtitleType av_get_subtitle_fmt(const char *name);
+
+/**
+ * Free all allocated data in the given subtitle struct.
+ *
+ * @param sub AVSubtitle to free.
+ */
+void avsubtitle_free(AVSubtitle *sub);
+
+/**
+ * Free subtitle (for use with av_buffer)
+ *
+ * @param opaque unused
+ * @param data AVSubtitle to free.
+ */
+void avsubtitle_free_ref(void *opaque, uint8_t *data);
+
+
+#endif /* AVUTIL_SUBFMT_H */
--
2.30.2.windows.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
