From patchwork Sat Aug 8 08:00:33 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: 21529 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 BF9DE449212 for ; Sat, 8 Aug 2020 11:00:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9390268B6DB; Sat, 8 Aug 2020 11:00:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFEEB68B368 for ; Sat, 8 Aug 2020 11:00:37 +0300 (EEST) Date: Sat, 08 Aug 2020 08:00:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873636; bh=8Xkly5bzTqpFatv9FHkPScXi0yNvmAhkNRSjPibMWF4=; h=Date:To:From:Cc:Reply-To:Subject:From; b=gdtQeLJ/j1ZEC2QaiCju2w5+hep1+JxEG4f3AmMaYZG6bwbUODu0Ak7lZ/g5G7Uec IC209AJXRi4dKk8HhMG+s8H34wsZaZP5L8zV6Cq1TV2weZkFpV++LEejJSMSCJnyqX 8UbnykVgmveONI3O7AcE/xK75hiP73qDMcHSZ21Y= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-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 1/6] avformat/argo_asf: don't check or probe file version 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" All files I've seen are identical, irregardless of version. Until shown otherwise, assume unknown ones are too. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 671b7482f9..beec46a0d4 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -29,6 +29,12 @@ #define ASF_CHUNK_HEADER_SIZE 20 #define ASF_SAMPLE_COUNT 32 +/* + * Known versions: + * 1.1: The sample files in /game-formats/brender/part2.zip + * 1.2: Croc! Legend of the Gobbos + * 2.1: Croc 2 + */ typedef struct ArgoASFFileHeader { uint32_t magic; /*< Magic Number, {'A', 'S', 'F', '\0'} */ uint16_t version_major; /*< File Major Version. */ @@ -85,33 +91,11 @@ static void argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t * hdr->flags = AV_RL32(buf + 16); } -/* - * Known versions: - * 1.1: The sample files in /game-formats/brender/part2.zip - * 1.2: Croc! Legend of the Gobbos - * 2.1: Croc 2 - */ -static int argo_asf_is_known_version(const ArgoASFFileHeader *hdr) -{ - return (hdr->version_major == 1 && hdr->version_minor == 1) || - (hdr->version_major == 1 && hdr->version_minor == 2) || - (hdr->version_major == 2 && hdr->version_minor == 1); -} - static int argo_asf_probe(const AVProbeData *p) { - ArgoASFFileHeader hdr; - - av_assert0(AVPROBE_PADDING_SIZE >= ASF_FILE_HEADER_SIZE); - - argo_asf_parse_file_header(&hdr, p->buf); - - if (hdr.magic != ASF_TAG) + if (AV_RL32(p->buf) != ASF_TAG) return 0; - if (!argo_asf_is_known_version(&hdr)) - return AVPROBE_SCORE_EXTENSION / 2; - return AVPROBE_SCORE_EXTENSION + 1; } @@ -133,13 +117,6 @@ static int argo_asf_read_header(AVFormatContext *s) argo_asf_parse_file_header(&asf->fhdr, buf); - if (!argo_asf_is_known_version(&asf->fhdr)) { - avpriv_request_sample(s, "Version %hu.%hu", - asf->fhdr.version_major, asf->fhdr.version_minor - ); - return AVERROR_PATCHWELCOME; - } - if (asf->fhdr.num_chunks == 0) { return AVERROR_INVALIDDATA; } else if (asf->fhdr.num_chunks > 1) { From patchwork Sat Aug 8 08:00:43 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: 21530 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 C4EBF449212 for ; Sat, 8 Aug 2020 11:00:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7F2468B841; Sat, 8 Aug 2020 11:00:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68E0C68B817 for ; Sat, 8 Aug 2020 11:00:48 +0300 (EEST) Date: Sat, 08 Aug 2020 08:00:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873647; bh=+eyATSOwL7dD8p3KFDvMs23bW/6PPpaWB0Rc5x+dqD8=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=KjXTqCPC4WdckxxslBiM/Y8lscjx8cEe0XzCFrIlIBPDjB8Q64yHiLESe+e5cEohR EFasnUZRPcfPoq8Kqp8IH9jnqW3bwEkQx546KNsdRjDZEkuwtNObRT/fsgon5YYbqy KtkMT7YhALP+P6rh8gIUrpjxn4CNf1Eybd/C45OA= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-2-zane@zanevaniperen.com> In-Reply-To: <20200808075914.2296555-1-zane@zanevaniperen.com> References: <20200808075914.2296555-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 2/6] avformat/argo_asf: rename ArgoASFDemuxContext to ArgoASFContext 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index beec46a0d4..52e37f9c10 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -63,11 +63,11 @@ enum { ASF_CF_ALWAYS0 = ~(ASF_CF_BITS_PER_SAMPLE | ASF_CF_STEREO | ASF_CF_ALWAYS1) }; -typedef struct ArgoASFDemuxContext { +typedef struct ArgoASFContext { ArgoASFFileHeader fhdr; ArgoASFChunkHeader ckhdr; uint32_t blocks_read; -} ArgoASFDemuxContext; +} ArgoASFContext; #if CONFIG_ARGO_ASF_DEMUXER static void argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf) @@ -104,7 +104,7 @@ static int argo_asf_read_header(AVFormatContext *s) int64_t ret; AVIOContext *pb = s->pb; AVStream *st; - ArgoASFDemuxContext *asf = s->priv_data; + ArgoASFContext *asf = s->priv_data; uint8_t buf[FFMAX(ASF_FILE_HEADER_SIZE, ASF_CHUNK_HEADER_SIZE)]; if (!(st = avformat_new_stream(s, NULL))) @@ -198,7 +198,7 @@ static int argo_asf_read_header(AVFormatContext *s) static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) { - ArgoASFDemuxContext *asf = s->priv_data; + ArgoASFContext *asf = s->priv_data; AVStream *st = s->streams[0]; AVIOContext *pb = s->pb; @@ -227,7 +227,7 @@ static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat ff_argo_asf_demuxer = { .name = "argo_asf", .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games ASF"), - .priv_data_size = sizeof(ArgoASFDemuxContext), + .priv_data_size = sizeof(ArgoASFContext), .read_probe = argo_asf_probe, .read_header = argo_asf_read_header, .read_packet = argo_asf_read_packet From patchwork Sat Aug 8 08:00:53 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: 21531 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 A7D2A449249 for ; Sat, 8 Aug 2020 11:01:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F8CA68B877; Sat, 8 Aug 2020 11:01:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA68468B368 for ; Sat, 8 Aug 2020 11:01:04 +0300 (EEST) Date: Sat, 08 Aug 2020 08:00:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873664; bh=uJNpxfhL7klCt/TXwxqJjjHzxQFkhSt/b0ZWWXmFenI=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=QAcml7d7jLOE/n03vT7Qow6q1RF0y0/JPDbDjpflUhe97Z5poVj+6eDby99tP1yFi ooylsQYwteDcC2POwM9FPmXV/KQeUOmni6n4L3SGtV7JR/Aab/tdEfhX1c1rFZAwVV obJbqoA64adsQXHf2AZ2j8PAM0xOSwgr3dZ7e1qk= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-3-zane@zanevaniperen.com> In-Reply-To: <20200808075914.2296555-1-zane@zanevaniperen.com> References: <20200808075914.2296555-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 3/6] avformat/argo_asf: use ArgoASFContext in muxer 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" Preparation for options. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 52e37f9c10..1770192aad 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -292,29 +292,28 @@ 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; - ArgoASFFileHeader fhdr; - ArgoASFChunkHeader chdr; - - fhdr.magic = ASF_TAG; - fhdr.version_major = 2; - fhdr.version_minor = 1; - fhdr.num_chunks = 1; - fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; - strncpy(fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(fhdr.name)); - - chdr.num_blocks = 0; - chdr.num_samples = ASF_SAMPLE_COUNT; - chdr.unk1 = 0; - chdr.sample_rate = par->sample_rate; - chdr.unk2 = ~0; - chdr.flags = ASF_CF_BITS_PER_SAMPLE | ASF_CF_ALWAYS1; + const AVCodecParameters *par = s->streams[0]->codecpar; + ArgoASFContext *ctx = s->priv_data; + + ctx->fhdr.magic = ASF_TAG; + ctx->fhdr.version_major = 2; + ctx->fhdr.version_minor = 1; + 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)); + + ctx->ckhdr.num_blocks = 0; + ctx->ckhdr.num_samples = ASF_SAMPLE_COUNT; + ctx->ckhdr.unk1 = 0; + ctx->ckhdr.sample_rate = par->sample_rate; + ctx->ckhdr.unk2 = ~0; + ctx->ckhdr.flags = ASF_CF_BITS_PER_SAMPLE | ASF_CF_ALWAYS1; if (par->channels == 2) - chdr.flags |= ASF_CF_STEREO; + ctx->ckhdr.flags |= ASF_CF_STEREO; - argo_asf_write_file_header(&fhdr, s->pb); - argo_asf_write_chunk_header(&chdr, s->pb); + argo_asf_write_file_header(&ctx->fhdr, s->pb); + argo_asf_write_chunk_header(&ctx->ckhdr, s->pb); return 0; } @@ -353,6 +352,7 @@ 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_data_size = sizeof(ArgoASFContext) }; #endif 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 From patchwork Sat Aug 8 08:01:20 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: 21533 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 949B8449249 for ; Sat, 8 Aug 2020 11:01:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AD1068B8BF; Sat, 8 Aug 2020 11:01:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4112168B8AF for ; Sat, 8 Aug 2020 11:01:26 +0300 (EEST) Date: Sat, 08 Aug 2020 08:01:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873685; bh=hZYtXbV1cjjaR6Mk9CSUoX1WHs8JGGqmj4mQcZCPHGU=; h=Date:To:From:Cc:Reply-To:Subject:From; b=jHSi2LcLgW5EZx8zzup8id7k4zMUmEIVD8gJNqHuIyqhdqTrZ/Ut9/ejN2/yhc+aC gL33wTRN/BNhU2AT5aZlT24Ud5bItDdXNBEB+4PCLj4TlzCpbnpyejq2Y5eYaLpEjm IO5vDcViuApVS1S4SZlWeppxkVkEVnr3pcuHzgjw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-5-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 5/6] avformat/argo_asf: add name option 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 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 9845cb955b..3499519903 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -69,6 +69,7 @@ typedef struct ArgoASFContext { ArgoASFFileHeader fhdr; ArgoASFChunkHeader ckhdr; uint32_t blocks_read; + const char *name; } ArgoASFContext; #if CONFIG_ARGO_ASF_DEMUXER @@ -301,7 +302,10 @@ static int argo_asf_write_header(AVFormatContext *s) /* 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)); + if (ctx->name) + strncpy(ctx->fhdr.name, ctx->name, FF_ARRAY_ELEMS(ctx->fhdr.name)); + else + strncpy(ctx->fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(ctx->fhdr.name)); ctx->ckhdr.num_blocks = 0; ctx->ckhdr.num_samples = ASF_SAMPLE_COUNT; @@ -362,6 +366,14 @@ static const AVOption argo_asf_options[] = { .max = UINT16_MAX, .flags = AV_OPT_FLAG_ENCODING_PARAM }, + { + .name = "name", + .help = "embedded file name (max 8 characters)", + .offset = offsetof(ArgoASFContext, name), + .type = AV_OPT_TYPE_STRING, + .default_val = {.str = NULL}, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, { NULL } }; From patchwork Sat Aug 8 08:01:29 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: 21534 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 B652B449249 for ; Sat, 8 Aug 2020 11:01:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BA0968B8CC; Sat, 8 Aug 2020 11:01:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F08B968B7DA for ; Sat, 8 Aug 2020 11:01:34 +0300 (EEST) Date: Sat, 08 Aug 2020 08:01:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1596873694; bh=YbqEYcaeeQJ63A8UwaPzoxalSE0lWxRrBPaoghXuJCk=; h=Date:To:From:Cc:Reply-To:Subject:From; b=wkzFdxW9Z26MV7pYKbRp3DYCijJj9tsXdh0Op9Yp0hgW1duEppuVDr96MoBAbTo8V Rrhr+xJ+cCXI8ouG5gBKom7D9Z0bLZ001UYTkKqDgKg+S+0qRFNs8jqEPjrcjsVk/k ATW2YOrGklBKN2g5n2XHnnHfiyUEjHBDGHlbRX18= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200808075914.2296555-6-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 6/6] avformat/argo_asf: strip file extension from name 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" Only when the user hasn't manually specified one. Matches the original files more closely. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 3499519903..779f27c860 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -302,10 +302,25 @@ static int argo_asf_write_header(AVFormatContext *s) /* version_{major,minor} set by options. */ ctx->fhdr.num_chunks = 1; ctx->fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; - if (ctx->name) + + /* + * If the user specified a name, use it as is. Otherwise take the + * basename and lop off the extension (if any). + */ + if (ctx->name) { strncpy(ctx->fhdr.name, ctx->name, FF_ARRAY_ELEMS(ctx->fhdr.name)); - else - strncpy(ctx->fhdr.name, av_basename(s->url), FF_ARRAY_ELEMS(ctx->fhdr.name)); + } else { + const char *start = av_basename(s->url); + const char *end = strrchr(start, '.'); + size_t len; + + if(end) + len = end - start; + else + len = strlen(start); + + memcpy(ctx->fhdr.name, start, FFMIN(len, FF_ARRAY_ELEMS(ctx->fhdr.name))); + } ctx->ckhdr.num_blocks = 0; ctx->ckhdr.num_samples = ASF_SAMPLE_COUNT;