From patchwork Sat Jul 1 14:06:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: foo86 X-Patchwork-Id: 4176 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp7021003vsb; Sat, 1 Jul 2017 07:06:41 -0700 (PDT) X-Received: by 10.28.157.205 with SMTP id g196mr18283455wme.84.1498918001111; Sat, 01 Jul 2017 07:06:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498918001; cv=none; d=google.com; s=arc-20160816; b=c1co9csfFUQWrVXlBDUOOnunsZj0S6NURheI6yR+m0pALpR0xG1CBD+k/ovht1LUNf LwlpnoVIPdXfyxrejdT+qWaTj/9DJvD5BNPiil5TtFM5kq78ADkaX3/0fyHqsm5wgp1o /5C6dxASOhp3J4k2QRXGq9VdWejmYPUQ1koMwSfOaw2YWGrbDCH7/CIVEQaM2Uhguiwa Xh0Ez2HMvPeW4v/in9malyrYmG4ja2wNg4LGi0yH5V2t4T1cZxM5kV6kSp3Nm/+K7wsd hYiqnzSpIqxNrPyuNMupAgLTOD1k88rWvOaX1kUSE5COSojOP4QpdnjVUF9S7rdcDu+/ VbGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:to:from:date:dkim-signature :delivered-to:arc-authentication-results; bh=WhQQN7U/f/ne5xZ1KcgagrAF9t4B+gp3qQYu0wFWy0w=; b=AyVaK6WFUZHIDC5wsxUYfnFNIzDn+iYMk2e1MXTMo16uk21JXZWMg8FPajtdje1aJu R1IGAkF6WMyUrEvNLr4vAxDWY/TtAZhGi9qBBLG9Br3nkhz2jwYSxeq6Wq7UoZZUe1/Y YMSQARSkCvJcXjl/57FK16xTaUTzg03k1i5THMcyefHljI9oov/f6eRLhXRflBP4Lmzj dXRLxvqFlnF357I5kFJGCdMMPtRvLSyAQXP1z77QvOnLlZkANsk0s4MefU/RXz3tE53R cNMTDSuA3SCOWp/4otUv5Pqnh+pQ2IpVwg6rq70xdH1nZVjWZYlm2yULlw8toYszHHzR Fupg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=g2oh52pG; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a81si8084471wrc.132.2017.07.01.07.06.40; Sat, 01 Jul 2017 07:06:41 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=g2oh52pG; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7937688259; Sat, 1 Jul 2017 17:06:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f51.google.com (mail-lf0-f51.google.com [209.85.215.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 585DE687ED5 for ; Sat, 1 Jul 2017 17:06:30 +0300 (EEST) Received: by mail-lf0-f51.google.com with SMTP id l13so83264641lfl.1 for ; Sat, 01 Jul 2017 07:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ImtS/KeFkLqsNnG5vDh4eVguFc0ZJkcfekB4om2F/ok=; b=g2oh52pGXnayOqlJiu/7L7RFactf5qJex++eP32hnSIGphG9ldGkW4OvKYmOQg4dAO SFgTaxOwQ1ulKuSI0CXesOERKJWQYwI7GC9t3cfMFaicCd4B6hCDSGewHWi3Wna3bwv5 oRG31JtB8t22xbgaMBykET+3svtjyYb+r3Bxqv1xvEGRo7z7NTUbxJHYT489YXb4f06C i3goy969CEHo2q895QUn6ZsFmRzdDb80MXp0zjPN/dzXoHZng6TOnoLTEDzUDoFYCJO5 qqByxEjD9sX3ekZA+K+/Yas3QmDJ8Snrnrt/CZCmkMCqXeTXkQiXS/r+u1W2MeiIY4Ak ms7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ImtS/KeFkLqsNnG5vDh4eVguFc0ZJkcfekB4om2F/ok=; b=pUdo3XpScK96tYMnaEsGvAuhoA56whdwoSeiCKbSLeE8NYuoVPTGrETOa0j83ebXcE vvWwghkiFyJTyV6Fkx4O1DJFNc8/GMx8gF1ip82twS4sq9Jg49KnyI0HkgEvZFyKIx+M kWXlJ5jmNm8aYE78D1OUJqxgnkkr+YCd06k6j+7amqg7giiDZ6FhuYsOlHoWo0/IeQPm +xBOPZWsgrve/8gBLkvURVOitv4JaEPQlv3qe9UBdTHmvwVJkySBeBU7yGC11Bp5o9P8 aFzT14HsAdjaj/m9PDHy/fRGwe1l2NoTr3sjIUbpybxZevXAVhL7/NKpZNWC9aEr6cqD 2Z0A== X-Gm-Message-State: AKS2vOyzrpifAlQX6vUbI6tPvCNaIxBZJFFRiNWbQ9lGC69xDXc6RzfF a3gaHwajayJc+1pX X-Received: by 10.25.195.134 with SMTP id t128mr8772446lff.73.1498917990224; Sat, 01 Jul 2017 07:06:30 -0700 (PDT) Received: from foohost.foodomain ([2001:470:28:661::4]) by smtp.gmail.com with ESMTPSA id 10sm2222582lji.43.2017.07.01.07.06.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 01 Jul 2017 07:06:29 -0700 (PDT) Date: Sat, 1 Jul 2017 17:06:27 +0300 From: foo86 To: FFmpeg development discussions and patches Message-ID: <20170701140627.ce4ctijypmehlnt5@foohost.foodomain> References: <20170627095917.8825-1-foobaz86@gmail.com> <20170627095917.8825-3-foobaz86@gmail.com> <163ef1b2-81f9-00e9-dd8b-dfba47278e37@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <163ef1b2-81f9-00e9-dd8b-dfba47278e37@gmail.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: [FFmpeg-devel] [PATCH v2 2/2] avformat: add SMPTE 337M demuxer 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" --- Changelog | 1 + doc/general.texi | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/s337m.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 6 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 libavformat/s337m.c diff --git a/Changelog b/Changelog index a8726c6736..a909031849 100644 --- a/Changelog +++ b/Changelog @@ -26,6 +26,7 @@ version : --x86asmexe=yasm to configure to restore the old behavior. - additional frame format support for Interplay MVE movies - support for decoding through D3D11VA in ffmpeg +- Dolby E decoder and SMPTE 337M demuxer version 3.3: - CrystalHD decoder moved to new decode API diff --git a/doc/general.texi b/doc/general.texi index d95ef31fde..036c8c25d4 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -520,6 +520,7 @@ library: @tab Multimedia format used by many games. @item SMJPEG @tab X @tab X @tab Used in certain Loki game ports. +@item SMPTE 337M encapsulation @tab @tab X @item Smush @tab @tab X @tab Multimedia format used in some LucasArts games. @item Sony OpenMG (OMA) @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 80aeed22c0..b0ef82cdd4 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -432,6 +432,7 @@ OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \ urldecode.o OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ urldecode.o +OBJS-$(CONFIG_S337M_DEMUXER) += s337m.o spdif.o OBJS-$(CONFIG_SAMI_DEMUXER) += samidec.o subtitles.o OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o OBJS-$(CONFIG_SAP_MUXER) += sapenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a0e2fb8c85..1ebc14231c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -267,6 +267,7 @@ static void register_all(void) REGISTER_MUXDEMUX(RTP, rtp); REGISTER_MUXER (RTP_MPEGTS, rtp_mpegts); REGISTER_MUXDEMUX(RTSP, rtsp); + REGISTER_DEMUXER (S337M, s337m); REGISTER_DEMUXER (SAMI, sami); REGISTER_MUXDEMUX(SAP, sap); REGISTER_DEMUXER (SBG, sbg); diff --git a/libavformat/s337m.c b/libavformat/s337m.c new file mode 100644 index 0000000000..1f4ba5edaf --- /dev/null +++ b/libavformat/s337m.c @@ -0,0 +1,206 @@ +/* + * Copyright (C) 2017 foo86 + * + * 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 "spdif.h" + +#define MARKER_16LE 0x72F81F4E +#define MARKER_20LE 0x20876FF0E154 +#define MARKER_24LE 0x72F8961F4EA5 + +#define IS_16LE_MARKER(state) ((state & 0xFFFFFFFF) == MARKER_16LE) +#define IS_20LE_MARKER(state) ((state & 0xF0FFFFF0FFFF) == MARKER_20LE) +#define IS_24LE_MARKER(state) ((state & 0xFFFFFFFFFFFF) == MARKER_24LE) +#define IS_LE_MARKER(state) (IS_16LE_MARKER(state) || IS_20LE_MARKER(state) || IS_24LE_MARKER(state)) + +static int s337m_get_offset_and_codec(AVFormatContext *s, + uint64_t state, + int data_type, int data_size, + int *offset, enum AVCodecID *codec) +{ + int word_bits; + + if (IS_16LE_MARKER(state)) { + word_bits = 16; + } else if (IS_20LE_MARKER(state)) { + data_type >>= 8; + data_size >>= 4; + word_bits = 20; + } else { + data_type >>= 8; + word_bits = 24; + } + + if ((data_type & 0x1F) != 0x1C) { + if (s) + avpriv_report_missing_feature(s, "Data type %#x in SMPTE 337M", data_type & 0x1F); + return AVERROR_PATCHWELCOME; + } + + if (codec) + *codec = AV_CODEC_ID_DOLBY_E; + + switch (data_size / word_bits) { + case 3648: + *offset = 1920; + break; + case 3644: + *offset = 2002; + break; + case 3640: + *offset = 2000; + break; + case 3040: + *offset = 1601; + break; + default: + if (s) + avpriv_report_missing_feature(s, "Dolby E data size %d in SMPTE 337M", data_size); + return AVERROR_PATCHWELCOME; + } + + *offset -= 4; + *offset *= (word_bits + 7 >> 3) * 2; + return 0; +} + +static int s337m_probe(AVProbeData *p) +{ + uint64_t state = 0; + int markers[3] = { 0 }; + int i, sum, max, data_type, data_size, offset; + uint8_t *buf; + + for (buf = p->buf; buf < p->buf + p->buf_size; buf++) { + state = (state << 8) | *buf; + if (!IS_LE_MARKER(state)) + continue; + + if (IS_16LE_MARKER(state)) { + data_type = AV_RL16(buf + 1); + data_size = AV_RL16(buf + 3); + buf += 4; + } else { + data_type = AV_RL24(buf + 1); + data_size = AV_RL24(buf + 4); + buf += 6; + } + + if (s337m_get_offset_and_codec(NULL, state, data_type, data_size, &offset, NULL)) + continue; + + i = IS_16LE_MARKER(state) ? 0 : IS_20LE_MARKER(state) ? 1 : 2; + markers[i]++; + + buf += offset; + state = 0; + } + + sum = max = 0; + for (i = 0; i < FF_ARRAY_ELEMS(markers); i++) { + sum += markers[i]; + if (markers[max] < markers[i]) + max = i; + } + + if (markers[max] > 3 && markers[max] * 4 > sum * 3) + return AVPROBE_SCORE_EXTENSION + 1; + + return 0; +} + +static int s337m_read_header(AVFormatContext *s) +{ + s->ctx_flags |= AVFMTCTX_NOHEADER; + return 0; +} + +static void bswap_buf24(uint8_t *data, int size) +{ + int i; + + for (i = 0; i < size / 3; i++, data += 3) + FFSWAP(uint8_t, data[0], data[2]); +} + +static int s337m_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVIOContext *pb = s->pb; + uint64_t state = 0; + int ret, data_type, data_size, offset; + enum AVCodecID codec; + int64_t pos; + + while (!IS_LE_MARKER(state)) { + state = (state << 8) | avio_r8(pb); + if (avio_feof(pb)) + return AVERROR_EOF; + } + + if (IS_16LE_MARKER(state)) { + data_type = avio_rl16(pb); + data_size = avio_rl16(pb); + } else { + data_type = avio_rl24(pb); + data_size = avio_rl24(pb); + } + + pos = avio_tell(pb); + + if ((ret = s337m_get_offset_and_codec(s, state, data_type, data_size, &offset, &codec)) < 0) + return ret; + + if ((ret = av_new_packet(pkt, offset)) < 0) + return ret; + + pkt->pos = pos; + + if (avio_read(pb, pkt->data, pkt->size) < pkt->size) { + av_packet_unref(pkt); + return AVERROR_EOF; + } + + if (IS_16LE_MARKER(state)) + ff_spdif_bswap_buf16((uint16_t *)pkt->data, (uint16_t *)pkt->data, pkt->size >> 1); + else + bswap_buf24(pkt->data, pkt->size); + + if (!s->nb_streams) { + AVStream *st = avformat_new_stream(s, NULL); + if (!st) { + av_packet_unref(pkt); + return AVERROR(ENOMEM); + } + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = codec; + } + + return 0; +} + +AVInputFormat ff_s337m_demuxer = { + .name = "s337m", + .long_name = NULL_IF_CONFIG_SMALL("SMPTE 337M"), + .read_probe = s337m_probe, + .read_header = s337m_read_header, + .read_packet = s337m_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 44c16ac75a..48b81f2e48 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 75 +#define LIBAVFORMAT_VERSION_MINOR 76 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \