From patchwork Tue Aug 18 22:00:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ze Yuan X-Patchwork-Id: 21724 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9AB18449705 for ; Wed, 19 Aug 2020 01:00:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61F776880D7; Wed, 19 Aug 2020 01:00:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2080.outbound.protection.outlook.com [40.92.41.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A92468080C for ; Wed, 19 Aug 2020 01:00:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TKGQGzpLxcLi7ZweKF+61Uq1xOXW/+7E2HCPo+VxSSQjFanVdGjaSCcC+4GWr5QaXF/+/rAVa+QCk/SHAhZFPheao5GRZYTgzh+T22ff4N2yXCtMWyW9H797Xly81x/AiW973O1Nhc0f9rX/8gINMmAO5dR0US/yeKO/jlytM5jgbGMana3MebMcXTxqcROPjyAkfzv8D2TPx91SZw2EFdIkKWksdvGqyeTGc3oKKteUsO2yyYJqAriJfVDqUwPJfq5K8YE2hCUCb/mmWgXoaV76umkMDs+xI9p+K/7Xc+MOdgqPvY3lwxgb68DXoD0cCjUtj4AGewmpFWfJRxGEPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1i3tKfy8kz1nS3qdDX+G9+NyPVGbsIPSg+9pKRdZWfs=; b=LZFqYNhKvcoBxtSqGpwksIN63rEtDy8IaSwFTiIxFT0ZQWTnclj1w24bothNnVUrirT2mPxKdToGeHCnUN4cReNqYLZppThINO5EZIRLec2m32YvxeCAFp9jk55YDyB5lDQaiIY7S54crIyPawxOYRylKARnzjjsD9f0yGH6RJjHXMHdJ6O1SiOF/DorFlAAdpX4DvtdEjvT8k7ZT8m6NM/cn02xOBOuOa3KvVStHAXLUXLt/5+owZS066ZaBDRqoeeo6WYhjBHFtlPdauAXMcysaSf10X8OECDE9G4JFNkJO8BO7xW9/DEZOYTZclzldF4Dsyl+gw9TKgtwMem+ag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1i3tKfy8kz1nS3qdDX+G9+NyPVGbsIPSg+9pKRdZWfs=; b=HRYVd0q19Ko7KFRoRJk/IYqIrvQri4z2GFMp2GReuHm69O22Ut9zk7ncLqiPjOhuU96YYEvnb3kJPprdd13fyMUEHy5flfl8pYf6ioZqm6WXRuso9Dl4drI3xHhASy5NpZmZO0FtwKAsjU5n0qkFhlEG2TXuFmDxvu9SHJfvu6+xROQrax2BvMJtCir/6+9pngt3f5OGg17xlbcwT6U9GamVXf0b+JRrhXtomNT4KoROnHhMTUcmZeGhAhWtr9uNTN0ve5xwX4oFiGqyMqA6Il2a/LpDq+C5NztjHiy/v7psx1R9PdDYL0rdBIiw2HcIFdalH5gy6Rz/2QGwAgCTPg== Received: from DM6NAM10FT036.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e86::4d) by DM6NAM10HT201.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e86::229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.17; Tue, 18 Aug 2020 22:00:33 +0000 Received: from BYAPR03MB4536.namprd03.prod.outlook.com (2a01:111:e400:7e86::42) by DM6NAM10FT036.mail.protection.outlook.com (2a01:111:e400:7e86::438) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.17 via Frontend Transport; Tue, 18 Aug 2020 22:00:33 +0000 Received: from BYAPR03MB4536.namprd03.prod.outlook.com ([fe80::f83a:ae3e:8ed2:4f7d]) by BYAPR03MB4536.namprd03.prod.outlook.com ([fe80::f83a:ae3e:8ed2:4f7d%5]) with mapi id 15.20.3305.024; Tue, 18 Aug 2020 22:00:33 +0000 From: Ze Yuan To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 1/1] Added avs2 tags for MKV Thread-Index: AQHWdar+UEiqrwx+EUiVLxI8C+eExg== Date: Tue, 18 Aug 2020 22:00:33 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:0D08E9C3F56D4E7EADA23C3A87BF9D4445F147B59E77F8D16F45CD75614ED4FB; UpperCasedChecksum:BDEBD72B85E8AC9CCD703E71A2261F087EE2CBAC5052839E612FE8BD7B5A9E4C; SizeAsReceived:6671; Count:42 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [sga4zDAFF7YjFzGtMSGc1/H469CMMECv] x-ms-publictraffictype: Email x-incomingheadercount: 42 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: c3d797ac-ec6f-483d-5a80-08d843c2215c x-ms-traffictypediagnostic: DM6NAM10HT201: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kulcOTMieOEqiXinu2ldS823DInRrBKrY4A54kHxZhlQbTVza9YkqwCmw2HVD7CZmFfV8SOmKa4yUpsPnU/Bs6RYvMqTogL6/6H7n7S7pi0HqXR1J3pRVgxf9RMTTA+Iw1TU/7/2lO480ZZUMbS+n+gWu/qIAuJSvkbJC5K1LsJoYiE6ZJvau4lApPz81tJ8bypMMemBDH7YRIuNaXcMQmTjRnlF8cue6KSUgb92sij+gbKsg4UcRnhncDCybhRS x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:0; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR03MB4536.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:; DIR:OUT; SFP:1901; x-ms-exchange-antispam-messagedata: yUL000B3fw8pwZ4zfX/9jZBIzeTks+QcEUqbdmhg2YGpBJlfY9mBE7Ot+zJedHL836udz+igKAGaiFu4vNpDyZZ0RUDZE2MNNI46Z4bl7qnWmf56qV2glEndPvghrsS4JUnAHINFvZ/m5NyDlpUJTw== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-AuthSource: DM6NAM10FT036.eop-nam10.prod.protection.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: c3d797ac-ec6f-483d-5a80-08d843c2215c X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Aug 2020 22:00:33.3833 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM10HT201 Subject: [FFmpeg-devel] [PATCH 1/1] Added avs2 tags for MKV 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From d4ae49d8fabdb70435c92457c153a869dc55a980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E5=A4=A9=E6=B3=A2?= Date: Wed, 19 Aug 2020 05:20:18 +0800 Subject: [PATCH] Added avs2 tags for MKV container. Before the patch, an avs2 encoded MKV video results in dropped frames in asv2 enabled video players. Here are the asv2/avs3 enabled video players: VLC 3: https://github.com/xatabhk/vlc-3.0-avs2-avs3/releases/tag/v3.0-avs2-avs3-200812 Mpc-hc: https://gitee.com/zhengtianbo/cavs-avs2-avs3_decoder_added_to_mpc_hc/releases --- libavformat/isom.c | 3 ++- libavformat/matroska.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index 209bbac5d1..080a457a4e 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -255,7 +255,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_PNG, MKTAG('M', 'N', 'G', ' ') }, { AV_CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */ - { AV_CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') }, + { AV_CODEC_ID_CAVS, MKTAG('c', 'a', 'v', 's') }, + { AV_CODEC_ID_AVS2, MKTAG('a', 'v', 's', '2') }, { AV_CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') }, { AV_CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */ diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 7c56aba403..2ce60c6277 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -78,6 +78,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_AV1" , AV_CODEC_ID_AV1}, + {"V_AVS2" , AV_CODEC_ID_AVS2}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG},