virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: Add wrapped_avframe decoder

Browse Source 
Intended for use with hardware frames for which rawvideo is not
sufficient.  Requires the trusted packet flag to be set - decoding
fails if not to avoid security issues (the wrapped AVFrame can
contain pointers to arbitrary data).
This commit is contained in:
Mark Thompson 2017-09-02 20:32:27 +01:00
parent 82342cead1
commit c8dea81921
4 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/Makefile
View File

@ -653,6 +653,7 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o \
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \ OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \
msmpeg4.o msmpeg4enc.o msmpeg4data.o msmpeg4.o msmpeg4enc.o msmpeg4data.o
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
OBJS-$(CONFIG_WRAPPED_AVFRAME_DECODER) += wrapped_avframe.o
OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o

2
libavcodec/allcodecs.c
View File

@ -377,7 +377,7 @@ static void register_all(void)
REGISTER_DECODER(VQA, vqa); REGISTER_DECODER(VQA, vqa);
REGISTER_DECODER(BITPACKED, bitpacked); REGISTER_DECODER(BITPACKED, bitpacked);
REGISTER_DECODER(WEBP, webp); REGISTER_DECODER(WEBP, webp);
REGISTER_ENCODER(WRAPPED_AVFRAME, wrapped_avframe); REGISTER_ENCDEC (WRAPPED_AVFRAME, wrapped_avframe);
REGISTER_ENCDEC (WMV1, wmv1); REGISTER_ENCDEC (WMV1, wmv1);
REGISTER_ENCDEC (WMV2, wmv2); REGISTER_ENCDEC (WMV2, wmv2);
REGISTER_DECODER(WMV3, wmv3); REGISTER_DECODER(WMV3, wmv3);

2
libavcodec/version.h
View File

@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 106 #define LIBAVCODEC_VERSION_MINOR 106
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \

36
libavcodec/wrapped_avframe.c
View File

@ -75,6 +75,33 @@ static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt,
return 0; return 0;
} }
static int wrapped_avframe_decode(AVCodecContext *avctx, void *data,
int *got_frame, AVPacket *pkt)
{
AVFrame *in, *out;
int err;
if (!(pkt->flags & AV_PKT_FLAG_TRUSTED)) {
// This decoder is not usable with untrusted input.
return AVERROR(EPERM);
}
if (pkt->size < sizeof(AVFrame))
return AVERROR(EINVAL);
in = (AVFrame*)pkt->data;
out = data;
err = ff_decode_frame_props(avctx, out);
if (err < 0)
return err;
av_frame_move_ref(out, in);
*got_frame = 1;
return 0;
}
AVCodec ff_wrapped_avframe_encoder = { AVCodec ff_wrapped_avframe_encoder = {
.name = "wrapped_avframe", .name = "wrapped_avframe",
.long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"), .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket passthrough"),
@ -83,3 +110,12 @@ AVCodec ff_wrapped_avframe_encoder = {
.encode2 = wrapped_avframe_encode, .encode2 = wrapped_avframe_encode,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
}; };
AVCodec ff_wrapped_avframe_decoder = {
.name = "wrapped_avframe",
.long_name = NULL_IF_CONFIG_SMALL("AVPacket to AVFrame passthrough"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_WRAPPED_AVFRAME,
.decode = wrapped_avframe_decode,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};