From patchwork Thu Jul 1 14:15:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28732 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp695534ios; Thu, 1 Jul 2021 07:21:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9Jzc2KB6SJeb0gBHxYNlkb4pQ/2cRncqimkb306LCT8o2bhrDIkw6/fktdTO3sLwqoDqu X-Received: by 2002:a05:6402:520c:: with SMTP id s12mr38354edd.357.1625149297637; Thu, 01 Jul 2021 07:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625149297; cv=none; d=google.com; s=arc-20160816; b=IbFoCERB9MZJ0DDvDCj/R8+o4JPKCaVKAVpq79L7PMqeHqcqBpRIHSO1eRhEwXtGFn ix00crMuX/9PVj6W9b8rC0PHWGWUCB3/Lo1MNVG9f8PfiF+SU3MjMsRbt5Nj1E213XTF lmaJ+OnbYv0Z37u2uxYH4XvS37Vvek3tIm6a0g1DW6Q6faDDmmla+kX6FGNUJ1l3CLS4 mFUP644qfbqrRawwYKsCNhQ/x6DcPL3GXCFgzYkWvj/ebvMBws7qnujPDG5qQZ83jges NS0tXif5Woucn/4Ya4DIvXY8x/e9NM0NqQCQ0Q/nA7X14Sk+m2tClFTcy9nTo6pGuO/6 U5Sw== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=VkUiC3k5U7jH+Ot6IX2pq8ACEzMruuDinBz2NN4NNbc=; b=SKqFJBREEaL+FcVD5QEJBnDGzqoetjeNwmvIRov6DS4oCkBJXbLuzilSFXVyHkAAyH 2f9hegmCirT65LiWQyPf5WybLW8pxZT/IPWwMpX07ItmeHqRZQQI8LlGgeQTdiOSwASa Cfuo+ulo6zlVw5yluMAzB2JBFjJ5f/FpfEGl9uBlPxLZ2AeDJj5547k0iobf7skrHuiu ocwXqnx2y8mJQpucbiyaRmNSvUgJKBQRjQfFhI2XAEADOipIoqRr2SrbHldshzTrNwS6 lwhMLvgAVfvZSsa4Zrau3SjvR7E0VoHg8kSmTxN+RzIi9fAjJsHsLVTjktldVCAaqkOv XEuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Lgbl2l+A; 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 s17si6171595edr.445.2021.07.01.07.21.37; Thu, 01 Jul 2021 07:21:37 -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.s=20161025 header.b=Lgbl2l+A; 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 1F49F68A181; Thu, 1 Jul 2021 17:21:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4A3E68A181 for ; Thu, 1 Jul 2021 17:21:26 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id y4so6028047pfi.9 for ; Thu, 01 Jul 2021 07:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LFGqCxOKd1rIrfFKeAqGcfBXqtE3wZ7S35MjkVKo/SI=; b=Lgbl2l+APjwTRlckELz1lgh+/rNtzQSuKJ7odHF0WCtbM5deKUxcfYmm1EKJEV/Uay 7LO7JCpKxES7R7MDXOkAVMvShIxhIjtLxgjP++5cEzrsU5Wn3E/MQXA2bDPvA+teDtl6 xystWITYxzJ8prxE074/c2a4P0ZScB1uX1G2AyAQEpjTIh/4T0VjOTR0xGd3wisHWT1B SueGBs7E9px2OZnEILyuGYC6qFK1nfYwVvwKcT8nwitNHwiVxQ0sBQafA94MjOLPntdm 83vvQD+2xoiOtshC2DmMIp7YOzhwMsB0YhMrPcqcHCXDSM7xh0JYMGtoe6qHiLT3xExI zseA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LFGqCxOKd1rIrfFKeAqGcfBXqtE3wZ7S35MjkVKo/SI=; b=r+XBKI+ZgyaD+yTaqYMVIUiWrW+jUw3K3THOeIKZmJtiaAs5sy/Gx/h/yZ0lFBISwf xVxj1pFnR87PJOQNZ+tH7O69WMr1A96bugM52JvNPvkh8uOLu8/v2iuhJWpP6DRPOfoy eSNyfBknpJBusLXwwHP5iST2jnNNFmzEhKUKEnmUA1bCaPjjOh5+f8OlA9vqGqPUTyIt WgaN+BeF8brYllhv+QFm1B7GOhN929ltg7BZoNDo7XmE9hbwyd5XLLUlXvGgtWkzzwOB uVHgcuWGzP+WLzP0jwfn3lJxR/FH68egHBdrLj8Rk1nq4Z91OvxPOLkIKqwdtJIfONjo Paww== X-Gm-Message-State: AOAM533z5OB82+aQ/VvsSWBXMLhrKVwGJOmpGRfiiuEF7b7yCy+o+4C1 7K65V+gUkMN71TbaycObisZDX7GmWko= X-Received: by 2002:a17:902:8ec7:b029:119:a15f:3a1c with SMTP id x7-20020a1709028ec7b0290119a15f3a1cmr37595481plo.48.1625148963339; Thu, 01 Jul 2021 07:16:03 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.70]) by smtp.gmail.com with ESMTPSA id y3sm27226834pga.72.2021.07.01.07.16.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 07:16:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Jul 2021 11:15:28 -0300 Message-Id: <20210701141528.776-3-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210701141528.776-1-jamrial@gmail.com> References: <20210701141528.776-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/flv: add support for opus streams 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: ZsNMow3xJJk9 From: Matthieu Patou Suggested-by: ffmpeg@fb.com Signed-off-by: James Almer --- libavformat/flv.h | 6 ++++-- libavformat/flvdec.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libavformat/flv.h b/libavformat/flv.h index 29bb36f7f6..6f3cad04e1 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -97,8 +97,10 @@ enum { FLV_CODECID_NELLYMOSER = 6 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_PCM_ALAW = 7 << FLV_AUDIO_CODECID_OFFSET, FLV_CODECID_PCM_MULAW = 8 << FLV_AUDIO_CODECID_OFFSET, - FLV_CODECID_AAC = 10<< FLV_AUDIO_CODECID_OFFSET, - FLV_CODECID_SPEEX = 11<< FLV_AUDIO_CODECID_OFFSET, + FLV_CODECID_OPUS = 9 << FLV_AUDIO_CODECID_OFFSET, + FLV_CODECID_AAC = 10 << FLV_AUDIO_CODECID_OFFSET, + FLV_CODECID_SPEEX = 11 << FLV_AUDIO_CODECID_OFFSET, + }; enum { diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index dafedb4770..48ef220a22 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -236,6 +236,8 @@ static int flv_same_audio_codec(AVCodecParameters *apar, int flags) case FLV_CODECID_PCM_ALAW: return apar->sample_rate == 8000 && apar->codec_id == AV_CODEC_ID_PCM_ALAW; + case FLV_CODECID_OPUS: + return apar->codec_id == AV_CODEC_ID_OPUS; default: return apar->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET); } @@ -294,6 +296,9 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, apar->sample_rate = 8000; apar->codec_id = AV_CODEC_ID_PCM_ALAW; break; + case FLV_CODECID_OPUS: + apar->codec_id = AV_CODEC_ID_OPUS; + break; default: avpriv_request_sample(s, "Audio codec (%x)", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); @@ -1261,7 +1266,8 @@ retry_duration: st->codecpar->codec_id == AV_CODEC_ID_H265 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4 || st->codecpar->codec_id == AV_CODEC_ID_VP8 || - st->codecpar->codec_id == AV_CODEC_ID_VP9) { + st->codecpar->codec_id == AV_CODEC_ID_VP9 || + st->codecpar->codec_id == AV_CODEC_ID_OPUS) { int type = avio_r8(s->pb); size--; @@ -1289,7 +1295,8 @@ retry_duration: } if (type == 0 && (!st->codecpar->extradata || st->codecpar->codec_id == AV_CODEC_ID_AAC || st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_H265 || - st->codecpar->codec_id == AV_CODEC_ID_VP8 || st->codecpar->codec_id == AV_CODEC_ID_VP9)) { + st->codecpar->codec_id == AV_CODEC_ID_VP8 || st->codecpar->codec_id == AV_CODEC_ID_VP9 || + st->codecpar->codec_id == AV_CODEC_ID_OPUS)) { AVDictionaryEntry *t; if (st->codecpar->extradata) {