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) {