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