From patchwork Thu Jul 1 14:15:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp691066ios; Thu, 1 Jul 2021 07:16:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd6JIpNA9PwjW4KA5ya7PmLrBBd+z8rtzjbLZI6uUBrznhCT5HZtAiKy2d8bFQStSL+zSJ X-Received: by 2002:aa7:c857:: with SMTP id g23mr91748edt.100.1625148997668; Thu, 01 Jul 2021 07:16:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625148997; cv=none; d=google.com; s=arc-20160816; b=AELxJYVenXRlOnQKWIIXcO5ojqtYYnVCzHmz56YaPJChCrFbvijHZFhj4afSKPPGjE 12CwVy3dF2MDlpL7aKdW/V08AsLbfO112eAv+mc2PJ7oSSf3D3m2y/aJ70CzUE77mWeN 6KfmOWorVD9CqqenhsNtLsFGQmTjRD7l5A/zbR8j3hNG2iqs+lQGE4QbKiwbt9ued8rQ Nl2SoanP7dQilwqdM4DKRnqrcdxGxl0L4ejhOcid6yx3UlTz9aLgLFOqMDybUNT6fyu/ 2BAUhoSHds0Fdw7GkyQlJLRexmmduoHz90ZNGm9ByLqzNCZC/4TXSdzXErJp5gWmc8lr 6VcQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=SKL60/Y7WwRCt5hlrkNNZjhPi2r6O4QxVYp7dyMUIHY=; b=l8WgCmpqT6bynyHKL7BZaCs5OuIK8HhKvXVrc1jrrxyP38f6sxKQjMIzpTXZ2l41g4 4f0KZD0MVP8/qzoNAnIbw2b4/wXKpJ2AlpLgLRVBzONIZ38ySQrkKc+7KETYwccTnwY5 hhvQRb8hjH1E0594n/lHJxHV5e67X6euP06/P4m1oUweJfHzt/eIEKBhTKobcKoKOEE9 WFpb58FH5BtGARPScR/UI4SK8Zu8UDwIy/to/30Edqc+gstCI4cVHCZLnVuQe36hNk36 J/jGGy7NFlmTJvp1dZdEpxXp6MrjMUoWXqj+XHht5Qut2ivAXP5RXyvrQmmGIDCeQ4iF 6jCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W0beLFEN; 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 n16si23375421edw.182.2021.07.01.07.16.14; Thu, 01 Jul 2021 07:16: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=W0beLFEN; 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 EB644687F7D; Thu, 1 Jul 2021 17:16:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3316A687F7D for ; Thu, 1 Jul 2021 17:16:03 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id c15so3705887pls.13 for ; Thu, 01 Jul 2021 07:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=t6YSCtQj91byY+LOXLA/LWIQCgwKBqAKDqOaJQbe2S4=; b=W0beLFENX4Ifda0Lt0gp7Y7cHWWdIMvzCdzYSOvls7/dgPBTjk32xs+TV+v9o2NrEB thBJd5d5gHefGMTg/fXT4SQ5jYFteS/IkGZD/q+ZpsXUXNYjoORn6aR9WWK0Ddx/DsAm VAkzaGt4Jy3NizmGzFfrD3+zON2PaR5vz21ZSPAEx5PVTSMtX6NQT7pL/nqxJsYbzV8v ihwdeqr5CJ61VAeeOKVwi4vF0Ss1Q7wZ6aA3aA7Exo1NiG37RKF5eyVkrZpR2Sugss2/ TYmMkyVLSG3tTTLZck91FL1nmB3YlX9m4YUAY1zCJqwwn8g7JVr/d+iYT8ZZrSqGprQf hoAg== 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:mime-version :content-transfer-encoding; bh=t6YSCtQj91byY+LOXLA/LWIQCgwKBqAKDqOaJQbe2S4=; b=U8nziFVVinhLJmvIX5w1rkarwbBcZ/ZxbWjxcLjsNafM7TS0NCjpuZbEWjvVC33xiW 4Q3W0LOGt84eSPOliUVMZtPkxcBLy3y/sB4ZrM44gI+3cjYXV873LDMTf+J1Aeu8Cjfg zeNvRmRAiFbu6dP3aNEKZ1tD4HvUxwYeWOd8AWECzD+hb1BsYMK5qzrKuSAtUXRrbm6r qIstO9R6aSVK2h6TJxKGxwN4nB2ZN7Xr3SClfVwJXe4uf/tCbXt37I7JC+Wh9Kx5UYKz lY4ApdsuiIIhUfzSRESIsSl2ludchsdaTvCdSN7bJF4mf+SMy3K36/YKtP2BRjjhWoZy +hzw== X-Gm-Message-State: AOAM531JI4A+d8lVEW7YmkAbff67PKYWXBgEgOA6t4gec3uyv2yVVYk+ CUvbteBfs8UGazio3ttCXauP/cPYW+M= X-Received: by 2002:a17:90a:9511:: with SMTP id t17mr46265436pjo.108.1625148960716; Thu, 01 Jul 2021 07:16:00 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.70]) by smtp.gmail.com with ESMTPSA id y3sm27226834pga.72.2021.07.01.07.15.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 07:16:00 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Jul 2021 11:15:26 -0300 Message-Id: <20210701141528.776-1-jamrial@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/flv: add support for h265 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: OqhRc99z0+Aa From: Matthieu Patou Suggested-by: ffmpeg@fb.com Signed-off-by: James Almer --- libavformat/flv.h | 1 + libavformat/flvdec.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libavformat/flv.h b/libavformat/flv.h index 3571b90279..7a026d3217 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -110,6 +110,7 @@ enum { FLV_CODECID_H264 = 7, FLV_CODECID_REALH263= 8, FLV_CODECID_MPEG4 = 9, + FLV_CODECID_H265 = 10, }; enum { diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 60d1a5c654..ba60d71196 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -321,6 +321,8 @@ static int flv_same_video_codec(AVCodecParameters *vpar, int flags) return vpar->codec_id == AV_CODEC_ID_VP6A; case FLV_CODECID_H264: return vpar->codec_id == AV_CODEC_ID_H264; + case FLV_CODECID_H265: + return vpar->codec_id == AV_CODEC_ID_H265; default: return vpar->codec_tag == flv_codecid; } @@ -366,6 +368,11 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, vstream->internal->need_parsing = AVSTREAM_PARSE_HEADERS; ret = 3; // not 4, reading packet type will consume one byte break; + case FLV_CODECID_H265: + par->codec_id = AV_CODEC_ID_H265; + vstream->internal->need_parsing = AVSTREAM_PARSE_HEADERS; + ret = 3; // not 4, reading packet type will consume one byte + break; case FLV_CODECID_MPEG4: par->codec_id = AV_CODEC_ID_MPEG4; ret = 3; @@ -1241,6 +1248,7 @@ retry_duration: if (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_MPEG4) { int type = avio_r8(s->pb); size--; @@ -1250,7 +1258,9 @@ retry_duration: goto leave; } - if (st->codecpar->codec_id == AV_CODEC_ID_H264 || st->codecpar->codec_id == AV_CODEC_ID_MPEG4) { + if (st->codecpar->codec_id == AV_CODEC_ID_H264 || + st->codecpar->codec_id == AV_CODEC_ID_H265 || + st->codecpar->codec_id == AV_CODEC_ID_MPEG4) { // sign extension int32_t cts = (avio_rb24(s->pb) + 0xff800000) ^ 0xff800000; pts = av_sat_add64(dts, cts); @@ -1266,7 +1276,7 @@ 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_H264 || st->codecpar->codec_id == AV_CODEC_ID_H265)) { AVDictionaryEntry *t; if (st->codecpar->extradata) { From patchwork Thu Jul 1 14:15:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28730 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp691259ios; Thu, 1 Jul 2021 07:16:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/+ZYEYMec67hcgCtdxWRzK/QoOBeoYu15xN4oT/NMZgB/J2HydmexKaQPcfdAi8/z66+N X-Received: by 2002:a17:907:d9f:: with SMTP id go31mr29000ejc.165.1625149009171; Thu, 01 Jul 2021 07:16:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625149009; cv=none; d=google.com; s=arc-20160816; b=E0tGRrLurFhdI07WM3V3Fc/113cC08y6WGwCwYmrn/t5vroR5wKT6sz7HqQ+F8/03g XDFpQ9tGwWPNPgObSTMTS4h0/+5yiHFeBkD0FR0IvLd0j6h5TM8xomESFr7t2YayfqHx eX09I8ue6JZqnpRagePGo8GXDOF7gHZ3w0FvVAso8lztS5xTw3z+1pZCFF+XHrb+4Zmz Qiz9qQerGQc+YfSc9rD8eosG+hEQJnxt6Dl9FF2gh9IwfmPM9SwPw26ecyLtcpX5vt/2 eT1S911Yp3hiI0PD0EGjla7gjkCOC6S10GoCLtn3jcDUsyk02GmzyR1UsqPQ9mhzjpAn UzLg== 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=CIp3QYKbIxie6W64dZQsvXBNe8+YHYOpdqK53Ee/vLQ=; b=Hd7ax1qvw7WEmWHu22Eyu0hpOXpBaoTxxVV2A5WCZq2uFreI/XLXgg5cKaZ+fvajuv 8sk5gq1GXWAGevRGOfyvJfs8oqwwhe2LDsX2448kSv+IFdi169AuWOUjH/ewMQIPvHlC /Shc6N+30+6EsbwkjyD5hdZEQ8tJaW2a3OPJ1lru8veHl+yLzJfFs9AY1HZLn3x8WAcZ EctIW6G/rc/hL073fS3TjAHLM8NllY5PxI2TYwTdH79TZSG+e1bDBCE4Xqkk7axNkfp7 6edmXLWsSGwbVn7202TEARG1HUUbfc4w5YPD297t6foJx772TukW+d4alrICzDqtEMY1 +rCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TChSYSZA; 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 z2si15953744edb.563.2021.07.01.07.16.28; Thu, 01 Jul 2021 07:16:49 -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=TChSYSZA; 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 6E1FB68A53E; Thu, 1 Jul 2021 17:16:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDE85687F7D for ; Thu, 1 Jul 2021 17:16:03 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id c15so3705917pls.13 for ; Thu, 01 Jul 2021 07:16:03 -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=u82WIX2aNzTSPg886fenXZRPH+XT3P2xhL98TxaO5vk=; b=TChSYSZAx1NDebkof+2V/DjyvKmZCwqEussqVqMZrSfuTXjCajEi0Qg1BmYgWnWEwp 4uiAwkP599ApM1N1ef8xGnxxlUWe0lStEWUu3Uh1MxMNdT8xV4xA3eFOyAGL+XQBqcfA vOxwxXElk2sVbh7+Zc5hq1blZ5L5JPW02bxVGTdFjVBUZWDHIcpZ//two2F+ez8Cp6yA iAMySMsOdkQojMuG+/4JQjBfNI9xdDN3BvidIZ3sRsfGUd1DfK/ZsvBhei/kJwgcvzk9 KyhVfIPY869mUNByX8WoRtkzGDwmBVUwPDuu3S1ceU9Pt4HfMt03hfGDc7mrnnyeL51d UFEg== 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=u82WIX2aNzTSPg886fenXZRPH+XT3P2xhL98TxaO5vk=; b=hR0+toFoHd4ODbMPzF1xj3Ck3+IHEVIjBydRHIkoyWQZXcPoobuFo8PFu1mmsU1QxU Qf4Yhsn0/ezZlHFwtZx2lulWE2R36MvH3Cn5ZuX6yJlSyc6/46fesCcn2gjs8+hkeESG 6M9YY9ZEAQ+KafUhiW7LoEsBwHti9PTxoQ7i+eVQyux9SGrwhf627Z3WqZDouyt19DjI HOPPX8yGD5c+95Y3ark7HzHzqVwTTbWK/KDQv/3MPoqZR1t689fP2pxrYBaoTMHsLG2j +hO0P7vweKD5LtjofxEFY4gVKLCKambEqjTdy4Zm7rmpS4XUmfYy99g4UZgx9g5eChss kdSA== X-Gm-Message-State: AOAM530Tri2Dsi99/c630uan7Iov+XETV3V7X8usKdC3ALapTp/oFeVV LuBq9iah8EuYcq+NQOB8P/FNOQGszX0= X-Received: by 2002:a17:903:31d1:b029:120:2863:cba2 with SMTP id v17-20020a17090331d1b02901202863cba2mr135429ple.28.1625148962082; Thu, 01 Jul 2021 07:16:02 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.70]) by smtp.gmail.com with ESMTPSA id y3sm27226834pga.72.2021.07.01.07.16.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 07:16:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Jul 2021 11:15:27 -0300 Message-Id: <20210701141528.776-2-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 2/3] avformat/flv: add support for vp8 and vp9 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: rmaj3zPkBb3B From: Matthieu Patou Suggested-by: ffmpeg@fb.com Signed-off-by: James Almer --- libavformat/flv.h | 2 ++ libavformat/flvdec.c | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libavformat/flv.h b/libavformat/flv.h index 7a026d3217..29bb36f7f6 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -111,6 +111,8 @@ enum { FLV_CODECID_REALH263= 8, FLV_CODECID_MPEG4 = 9, FLV_CODECID_H265 = 10, + FLV_CODECID_VP8 = 11, + FLV_CODECID_VP9 = 12, }; enum { diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index ba60d71196..dafedb4770 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -323,6 +323,10 @@ static int flv_same_video_codec(AVCodecParameters *vpar, int flags) return vpar->codec_id == AV_CODEC_ID_H264; case FLV_CODECID_H265: return vpar->codec_id == AV_CODEC_ID_H265; + case FLV_CODECID_VP8: + return vpar->codec_id == AV_CODEC_ID_VP8; + case FLV_CODECID_VP9: + return vpar->codec_id == AV_CODEC_ID_VP9; default: return vpar->codec_tag == flv_codecid; } @@ -377,6 +381,12 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, par->codec_id = AV_CODEC_ID_MPEG4; ret = 3; break; + case FLV_CODECID_VP8: + par->codec_id = AV_CODEC_ID_VP8; + break; + case FLV_CODECID_VP9: + par->codec_id = AV_CODEC_ID_VP9; + break; default: avpriv_request_sample(s, "Video codec (%x)", flv_codecid); par->codec_tag = flv_codecid; @@ -1249,7 +1259,9 @@ retry_duration: if (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_MPEG4) { + st->codecpar->codec_id == AV_CODEC_ID_MPEG4 || + st->codecpar->codec_id == AV_CODEC_ID_VP8 || + st->codecpar->codec_id == AV_CODEC_ID_VP9) { int type = avio_r8(s->pb); size--; @@ -1276,7 +1288,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_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)) { AVDictionaryEntry *t; if (st->codecpar->extradata) { 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) {