From patchwork Mon Mar 6 08:00:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takayuki 'January June' Suwa X-Patchwork-Id: 2763 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp1293228vsf; Mon, 6 Mar 2017 00:06:16 -0800 (PST) X-Received: by 10.28.211.80 with SMTP id k77mr12081343wmg.124.1488787576112; Mon, 06 Mar 2017 00:06:16 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o64si13590702wmb.41.2017.03.06.00.06.15; Mon, 06 Mar 2017 00:06:16 -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; 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 5AC566808D1; Mon, 6 Mar 2017 10:06:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FE666804C3 for ; Mon, 6 Mar 2017 10:05:54 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id 187so5401882pgb.2 for ; Mon, 06 Mar 2017 00:06:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=EnxEEchfSpuaIQFvLaZiWduIgSHS8Rs9kJD70RXcjZs=; b=Toca/5xsEoavgXXI5T4R9bg2RjKSbUutW1IoQ7FI0JZCLJF6mRUqS01GL80lGVk/Ji nS32opsaQB5wvp6d5aST+N1wgLxDWH7tn2ZID+5XTuv/R1if8fd8DZu/b3q4YcWfN5iM Btv2/tF3daWFWEc8P4ZRqQIrndB+p3LRKPEHvLhqr19ELdO9j+N0VHqSyfmCRE3aK1lJ pn0x1Djy+qpkpBkzQQdzM1+XWLeO5QHnS1Zj6DklGLABTZof60KB4sqXLdYsVKKVfTKp +EDLio1hont4oKvoa+av7l5cz12lifo78eaUzOqr3bmACHMHcrN9AfB56qBXzqwby8TO eamA== 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; bh=EnxEEchfSpuaIQFvLaZiWduIgSHS8Rs9kJD70RXcjZs=; b=nPfrpzcZSgceTp+RFyiqyRQ2yxEeAWc54lTd89jctVR5Ishs2ruGyqwdOQ5NJdU00k Vdcl/SpOJPecJFdmo42pIglkdn+JMEZqDNYn9Hw5hCTK3WHT6FAVTutaFT80PTvJBP8h yc7NDNBjXdknOWN8xWGNvnEK7DR4FJTcJMYCVnYPNYmUEcy35x4Q8Ii2oJrBuTCfkHRD D7ImIJaucR6vI9ysQrh8qfJBwplGT1+u5gXkJihbUUbGr3E7bKdtNf6/i+H/oEiKmn77 UOrovljQLclYI+1dynsCLihg5r8GG4OF7UGtfNlrFeH9aON0MPCjXONrVCi/kLLbWv+5 ZrDA== X-Gm-Message-State: AMke39mLMrdkhi5+xZH9Lv2OKZoDOvkmmQ2W9xjsGulaVp8rwbGCyxFIuis78xzRgAQuZg== X-Received: by 10.99.45.133 with SMTP id t127mr19003112pgt.224.1488787252337; Mon, 06 Mar 2017 00:00:52 -0800 (PST) Received: from localhost.localdomain (h175-177-005-137.catv02.itscom.jp. [175.177.5.137]) by smtp.gmail.com with ESMTPSA id 67sm37486128pfd.120.2017.03.06.00.00.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Mar 2017 00:00:51 -0800 (PST) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2017 17:00:46 +0900 Message-Id: <1488787246-12483-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 Subject: [FFmpeg-devel] [PATCH] matroska: add DSD 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: Takayuki 'January June' Suwa MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" this patch makes transporting several (low-bitrate to hi-res) music data more simpler. almost major/defacto-std lossy/lossless audio codecs such as MP3, AAC, FLAC, etc. and now DSD can be muxed by the single way :) global/per-stream metadata seems to be exported correctly. --- libavformat/matroska.c | 2 ++ libavformat/matroskaenc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 6af667c..125a026 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -48,6 +48,8 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S24LE}, {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_S32LE}, {"A_PCM/INT/LIT" , AV_CODEC_ID_PCM_U8}, + {"A_PDM/DSD/LSBF" , AV_CODEC_ID_DSD_LSBF}, + {"A_PDM/DSD/MSBF" , AV_CODEC_ID_DSD_MSBF}, {"A_QUICKTIME/QDMC" , AV_CODEC_ID_QDMC}, {"A_QUICKTIME/QDM2" , AV_CODEC_ID_QDM2}, {"A_REAL/14_4" , AV_CODEC_ID_RA_144}, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1605f0c..a9503f6 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2528,6 +2528,8 @@ static const AVCodecTag additional_audio_tags[] = { { AV_CODEC_ID_PCM_S16BE, 0xFFFFFFFF }, { AV_CODEC_ID_PCM_S24BE, 0xFFFFFFFF }, { AV_CODEC_ID_PCM_S32BE, 0xFFFFFFFF }, + { AV_CODEC_ID_DSD_LSBF, 0xFFFFFFFF }, + { AV_CODEC_ID_DSD_MSBF, 0xFFFFFFFF }, { AV_CODEC_ID_QDMC, 0xFFFFFFFF }, { AV_CODEC_ID_QDM2, 0xFFFFFFFF }, { AV_CODEC_ID_RA_144, 0xFFFFFFFF },