summaryrefslogtreecommitdiff
path: root/libavcodec/movsub_bsf.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-23 11:43:13 +0100
committerAnton Khirnov <anton@khirnov.net>2016-03-20 08:15:01 +0100
commit33d18982fa03feb061c8f744a4f0a9175c1f63ab (patch)
tree194f6383561b7acf3315eb7982c13aa95ff5ef67 /libavcodec/movsub_bsf.c
parenta2d1922bde8db2cdac95051918fe81ae18c0376b (diff)
downloadffmpeg-33d18982fa03feb061c8f744a4f0a9175c1f63ab.tar.gz
lavc: add a new bitstream filtering API
Deprecate the current bitstream filtering API.
Diffstat (limited to 'libavcodec/movsub_bsf.c')
-rw-r--r--libavcodec/movsub_bsf.c96
1 files changed, 67 insertions, 29 deletions
diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c
index 0484303840..fc6b2365e9 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,
};