From patchwork Sun Apr 11 10:13:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Shulyaka X-Patchwork-Id: 26861 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E238044B7CF for ; Sun, 11 Apr 2021 13:14:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4C2468813A; Sun, 11 Apr 2021 13:14:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BBFD0680635 for ; Sun, 11 Apr 2021 13:14:41 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id l14so8781901ljb.1 for ; Sun, 11 Apr 2021 03:14:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3pMPQGltDKu6PLPSf2TO2IY21/rd6KygPsXgr1+8HhM=; b=ATzdD15y3Mw5bFrl4/3YKk4d5J5n8Hi7O/lTQn40TZf/i+vLcarigcI+xqfU+UxpiB e04fY8i5Dtz4Yzng8qKezfBKSJar0+oeFqyMHKzVkc3G/5cR6bmd7A4LZIKIDY51OvOg bgG7AIW3UuitoCrPfJUjZulVIdJesZWoNLdXjCIGPWMkmgxvFhgE75XQKstetZBQh6vP aDJEb687gk+VUmxB+YcGTYLCzIqqsG+DuA4mFLtXh6DcDh2t+BdrYBbTEXI7Mw945rej wpDRXluy+14QkbnVDZ92efIXRU+2sMRuRzR+CdhIT68tTqzrVDvYE+S1VZgguyI1lBEa zrXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3pMPQGltDKu6PLPSf2TO2IY21/rd6KygPsXgr1+8HhM=; b=sF5oXq09YEwy4DMheTifskYNE4vA8GAOEmeUz35972nmUcY6MCwvn0hvGszdJZTvh4 RaJyl2aQZVBFxZOiwrhC5HoxY6Br5uHqIMcQQ8GLzGBGL8l1hpzkZ+UPG+gCV5hj0lXZ t2GYpRqdTxRTS/OLqBfm+A7t9Siv8wvdVjGr8ksO/UYSQzuHCOhpUVMt6qQ+RwISRlMZ ucFZR/b0lqkOaRCpwPKcW64fCbLkh3icgU8obriLdoa8VvU+BwTdn1D1nolIF3qZxj4H E1438iAIh+KyEM82eJ3ixdxNF0c7wR1QLB9GuR9BcsjEBhZ+Cpojw3bFgIgQqBnYMh+r H77Q== X-Gm-Message-State: AOAM531g8a/ILW8QHVHK4w8YUCG0cNs89kZbdOpaJaWx0Thc0xisRV6m ZBUf1u5ghydDSTNvyhGtae0JfE6/6pob0g== X-Google-Smtp-Source: ABdhPJzujKmXSSkvAHk/5m8pHpb+5krmMIiIVOUpfvUx2fxjoiIKrTJIdS8HwLWsZG9JYbU97lhaMQ== X-Received: by 2002:a2e:7a08:: with SMTP id v8mr14935343ljc.344.1618136080807; Sun, 11 Apr 2021 03:14:40 -0700 (PDT) Received: from denis.atlantis ([2a02:2168:86c7:6f00::e73]) by smtp.gmail.com with ESMTPSA id f18sm1502557lft.98.2021.04.11.03.14.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Apr 2021 03:14:40 -0700 (PDT) From: Denis Shulyaka X-Google-Original-From: Denis Shulyaka To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Apr 2021 13:13:40 +0300 Message-Id: <20210411101340.600851-1-Shulyaka@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] IEC61937_EAC3 decoding support 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 Cc: ceffmpeg@gmail.com, Denis Shulyaka Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch adds support to decode IEC61937_EAC3 (aka dolby digital plus). Signed-off-by: Denis Shulyaka --- libavformat/spdifdec.c | 43 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index 1808fa9d65..adc5f4f255 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -93,6 +93,10 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, *offset = 8192; *codec = AV_CODEC_ID_DTS; break; + case IEC61937_EAC3: + *offset = AC3_FRAME_SIZE << 4; + *codec = AV_CODEC_ID_EAC3; + break; default: if (s) { /* be silent during a probe */ avpriv_request_sample(s, "Data type 0x%04x in IEC 61937", @@ -103,9 +107,32 @@ static int spdif_get_offset_and_codec(AVFormatContext *s, return 0; } -/* Largest offset between bursts we currently handle, i.e. AAC with - samples = 4096 */ -#define SPDIF_MAX_OFFSET 16384 +static int spdif_read_burst_payload_length(AVFormatContext *s, + enum IEC61937DataType data_type) +{ + AVIOContext *pb = s->pb; + int pkt_size_bits, pkt_size_bytes; + + switch (data_type & 0xff) { + case IEC61937_EAC3: + pkt_size_bytes = avio_rl16(pb); + + if (pkt_size_bytes & 0x1) + avpriv_request_sample(s, "Packet not ending at a 16-bit boundary"); + + return FFALIGN(pkt_size_bytes, 2); + default: + pkt_size_bits = avio_rl16(pb); + + if (pkt_size_bits & 0xF) + avpriv_request_sample(s, "Packet not ending at a 16-bit boundary"); + + return FFALIGN(pkt_size_bits, 16) >> 3; + } +} + +/* Largest offset between bursts we currently handle, i.e. E-AC-3 */ +#define SPDIF_MAX_OFFSET 24576 static int spdif_probe(const AVProbeData *p) { @@ -176,7 +203,7 @@ int ff_spdif_read_packet(AVFormatContext *s, AVPacket *pkt) enum IEC61937DataType data_type; enum AVCodecID codec_id; uint32_t state = 0; - int pkt_size_bits, offset, ret; + int pkt_size, offset, ret; while (state != (AV_BSWAP16C(SYNCWORD1) << 16 | AV_BSWAP16C(SYNCWORD2))) { state = (state << 8) | avio_r8(pb); @@ -185,12 +212,12 @@ int ff_spdif_read_packet(AVFormatContext *s, AVPacket *pkt) } data_type = avio_rl16(pb); - pkt_size_bits = avio_rl16(pb); + pkt_size = spdif_read_burst_payload_length(s, data_type); - if (pkt_size_bits % 16) - avpriv_request_sample(s, "Packet not ending at a 16-bit boundary"); + if (!pkt_size) + return AVERROR_BUG; - ret = av_new_packet(pkt, FFALIGN(pkt_size_bits, 16) >> 3); + ret = av_new_packet(pkt, pkt_size); if (ret) return ret;