On 2016-10-12 at 13:57, Carl Eugen Hoyos wrote:
> 2016-10-11 16:27 GMT+02:00 Michael Niedermayer <mich...@niedermayer.cc>:
>
> > also the img2 demuxer for mjpeg2000 from img2dec.c does not work
> > for this ?
>
> We separated the jpg from the mjpeg probe, jpg makes sure that the
> sample starts like a jpg image and contains an end marker and can
> be decoded, mjpeg probe is less strict but requires more than one
> frame.
> Same could be argued for j2k or was our reasoning bad?
Since nobody chimed in on this, I have created two new patches, one
containing a separate mjpeg 2000 probe
(0001-libavf-Auto-detect-mjpeg-2000-in-mpeg-ts2.patch), and one that
incorporates it into the img2dec jpeg 2000 probe
(0001-libavf-Make-jpeg-2000-probe-work-for-mjpeg-2000.patch).
I think it is best to have them separated, as that matches the mjpeg
behaviour.
--
Ståle Kristoffersen
>From 21b7c5850ce2bd9198b61557ba657ad66288b17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A5le=20Kristoffersen?= <staal...@ifi.uio.no>
Date: Tue, 11 Oct 2016 15:36:40 +0200
Subject: [PATCH] libavf: Auto-detect mjpeg 2000 in mpeg-ts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes it possible to decode motion jpeg 2000
encoded in a transport stream without a correct PMT/PAT.
Signed-off-by: Ståle Kristoffersen <staal...@ifi.uio.no>
---
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/mj2kdec.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
libavformat/utils.c | 1 +
libavformat/version.h | 4 ++--
5 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 libavformat/mj2kdec.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 5d827d31..4020b8d 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -273,6 +273,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 6a216ef..7db6c52 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 0000000..50f0e33
--- /dev/null
+++ b/libavformat/mj2kdec.c
@@ -0,0 +1,55 @@
+/*
+ * 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 8a51aea..9e9a052 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 92801b4..a0747a3 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -32,8 +32,8 @@
// 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 51
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MINOR 52
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
--
2.1.4
>From 8e6aa5935e33f1f8dd747ce4d9e785bd0dcc1e15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A5le=20Kristoffersen?= <staal...@ifi.uio.no>
Date: Thu, 13 Oct 2016 15:55:35 +0200
Subject: [PATCH] libavf: Make jpeg 2000 probe work for mjpeg 2000
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes it possible to decode motion jpeg 2000
encoded in a transport stream without a correct PMT/PAT.
Signed-off-by: Ståle Kristoffersen <staal...@ifi.uio.no>
---
libavformat/img2dec.c | 20 ++++++++++++++++++++
libavformat/utils.c | 1 +
2 files changed, 21 insertions(+)
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index a920f46..bb22302 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -678,10 +678,30 @@ static int exr_probe(AVProbeData *p)
static int j2k_probe(AVProbeData *p)
{
const uint8_t *b = p->buf;
+ int i, marker, marker_size;
+ int frames = 0, invalid = 0;
if (AV_RB64(b) == 0x0000000c6a502020 ||
AV_RB32(b) == 0xff4fff51)
return AVPROBE_SCORE_EXTENSION + 1;
+ 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;
}
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 8a51aea..5070935 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 },
+ { "j2k_pipe", 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 },
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
