From patchwork Fri Mar 19 16:24:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26496 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 47D4344ABCC for ; Fri, 19 Mar 2021 18:25:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F073688175; Fri, 19 Mar 2021 18:25:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8631D68804B for ; Fri, 19 Mar 2021 18:24:59 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id g20so5781062wmk.3 for ; Fri, 19 Mar 2021 09:24:59 -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:reply-to:mime-version :content-transfer-encoding; bh=bO5+96a9f9oMclkCLFCS55Vg5vNka9vfwHM6LYYm0QQ=; b=CmukpT0ooUFDzLx7TqfnNz5L3oSdgTGUPJyBluh8BS99pXsBkOSBYF5QahzPCcr0Ci gYfdxhm9V5H3WwT3zu/VC/0nXNHF68Qxe7nYwECEnNpAolKIhoRDqNINmdmZce83RHMm Ismz+qhZBGISPCWTRyvRtc9rmiMayVWQKQ6KM9A8k6kxxHVYrFLJMuys4+JS7RSRyZdd YQBpE/sTz6yEXpVtNiWB9CoaUxUHDPEoKy0bUl+Jt30G5khnnjqKF9LkafxJnxg1geQS yMz1wH4adJrfqH16jTxM/S1cMrKWoTFtRnG9dEDfGLsC76i7cKnIO/culIX1aocsFDna U0lw== 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:reply-to :mime-version:content-transfer-encoding; bh=bO5+96a9f9oMclkCLFCS55Vg5vNka9vfwHM6LYYm0QQ=; b=Gye08eIjmttuIhhDaDVWqy1ArP6eQYob1SVOScPNC8dPmm4vtwjAHKyHpi+5pR/jbA 5mhXqL7MLTjsimT8V/T4OgIkyubAz69K2xWHgsYLn4l2uarmh/2zGbvNKh1n6kKDoZNQ 8gul2+kMf6k1FiY8KPgT7xPCRmY1FYhRqqupmRaPu0dK0jynAXAipwsHVsG3O/ZXRy2E WBlfUuLA5dgrmAuSnmhzGg1CS80gYMBZ40fmDWQbi7iDObHci9j+8hlahIS8j8dDBZD6 JZhmLnZporDYAs5e4dPOKqn14FxJb0qmIdJrMP2CHEWZRenOoFzb92AYV+fylZxqhsr5 Xg2g== X-Gm-Message-State: AOAM530xCsC9M5dSl5Aff+dJ/744GX8q6ioOq9To2Ip64eaSQVv90FV/ Lxt6TqhQQb3qXVi9SDDgiPVwv5uTHffLdA== X-Google-Smtp-Source: ABdhPJzoEiVJxxev49smQuyuSeUTvdTKJAFAadK+EI+EsA3j34StMkOiVGBndTcx1w0tSNUXaIOylQ== X-Received: by 2002:a05:600c:3556:: with SMTP id i22mr4484389wmq.116.1616171098792; Fri, 19 Mar 2021 09:24:58 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id y10sm8838915wrl.19.2021.03.19.09.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 09:24:58 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 17:24:53 +0100 Message-Id: <20210319162453.2411304-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/s337m: Use and test Dolby-E-parser 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This makes av_read_frame() return packets with proper timestamps. As a result, seeking now works in combination with streamcopy. A FATE-test for this has been added. Signed-off-by: Andreas Rheinhardt --- libavformat/s337m.c | 1 + tests/fate/demux.mak | 3 +++ tests/ref/fate/s337m-demux | 31 +++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 tests/ref/fate/s337m-demux diff --git a/libavformat/s337m.c b/libavformat/s337m.c index 36e1047af8..9e3c8ed1ba 100644 --- a/libavformat/s337m.c +++ b/libavformat/s337m.c @@ -189,6 +189,7 @@ static int s337m_read_packet(AVFormatContext *s, AVPacket *pkt) } st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = codec; + st->need_parsing = AVSTREAM_PARSE_HEADERS; } return 0; diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index e5809bedd4..e9b8aeec0f 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -133,6 +133,9 @@ fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -c:a copy FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d -c:v copy -c:a copy +FATE_SAMPLES_DEMUX-$(call ALLYES, S337M_DEMUXER DOLBY_E_PARSER FRAMECRC_MUXER) += fate-s337m-demux +fate-s337m-demux: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/16-11 -c copy -ss 2 -t 1 + FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy diff --git a/tests/ref/fate/s337m-demux b/tests/ref/fate/s337m-demux new file mode 100644 index 0000000000..2857c65aee --- /dev/null +++ b/tests/ref/fate/s337m-demux @@ -0,0 +1,31 @@ +#tb 0: 1/90000 +#media_type 0: audio +#codec_id 0: dolby_e +#sample_rate 0: 44800 +#channel_layout 0: 60f +#channel_layout_name 0: 5.1(side) +0, 0, 0, 3600, 7664, 0x7e73f2fd +0, 3600, 3600, 3600, 7664, 0x8b980ec8 +0, 7200, 7200, 3600, 7664, 0xa16adbd5 +0, 10800, 10800, 3600, 7664, 0x6d1b43a5 +0, 14400, 14400, 3600, 7664, 0xb7e52e2a +0, 18000, 18000, 3600, 7664, 0xcb7d6463 +0, 21600, 21600, 3600, 7664, 0x148a557b +0, 25200, 25200, 3600, 7664, 0x04c0142e +0, 28800, 28800, 3600, 7664, 0xf96de1d4 +0, 32400, 32400, 3600, 7664, 0x9f3224e0 +0, 36000, 36000, 3600, 7664, 0x6bd905cb +0, 39600, 39600, 3600, 7664, 0xe6782023 +0, 43200, 43200, 3600, 7664, 0x983f5048 +0, 46800, 46800, 3600, 7664, 0x017df49a +0, 50400, 50400, 3600, 7664, 0x25e605a9 +0, 54000, 54000, 3600, 7664, 0x764ef01e +0, 57600, 57600, 3600, 7664, 0x3830f9f0 +0, 61200, 61200, 3600, 7664, 0xbcd62352 +0, 64800, 64800, 3600, 7664, 0x51ab1a35 +0, 68400, 68400, 3600, 7664, 0xc21ff964 +0, 72000, 72000, 3600, 7664, 0x9d6c0efa +0, 75600, 75600, 3600, 7664, 0x5e55dd80 +0, 79200, 79200, 3600, 7664, 0xfd9eeb6d +0, 82800, 82800, 3600, 7664, 0xcf86ce9d +0, 86400, 86400, 3600, 7664, 0xc6e8319c