From patchwork Sat Aug 8 13:37:47 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: 21536 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 19BCA44BD0C for ; Sat, 8 Aug 2020 16:38:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2A1868B8FF; Sat, 8 Aug 2020 16:38:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CFC668B8FF for ; Sat, 8 Aug 2020 16:37:58 +0300 (EEST) Date: Sat, 08 Aug 2020 13:37:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596893877; bh=Hw/5xdD7ylF7EmjttVUPeGGQG5VKHPj/yK57EpkHKxQ=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=l6P3IlTm+xStExlxNJqTAUfh43pxp7NzTctxr/BIWujaRpZhrGh/fn6Bq6y2th0nP 9AFQuiXEQPESsqfCnGmL1UMqYLqmiNdpeciOxf7BhiNpetGcVNpajHdFP8Jewd+cvK ovmpW184yNVps8gG48I3E+XApcQpr+npkf8KOARU= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808133717.2311422-2-zane@zanevaniperen.com> In-Reply-To: <20200808133717.2311422-1-zane@zanevaniperen.com> References: <20200808133717.2311422-1-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 v2 2/4] 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 | 47 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index beec46a0d4..c693cfd045 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 @@ -69,6 +70,12 @@ typedef struct ArgoASFDemuxContext { uint32_t blocks_read; } ArgoASFDemuxContext; +typedef struct ArgoASFMuxContext { + const AVClass *class; + int version_major; + int version_minor; +} ArgoASFMuxContext; + #if CONFIG_ARGO_ASF_DEMUXER static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf) { @@ -293,12 +300,13 @@ static void argo_asf_write_chunk_header(const ArgoASFChunkHeader *ckhdr, AVIOCon static int argo_asf_write_header(AVFormatContext *s) { const AVCodecParameters *par = s->streams[0]->codecpar; + ArgoASFMuxContext *ctx = s->priv_data; ArgoASFFileHeader fhdr; ArgoASFChunkHeader chdr; fhdr.magic = ASF_TAG; - fhdr.version_major = 2; - fhdr.version_minor = 1; + fhdr.version_major = (uint16_t)ctx->version_major; + fhdr.version_minor = (uint16_t)ctx->version_minor; fhdr.num_chunks = 1; fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; strncpy(fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(fhdr.name)); @@ -341,6 +349,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(ArgoASFMuxContext, 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(ArgoASFMuxContext, 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 +392,8 @@ AVOutputFormat ff_argo_asf_muxer = { .init = argo_asf_write_init, .write_header = argo_asf_write_header, .write_packet = argo_asf_write_packet, - .write_trailer = argo_asf_write_trailer + .write_trailer = argo_asf_write_trailer, + .priv_class = &argo_asf_muxer_class, + .priv_data_size = sizeof(ArgoASFMuxContext) }; #endif