From patchwork Sat Aug 8 08:01:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 21532 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 9C053449249 for ; Sat, 8 Aug 2020 11:01:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84E4268B867; Sat, 8 Aug 2020 11:01:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D08ED68B6BF for ; Sat, 8 Aug 2020 11:01:15 +0300 (EEST) Date: Sat, 08 Aug 2020 08:01:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873675; bh=vRXXqEz+fsXuxYAkVajpyzhCledaK+YAuxmgdykd7/g=; h=Date:To:From:Cc:Reply-To:Subject:From; b=bVbP+1q/tMRVfA0HanIwNJKcMpklEJNpniKnDSS7z3aHfkYZoA74F4D+jy6M5ZzdK iZkU/oADXJeMHTdA7DiNyUlBNYEp2LOyeAVM561yCYteKto8h2w2YTyPD/lhaUpMm8 /4f8JvUsHbRCEBBFHgBBWgCOzRjby85DmKczveWU= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-4-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 4/6] avformat/argo_asf: add version_major and version_minor options 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 1770192aad..9845cb955b 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -23,6 +23,7 @@ #include "internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" +#include "libavutil/opt.h" #define ASF_TAG MKTAG('A', 'S', 'F', '\0') #define ASF_FILE_HEADER_SIZE 24 @@ -64,6 +65,7 @@ enum { }; typedef struct ArgoASFContext { + const AVClass *class; ArgoASFFileHeader fhdr; ArgoASFChunkHeader ckhdr; uint32_t blocks_read; @@ -296,8 +298,7 @@ static int argo_asf_write_header(AVFormatContext *s) ArgoASFContext *ctx = s->priv_data; ctx->fhdr.magic = ASF_TAG; - ctx->fhdr.version_major = 2; - ctx->fhdr.version_minor = 1; + /* version_{major,minor} set by options. */ ctx->fhdr.num_chunks = 1; ctx->fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; strncpy(ctx->fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(ctx->fhdr.name)); @@ -340,6 +341,37 @@ static int argo_asf_write_trailer(AVFormatContext *s) return 0; } +static const AVOption argo_asf_options[] = { + { + .name = "version_major", + .help = "set file major version", + .offset = offsetof(ArgoASFContext, fhdr.version_major), + .type = AV_OPT_TYPE_INT, + .default_val = {.i64 = 2}, + .min = 0, + .max = UINT16_MAX, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, + { + .name = "version_minor", + .help = "set file minor version", + .offset = offsetof(ArgoASFContext, fhdr.version_minor), + .type = AV_OPT_TYPE_INT, + .default_val = {.i64 = 1}, + .min = 0, + .max = UINT16_MAX, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, + { NULL } +}; + +static const AVClass argo_asf_muxer_class = { + .class_name = "argo_asf_muxer", + .item_name = av_default_item_name, + .option = argo_asf_options, + .version = LIBAVUTIL_VERSION_INT +}; + AVOutputFormat ff_argo_asf_muxer = { .name = "argo_asf", .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"), @@ -353,6 +385,7 @@ AVOutputFormat ff_argo_asf_muxer = { .write_header = argo_asf_write_header, .write_packet = argo_asf_write_packet, .write_trailer = argo_asf_write_trailer, + .priv_class = &argo_asf_muxer_class, .priv_data_size = sizeof(ArgoASFContext) }; #endif