---
libavcodec/allcodecs.c | 2 -
libavcodec/bitstream_filters.c | 8 ++++
libavcodec/movsub_bsf.c | 96 +++++++++++++++++++++++++++++-------------
3 files changed, 75 insertions(+), 31 deletions(-)
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index bae94ba..8a545db 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -538,8 +538,6 @@ void avcodec_register_all(void)
REGISTER_PARSER(VP8, vp8);
/* bitstream filters */
- REGISTER_BSF(MOV2TEXTSUB, mov2textsub);
REGISTER_BSF(NOISE, noise);
REGISTER_BSF(REMOVE_EXTRADATA, remove_extradata);
- REGISTER_BSF(TEXT2MOVSUB, text2movsub);
}
diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c
index 16fbc98..0b2e1a4 100644
--- a/libavcodec/bitstream_filters.c
+++ b/libavcodec/bitstream_filters.c
@@ -32,6 +32,8 @@ extern const AVBitStreamFilter ff_hevc_mp4toannexb_bsf;
extern const AVBitStreamFilter ff_imx_dump_header_bsf;
extern const AVBitStreamFilter ff_mjpeg2jpeg_bsf;
extern const AVBitStreamFilter ff_mjpega_dump_header_bsf;
+extern const AVBitStreamFilter ff_mov2textsub_bsf;
+extern const AVBitStreamFilter ff_text2movsub_bsf;
static const AVBitStreamFilter *bitstream_filters[] = {
#if CONFIG_AAC_ADTSTOASC_BSF
@@ -58,6 +60,12 @@ static const AVBitStreamFilter *bitstream_filters[] = {
#if CONFIG_MJPEGA_DUMP_HEADER_BSF
&ff_mjpeg2jpeg_bsf,
#endif
+#if CONFIG_MOV2TEXTSUB_BSF
+ &ff_mov2textsub_bsf,
+#endif
+#if CONFIG_TEXT2MOVSUB_BSF
+ &ff_text2movsub_bsf,
+#endif
NULL,
};
diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index 0484303..fc6b236 100644
--- a/libavcodec/movsub_bsf.c
+++ b/libavcodec/movsub_bsf.c
@@ -21,41 +21,79 @@
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
+#include "bsf.h"
+static int text2movsub(AVBSFContext *ctx, AVPacket *out)
+{
+ AVPacket *in;
+ int ret = 0;
-static int text2movsub(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx,
const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- if (buf_size > 0xffff) return 0;
- *poutbuf_size = buf_size + 2;
- *poutbuf = av_malloc(*poutbuf_size + AV_INPUT_BUFFER_PADDING_SIZE);
- if (!*poutbuf)
- return AVERROR(ENOMEM);
- AV_WB16(*poutbuf, buf_size);
- memcpy(*poutbuf + 2, buf, buf_size);
- return 1;
+ ret = ff_bsf_get_packet(ctx, &in);
+ if (ret < 0)
+ return ret;
+
+ if (in->size > 0xffff) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ ret = av_new_packet(out, in->size + 2);
+ if (ret < 0) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ ret = av_packet_copy_props(out, in);
+ if (ret < 0)
+ goto fail;
+
+ AV_WB16(out->data, in->size);
+ memcpy(out->data + 2, in->data, in->size);
+
+fail:
+ if (ret < 0)
+ av_packet_unref(out);
+ av_packet_free(&in);
+ return ret;
}
-AVBitStreamFilter ff_text2movsub_bsf={
- "text2movsub",
- 0,
- text2movsub,
+const AVBitStreamFilter ff_text2movsub_bsf = {
+ .name = "text2movsub",
+ .filter = text2movsub,
};
-static int mov2textsub(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx,
const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- if (buf_size < 2) return 0;
- *poutbuf_size = FFMIN(buf_size - 2, AV_RB16(buf));
- *poutbuf = av_malloc(*poutbuf_size + AV_INPUT_BUFFER_PADDING_SIZE);
- if (!*poutbuf)
- return AVERROR(ENOMEM);
- memcpy(*poutbuf, buf + 2, *poutbuf_size);
- return 1;
+static int mov2textsub(AVBSFContext *ctx, AVPacket *out)
+{
+ AVPacket *in;
+ int ret = 0;
+
+ ret = ff_bsf_get_packet(ctx, &in);
+ if (ret < 0)
+ return ret;
+
+ if (in->size < 2) {
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+
+ ret = av_new_packet(out, FFMIN(in->size - 2, AV_RB16(in->data)));
+ if (ret < 0)
+ goto fail;
+
+ ret = av_packet_copy_props(out, in);
+ if (ret < 0)
+ goto fail;
+
+ memcpy(out->data, in->data + 2, out->size);
+
+fail:
+ if (ret < 0)
+ av_packet_unref(out);
+ av_packet_free(&in);
+ return ret;
}
-AVBitStreamFilter ff_mov2textsub_bsf={
- "mov2textsub",
- 0,
- mov2textsub,
+const AVBitStreamFilter ff_mov2textsub_bsf = {
+ .name = "mov2textsub",
+ .filter = mov2textsub,
};
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
