---
libavcodec/allcodecs.c | 10 ----
libavcodec/bitstream_filters.c | 4 ++
libavcodec/remove_extradata_bsf.c | 110 +++++++++++++++++++++++++++++---------
3 files changed, 89 insertions(+), 35 deletions(-)
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 12786b7..f0b57d5 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -58,13 +58,6 @@
av_register_codec_parser(&ff_##x##_parser); \
}
-#define REGISTER_BSF(X, x) \
- { \
- extern AVBitStreamFilter ff_##x##_bsf; \
- if (CONFIG_##X##_BSF) \
- av_register_bitstream_filter(&ff_##x##_bsf); \
- }
-
void avcodec_register_all(void)
{
static int initialized;
@@ -536,7 +529,4 @@ void avcodec_register_all(void)
REGISTER_PARSER(VORBIS, vorbis);
REGISTER_PARSER(VP3, vp3);
REGISTER_PARSER(VP8, vp8);
-
- /* bitstream filters */
- REGISTER_BSF(REMOVE_EXTRADATA, remove_extradata);
}
diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c
index 7f9ddf6..d3872fe 100644
--- a/libavcodec/bitstream_filters.c
+++ b/libavcodec/bitstream_filters.c
@@ -35,6 +35,7 @@ extern const AVBitStreamFilter ff_mjpega_dump_header_bsf;
extern const AVBitStreamFilter ff_mov2textsub_bsf;
extern const AVBitStreamFilter ff_text2movsub_bsf;
extern const AVBitStreamFilter ff_noise_bsf;
+extern const AVBitStreamFilter ff_remove_extradata_bsf;
static const AVBitStreamFilter *bitstream_filters[] = {
#if CONFIG_AAC_ADTSTOASC_BSF
@@ -70,6 +71,9 @@ static const AVBitStreamFilter *bitstream_filters[] = {
#if CONFIG_NOISE_BSF
&ff_noise_bsf,
#endif
+#if CONFIG_REMOVE_EXTRADATA_BSF
+ &ff_remove_extradata_bsf,
+#endif
NULL,
};
diff --git a/libavcodec/remove_extradata_bsf.c
b/libavcodec/remove_extradata_bsf.c
index b82c867..a89fa06 100644
--- a/libavcodec/remove_extradata_bsf.c
+++ b/libavcodec/remove_extradata_bsf.c
@@ -18,39 +18,99 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/log.h"
+#include "libavutil/opt.h"
+
#include "avcodec.h"
+#include "bsf.h"
+enum RemoveFreq {
+ REMOVE_FREQ_KEYFRAME,
+ REMOVE_FREQ_ALL,
+};
-static int remove_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext
*avctx, const char *args,
- uint8_t **poutbuf, int *poutbuf_size,
- const uint8_t *buf, int buf_size, int keyframe){
- int cmd= args ? *args : 0;
- AVCodecParserContext *s;
+typedef struct RemoveExtradataContext {
+ const AVClass *class;
+ int freq;
- if(!bsfc->parser){
- bsfc->parser= av_parser_init(avctx->codec_id);
- }
- s= bsfc->parser;
-
- if(s && s->parser->split){
- if( (((avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ||
- (avctx->flags2 & AV_CODEC_FLAG2_LOCAL_HEADER)) && cmd == 'a')
- ||(!keyframe && cmd=='k')
- ||(cmd=='e' || !cmd)
- ){
- int i= s->parser->split(avctx, buf, buf_size);
- buf += i;
- buf_size -= i;
+ AVCodecParserContext *parser;
+ AVCodecContext *avctx;
+} RemoveExtradataContext;
+
+static int remove_extradata(AVBSFContext *ctx, AVPacket *out)
+{
+ RemoveExtradataContext *s = ctx->priv_data;
+
+ AVPacket *in;
+ int ret;
+
+ ret = ff_bsf_get_packet(ctx, &in);
+ if (ret < 0)
+ return ret;
+
+ if (s->parser && s->parser->parser->split) {
+ if (s->freq == REMOVE_FREQ_ALL ||
+ (s->freq == REMOVE_FREQ_KEYFRAME && in->flags & AV_PKT_FLAG_KEY)) {
+ int i = s->parser->parser->split(s->avctx, in->data, in->size);
+ in->data += i;
+ in->size -= i;
}
}
- *poutbuf= (uint8_t *) buf;
- *poutbuf_size= buf_size;
+
+ av_packet_move_ref(out, in);
+ av_packet_free(&in);
return 0;
}
-AVBitStreamFilter ff_remove_extradata_bsf={
- "remove_extra",
- 0,
- remove_extradata,
+static int remove_extradata_init(AVBSFContext *ctx)
+{
+ RemoveExtradataContext *s = ctx->priv_data;
+ int ret;
+
+ s->parser = av_parser_init(ctx->par_in->codec_id);
+
+ if (s->parser) {
+ s->avctx = avcodec_alloc_context3(NULL);
+ if (!s->avctx)
+ return AVERROR(ENOMEM);
+
+ ret = avcodec_parameters_to_context(s->avctx, ctx->par_in);
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+
+static void remove_extradata_close(AVBSFContext *ctx)
+{
+ RemoveExtradataContext *s = ctx->priv_data;
+
+ avcodec_free_context(&s->avctx);
+ av_parser_close(s->parser);
+}
+
+#define OFFSET(x) offsetof(RemoveExtradataContext, x)
+static const AVOption options[] = {
+ { "freq", NULL, OFFSET(freq), AV_OPT_TYPE_INT, { .i64 =
REMOVE_FREQ_KEYFRAME }, REMOVE_FREQ_KEYFRAME, REMOVE_FREQ_ALL, 0, "freq" },
+ { "keyframe", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
REMOVE_FREQ_KEYFRAME }, .unit = "freq" },
+ { "all", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_ALL
}, .unit = "freq" },
+ { NULL },
+};
+
+static const AVClass remove_extradata_class = {
+ .class_name = "remove_extradata",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+const AVBitStreamFilter ff_remove_extradata_bsf = {
+ .name = "remove_extra",
+ .priv_data_size = sizeof(RemoveExtradataContext),
+ .priv_class = &remove_extradata_class,
+ .init = remove_extradata_init,
+ .close = remove_extradata_close,
+ .filter = remove_extradata,
};
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
