From patchwork Fri May 25 14:16:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Keroulas X-Patchwork-Id: 9076 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1398848jad; Fri, 25 May 2018 07:17:05 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq4UxBrmvh39iKq1U2PzO0/nkxogJNyC9z8Bf5E4JUwWjC5NuxtsVW8dgTK7xgncQdA1AK8 X-Received: by 2002:adf:8b02:: with SMTP id n2-v6mr2550345wra.282.1527257825751; Fri, 25 May 2018 07:17:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527257825; cv=none; d=google.com; s=arc-20160816; b=RBSWyZG3dueqjLQ3wIMBDgNenJqLQcRlltlPcyjeEOUMXa44oERzl5T0a9379KmFYL dx2E7eqC28Cj8JF7YcDpocqop+SREb/a2n63FpR5pkmR1GtJzjQmlMfHISDQKRNf+PDy GDYPja8k/v4T3CZ8RAd9J+WUbgwE34auFQ+IReD3rtKmZPBrNS0Luv0GuQp62pKRp+4Y 9gczCZ6aFmb8e01/1bt0VT7JIHCxx4j3hKK33DrFgKTZZCzqdKiUt77EbcYbsiIcAlf1 dksypZupA37SJEScFApCG/VbMAMewGAr2eS+KvU3FSpMAYXaOXxNu+rFrkvAKOKE2r9d oNhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=o17krYh+dus/10InC3HyrAGACAZrXKZsc6FuoB9M+wY=; b=dFQW5NG+JJPWKGAL4Rs20ILO/yGnxpagJFn6vAPm8DhOlUp1LEif27YYc/A3HXJC07 XALdM6DinzyFYgfN/srxxd29VnjSYfHLTQOfXzP3e0YOvSSBvqtMpplV99oePVrEFr+X ad8OqdHYOSR/+qvMY9BA9TpTCcPdfWJKL7s4HKvySO34jQcZLjHFqOF923jXjWawW8my IeXNAMNpq77R+iC34kwjhvVx7bs9epGBbZ9KO4y5uuHVge89gY8Cd1DKpfy7BJPixe7x v1LxrL/XKaslndF1op5CzhRCuOr/82m6u1bbpNsaVvL1Oy2DiT4RpWCLdF5VIN3z/OfO 9asQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p35-v6si20780475wrc.89.2018.05.25.07.16.44; Fri, 25 May 2018 07:17:05 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D6E768A173; Fri, 25 May 2018 17:15:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AEDE680649 for ; Fri, 25 May 2018 17:15:53 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 3A8589C3483 for ; Fri, 25 May 2018 10:16:34 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id NVvKbC7VwWTM; Fri, 25 May 2018 10:16:33 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id C26319C349F; Fri, 25 May 2018 10:16:33 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Y_r09BWigC_S; Fri, 25 May 2018 10:16:33 -0400 (EDT) Received: from pkeroulas.cbc-rc.ca (unknown [192.168.50.171]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 9A26C9C3483; Fri, 25 May 2018 10:16:33 -0400 (EDT) From: Patrick Keroulas To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 May 2018 10:16:28 -0400 Message-Id: <1527257791-26839-1-git-send-email-patrick.keroulas@savoirfairelinux.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v7 1/4] avcodec: add side data type for ancillary 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: Patrick Keroulas MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" avcodec: add side data type for ancillary Create a new type of side data to be attached to AVPacket in order to transmit out of band parameters for typical codecs. Signed-off-by: Patrick Keroulas --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 7 ++++++- libavcodec/avpacket.c | 1 + libavcodec/version.h | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index efe15ba..ff2baff 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-05-xx - xxxxxxxxxx - lavc 58.20.100 - avcodec.h + Add AV_PKT_DATA_ANCILLARY to hold various side data. + 2018-05-xx - xxxxxxxxxx - lavf 58.15.100 - avformat.h Add pmt_version field to AVProgram diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fb0c6fa..fc2c5dc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1358,6 +1358,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_ENCRYPTION_INFO, /** + * Generic side data for any parameter that can't fit in a AVPacket, + * e.g. interlaced field flags. + */ + AV_PKT_DATA_ANCILLARY, + + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. @@ -1480,7 +1486,6 @@ typedef struct AVPacket { */ #define AV_PKT_FLAG_DISPOSABLE 0x0010 - enum AVSideDataParamChangeFlags { AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT = 0x0001, AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT = 0x0002, diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 99a0c13..27355e1 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -388,6 +388,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: return "Content light level metadata"; case AV_PKT_DATA_SPHERICAL: return "Spherical Mapping"; case AV_PKT_DATA_A53_CC: return "A53 Closed Captions"; + case AV_PKT_DATA_ANCILLARY: return "Ancillary data"; } return NULL; } diff --git a/libavcodec/version.h b/libavcodec/version.h index da893da..b9752ce 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 19 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MINOR 20 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \