From patchwork Mon Jan 9 01:05:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 39928 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2740718pzb; Sun, 8 Jan 2023 17:06:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXvCauWpubOJOBnPBE9cic3MeGmeRPLWUroHQylIIUIRKtsycrvxGnNk8Yj6+5Mdvo9dxAib X-Received: by 2002:a17:906:ca10:b0:7c0:a4ae:c542 with SMTP id jt16-20020a170906ca1000b007c0a4aec542mr52424646ejb.39.1673226361744; Sun, 08 Jan 2023 17:06:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673226361; cv=none; d=google.com; s=arc-20160816; b=PA0vSjoXjGPifKGbobXMoIiF9W72F2LVzONTxBZq0G+oLUokIqLF6UxBStIVlFBpXk cm9KJc68debSrcbNRfy5/MhP1wsWLkB0fbqjJTgXCNXeUezZUuEykGS2CZocjttTe9s9 NIZdrY9oXYFE/5ZpuwyQ8QG08KqBHs5Yu8dJXNn2jr8rs/wT9zt16e93d+1sy06Q0cYS SicW0UD9clbd7UkY/2KxCLVuTbqq1B8igSJwaYe60V9SjmuSHlxDy+o4hQ+ReqftS6sN tpxtpEh26nYWWfOV1ZTq2dWjWJZ9418E+3cu0FfRFf5qXbNDWa19K0bqClgA2OQC55fR cZoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=dng1rcaj1sO9SKzqWMdJmZmkMUOVCd0U3rcRtyUZOr8=; b=g1GW4D6XS8aUCq0lEq+Xz9JzH+TQM3GynW83dhziTgNX8AzRZeZrVW3SIaTnc1rYP+ +yTNGGFhWAgX2XrPmz+BaFwIaOohORuFvi4ZhCzSiZiwjlZIogW29rNTIBQH+fEdXwlc hTmUafYYoTaiGnd1rOGHD3s/NJJT6/1TKXYrHsmPzQLeqPDQI6tBQ2Q1P9moM1N3pRG3 +fd6va3MMYK8Z6CfjoEtcwLgsz9GewDbZ79vJ7htTaw150bZRxmqRQ8aMiyaTppL7yTY 1aYg7mXeFPGxDuKKllwnl52qAf5LP0Hm2y6s7c4BuUCGaOSnO46ZWvfoXOqwWkX6kEGe wN1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JQbjzb6D; 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=QUARANTINE 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 hv22-20020a17090760d600b007b5911c9b13si8236109ejc.831.2023.01.08.17.06.01; Sun, 08 Jan 2023 17:06:01 -0800 (PST) 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.s=20210112 header.b=JQbjzb6D; 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=QUARANTINE 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 5013768BAA6; Mon, 9 Jan 2023 03:05:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f42.google.com (mail-vs1-f42.google.com [209.85.217.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C567368B8C1 for ; Mon, 9 Jan 2023 03:05:50 +0200 (EET) Received: by mail-vs1-f42.google.com with SMTP id s127so7107418vsb.5 for ; Sun, 08 Jan 2023 17:05:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=4sCOWJmqxWMErUxr7hVjminQxxfOm0qGjmebGEORTRA=; b=JQbjzb6DQ4XyHj79uVoDWjowry2YSqyc0JETnWlOgLHudG591ZV7g6hwL44z8uZo76 G+MzmCfPy/Ehm+swEQ/m9WbOaUbuR9NECBSzEvvcgVKa7ayKyEKLjrCeIWmks5Ef+SEj y/SbmL/yiz29VWqP5OAhq2gWmb/phykzmObQVnBDStFIxFXoC4s4UqS6YsrDVlX6wBQO Y/kfe5C5gpIovOE16CSoLPfwW0FNJSFVNoFWOFq+iPqNk9ZWfgi4F3T7GhmCw3rt+vli Qn/AGKR9WicrwGNAcg+DaiLHStYZvQRvCpd7v6mbS+yKZBoDP9VApJXV5tRX7i1ydLnl Fq0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=4sCOWJmqxWMErUxr7hVjminQxxfOm0qGjmebGEORTRA=; b=sDhhgqLsoKFW/2zHC5uRZZtjgw+/24LCjCuZaFaC0Nx54QbTuAxxnm9OhS0NSDL85Q NUYLGKCEH9s/3hQAM1H/DWHhg5tg/PpH+YDYHhd6QyuoePBuZSKtrM1lLHjkNHlnuFoU duDxFjM0kZAFg8N8lvk17gnb0zFDbGUwbCRQJ+MlP1t5+OocQfiQx9YtZJ1DFrZgyv+D ajw3bZwqTXkkVZopHMkwH9PfCoWOXYKSeiE9ld6zAhUHkd9SQJedgHYpHaxYW2dz4+gl FxTICxhjbaPRdVeR2e4k39hx1yQdM9ILsLMBdRHZ8BlFnBGOB8PYt1K4kc1zwjPWcJDq 7Hvg== X-Gm-Message-State: AFqh2krkqxXgYLrc5zRpaMMbzDODJGjsn4IpICrW8AInkv3Uh1Lg/IZz TFLqH7t8qAINRGz9HARN+TUWOwiO4vIu16lPYHcRF5kA X-Received: by 2002:a05:6102:149f:b0:3ce:896f:ed7b with SMTP id d31-20020a056102149f00b003ce896fed7bmr4018804vsv.61.1673226348971; Sun, 08 Jan 2023 17:05:48 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Sun, 8 Jan 2023 17:05:47 -0800 (PST) From: Paul B Mahol Date: Mon, 9 Jan 2023 02:05:47 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/nsvdec: add support for STARDIVA format X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: FWHYnv7UblLj Hi, patch attached. Apparently the AAC PCE data and sample rate are not stored in files. From c612389d5a19bd41bc7d4c58ed6a0c6722064d44 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 9 Jan 2023 01:57:29 +0100 Subject: [PATCH] avformat/nsvdec: add support for STARDIVA format Signed-off-by: Paul B Mahol --- libavformat/nsvdec.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 852e6194b0..b28576ea11 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -195,6 +195,7 @@ static const AVCodecTag nsv_codec_video_tags[] = { { AV_CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, */ { AV_CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ + { AV_CODEC_ID_H264, MKTAG('H', '2', '6', '4') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, { AV_CODEC_ID_NONE, 0 }, }; @@ -203,6 +204,7 @@ static const AVCodecTag nsv_codec_audio_tags[] = { { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') }, { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', ' ') }, { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'C', 'P') }, + { AV_CODEC_ID_AAC, MKTAG('A', 'A', 'V', ' ') }, { AV_CODEC_ID_AAC, MKTAG('V', 'L', 'B', ' ') }, { AV_CODEC_ID_SPEEX, MKTAG('S', 'P', 'X', ' ') }, { AV_CODEC_ID_PCM_U16LE, MKTAG('P', 'C', 'M', ' ') }, @@ -461,6 +463,22 @@ static int nsv_parse_NSVs_header(AVFormatContext *s) st->codecpar->codec_tag = atag; st->codecpar->codec_id = ff_codec_get_id(nsv_codec_audio_tags, atag); + if (atag == MKTAG('A', 'A', 'V', ' ')) { + static const uint8_t aav_pce[] = { + 0x12, 0x00, 0x05, 0x08, 0x48, 0x00, + 0x20, 0x00, 0xC6, 0x40, 0x04, 0x4C, + 0x61, 0x76, 0x63, 0x56, 0xE5, 0x00, + 0x00, 0x00, + }; + int ret; + + if ((ret = ff_alloc_extradata(st->codecpar, sizeof(aav_pce))) < 0) + return ret; + + st->codecpar->sample_rate = 44100; + memcpy(st->codecpar->extradata, aav_pce, sizeof(aav_pce)); + } + ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL; /* for PCM we will read a chunk later and put correct info */ /* set timebase to common denominator of ms and framerate */ -- 2.37.2