From patchwork Tue Oct 11 13:52:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?St=C3=A5le_kristoffersen?= X-Patchwork-Id: 955 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp291755vsd; Tue, 11 Oct 2016 06:52:44 -0700 (PDT) X-Received: by 10.194.201.227 with SMTP id kd3mr5128570wjc.74.1476193964272; Tue, 11 Oct 2016 06:52:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q4si5023840wjo.250.2016.10.11.06.52.43; Tue, 11 Oct 2016 06:52:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1900C68991D; Tue, 11 Oct 2016 16:52:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ext5.uio.no (mail-ext5.uio.no [129.240.10.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D41D6898C5 for ; Tue, 11 Oct 2016 16:52:36 +0300 (EEST) Received: from mail-mx1.uio.no ([129.240.10.29]) by mail-out5.uio.no with esmtp (Exim 4.80.1) (envelope-from ) id 1btxTu-0008Sv-OD for ffmpeg-devel@ffmpeg.org; Tue, 11 Oct 2016 15:52:34 +0200 Received: from putsch.kolbu.ws ([158.36.191.193]) by mail-mx1.uio.no with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80) (envelope-from ) id 1btxTt-00025h-OM for ffmpeg-devel@ffmpeg.org; Tue, 11 Oct 2016 15:52:34 +0200 Received: from chiller by putsch.kolbu.ws with local (Exim 4.87 (FreeBSD)) (envelope-from ) id 1btxTt-0003Aw-AO for ffmpeg-devel@ffmpeg.org; Tue, 11 Oct 2016 15:52:33 +0200 Date: Tue, 11 Oct 2016 15:52:33 +0200 From: =?utf-8?B?U3TDpWxl?= kristoffersen To: ffmpeg-devel@ffmpeg.org Message-ID: <20161011135233.GA99438@putsch.kolbu.ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-UiO-SPF-Received: X-UiO-Ratelimit-Test: rcpts/h 1 msgs/h 1 sum rcpts/h 1 sum msgs/h 1 total rcpts 318 max rcpts/h 10 ratelimit 0 X-UiO-Spam-info: not spam, SpamAssassin (score=-5.0, required=5.0, autolearn=disabled, UIO_MAIL_IS_INTERNAL=-5, uiobl=NO, uiouri=NO) X-UiO-Scanned: C0B30A810CE8D82CED6C968505AAA33AB9780817 X-UiO-SPAM-Test: remote_host: 158.36.191.193 spam_score: -49 maxlevel 80 minaction 2 bait 0 mail/h: 2 total 35618 max/h 377 blacklist 0 greylist 0 ratelimit 0 Subject: [FFmpeg-devel] [PATCH] libavf: Auto-detect mjpeg 2000 in mpeg-ts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi, I have some transport streams with only one pid, containing MJPEG 2000 video. Since the PMT/PAT is missing ffmpeg is unable to decode it. The attached patch makes ffmpeg able to guess that it does contain a stream of jpeg 2000, but I am not sure if this is the correct approach. Also, should LIBAVFORMAT_VERSION_MICRO and the Changelog be updated? From 0d5594d4dfd1a9608ef55e90fb6a770b0f54cdaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A5le=20Kristoffersen?= 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 --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/mj2kdec.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/utils.c | 1 + 4 files changed, 65 insertions(+) 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..cf9e575 --- /dev/null +++ b/libavformat/mj2kdec.c @@ -0,0 +1,62 @@ +/* + * VC-1 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" +#include "libavcodec/jpeg2000.h" + + +#if CONFIG_MJPEG_2000_DEMUXER +static int mjpeg2000_probe(AVProbeData *p) +{ + int i; + int invalid = 0; + int frames = 0; + uint16_t soc, marker, marker_size; + uint8_t marker_marker; + + for (i=0; ibuf_size-5; i++) { + soc = AV_RB16(p->buf + i); + if (soc == JPEG2000_SOC ) { + marker = AV_RB16(p->buf + i + 2); + marker_size = AV_RB16(p->buf + i + 4); + if (marker == JPEG2000_SIZ) { + i += marker_size + 2; + marker_marker = AV_RB8(p->buf + i + 2); + if (marker_marker == 0xFF) { + frames++; + } else { + invalid++; + } + } + } + } + + if (invalid*4 + 1 < frames) { + return 1; + } + + 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 }, -- 2.1.4