diff options
author | Ståle Kristoffersen <staalebk@ifi.uio.no> | 2016-10-11 16:36:40 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-18 01:52:25 +0300 |
commit | d8b9bef1a06e3592122613391d951bdbb4c74d46 (patch) | |
tree | 96064b3b956b0cbdfbff40a99cf98fed391276cb /libavformat | |
parent | 295601bba3023b14264fcfee64e7a386cd7753cd (diff) |
avformat: Auto-detect mjpeg 2000 in mpeg-ts
This makes it possible to decode motion jpeg 2000
encoded in a transport stream without a correct PMT/PAT.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/Makefile | 1 | ||||
-rw-r--r-- | libavformat/allformats.c | 1 | ||||
-rw-r--r-- | libavformat/mj2kdec.c | 54 | ||||
-rw-r--r-- | libavformat/utils.c | 1 | ||||
-rw-r--r-- | libavformat/version.h | 2 |
5 files changed, 58 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index f803d0424b..119e46bd8e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -274,6 +274,7 @@ OBJS-$(CONFIG_MD5_MUXER) += hashenc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o OBJS-$(CONFIG_MICRODVD_MUXER) += microdvdenc.o +OBJS-$(CONFIG_MJPEG_2000_DEMUXER) += rawdec.o mj2kdec.o OBJS-$(CONFIG_MJPEG_DEMUXER) += rawdec.o OBJS-$(CONFIG_MJPEG_MUXER) += rawenc.o OBJS-$(CONFIG_MLP_DEMUXER) += rawdec.o mlpdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9d77b9c487..6a79b75d78 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -183,6 +183,7 @@ void av_register_all(void) REGISTER_DEMUXER (MGSTS, mgsts); REGISTER_MUXDEMUX(MICRODVD, microdvd); REGISTER_MUXDEMUX(MJPEG, mjpeg); + REGISTER_DEMUXER (MJPEG_2000, mjpeg_2000); REGISTER_MUXDEMUX(MLP, mlp); REGISTER_DEMUXER (MLV, mlv); REGISTER_DEMUXER (MM, mm); diff --git a/libavformat/mj2kdec.c b/libavformat/mj2kdec.c new file mode 100644 index 0000000000..1fb94094cc --- /dev/null +++ b/libavformat/mj2kdec.c @@ -0,0 +1,54 @@ +/* + * MJPEG 2000 Demuxer + * Copyright (c) 2016 Ståle Kristoffersen + * + * 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 "libavutil/intreadwrite.h" +#include "avformat.h" +#include "rawdec.h" + +#if CONFIG_MJPEG_2000_DEMUXER +static int mjpeg2000_probe(AVProbeData *p) +{ + const uint8_t *b = p->buf; + int i, marker, marker_size; + int frames = 0, invalid = 0; + + for (i = 0; i < p->buf_size - 5; i++) { + if (AV_RB32(b) == 0xff4fff51){ + marker_size = AV_RB16(b+4); + if (marker_size + i < p->buf_size - 4) { + marker = AV_RB8(b+4+marker_size); + if (marker == 0xff) + frames++; + else + invalid++; + } + } + b += 1; + } + if (invalid*4 + 1 < frames) { + if (invalid == 0 && frames > 2) + return AVPROBE_SCORE_EXTENSION / 2; + return AVPROBE_SCORE_EXTENSION / 4; + } + return 0; +} +FF_DEF_RAWVIDEO_DEMUXER2(mjpeg_2000, "raw MJPEG 2000 video", mjpeg2000_probe, "j2k", AV_CODEC_ID_JPEG2000, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) +#endif diff --git a/libavformat/utils.c b/libavformat/utils.c index 897352924d..50a30f6942 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -328,6 +328,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, { "hevc", AV_CODEC_ID_HEVC, AVMEDIA_TYPE_VIDEO }, { "loas", AV_CODEC_ID_AAC_LATM, AVMEDIA_TYPE_AUDIO }, { "m4v", AV_CODEC_ID_MPEG4, AVMEDIA_TYPE_VIDEO }, + { "mjpeg_2000",AV_CODEC_ID_JPEG2000, AVMEDIA_TYPE_VIDEO }, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, { "truehd", AV_CODEC_ID_TRUEHD, AVMEDIA_TYPE_AUDIO }, diff --git a/libavformat/version.h b/libavformat/version.h index b68ab5159b..65e6a4ccb7 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 60 +#define LIBAVFORMAT_VERSION_MINOR 61 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |