From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 00939498C6 for ; Fri, 22 Mar 2024 10:36:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F83968D5CF; Fri, 22 Mar 2024 12:36:03 +0200 (EET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B443B68D5C4 for ; Fri, 22 Mar 2024 12:35:55 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-414793fdc55so4882645e9.0 for ; Fri, 22 Mar 2024 03:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711103755; x=1711708555; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ywx2CMvJhcxwBLdEuWxI8GIGGH6MYipRlgR9vKAmb80=; b=hZGSHPGjNCdR4Qzb9C0enJmeZylEk4YeCuSzKPxaUotoq3Q0pwhYLbtSQgN/d0iKHz it49hDMhQWnZ3FT4j5geytRWfW6dosOWB/jBTV07TYjKVlOPy1KK/QrlCzGoTuUgN0Fv q2scoBM3okFaFwiuxO44vshYJFaRdkfD0RCD0e9PFtXqG5dqT4wxd0SlT1UYsNmbWpLp GpXLhVnqq4gLovjexJmejIRh7PUzS3Q+07w+n7ufqAK29B2uPhDZdhUuoWrcPtz+/2ki dP8/0SWVNeQtHX+rbO7yA6jkFN96mF2Z21/vNhUsavAnfVyh2Q+RyQUKxzrJB4bv7yTv aRSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711103755; x=1711708555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ywx2CMvJhcxwBLdEuWxI8GIGGH6MYipRlgR9vKAmb80=; b=ZvXezcuCl+kl3b4m/1HH4/Z0HrKwKnsNOtBlSg1Io3R1e2sld9M7WgbtfrbBntLJOo 9b9cHsmpE9tbIyYIOSXgUHcSjmt40S/uQz90eyFcbyy34MXf/m07EcWgp52wfjxS2dcV Fe1QqvNbV9VbX+OynYnQSyVQHe8YCLWjUF7bdtMFwHjFIPcRSAcu6ohXSs2HZQ411ZGu vQ8M6Nnx7qb2EOYEciUgZjD3ujFHC+pd0U1hCftBX0CKTIGDi680t3OhacEA+LKfi3wk 73R5r1jGR/tYYl0KSykEd0KIixaAWtc9AegxHLyYL8Rk0vnzOpufyo4A8MxmDPd90EKO X/Kg== X-Gm-Message-State: AOJu0Yw06gNvTmJxia15PlsSTLwTuXzPieTiOLIh9DPJ6yK/4vve+kRE qfTGbCZbZ1oolwXrxtCMn/pIBJwMZ4cVOenvp/qsx1GjqFkwVvws0RIVrFgMzno= X-Google-Smtp-Source: AGHT+IFWZ6MylchC9JPNdVSvdeHMGVacEDLMDY7F/yCInvJCXCKk4uykY5x700Mhrp6sr1s6AIyb2A== X-Received: by 2002:a05:600c:35cf:b0:414:255:c6a7 with SMTP id r15-20020a05600c35cf00b004140255c6a7mr1254558wmq.32.1711103754734; Fri, 22 Mar 2024 03:35:54 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id fk12-20020a05600c0ccc00b004147dd0915dsm701655wmb.21.2024.03.22.03.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 03:35:54 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2024 18:35:39 +0800 Message-Id: <20240322103539.3948034-2-mypopy@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240322103539.3948034-1-mypopy@gmail.com> References: <20240322103539.3948034-1-mypopy@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavf/movenc: small cleanup for style X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Jun Zhao , Jun Zhao Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Jun Zhao Small cleanup for style, indent, switch case lables. BTW, the preferred way to ease multiple indentation levels in a switch statement is to align the switch and its subordinate case labels in the same column Signed-off-by: Jun Zhao --- libavformat/movenc.c | 71 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 029b08c0b0..2f0a883013 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -668,10 +668,10 @@ static int mov_write_enda_tag(AVIOContext *pb) static int mov_write_enda_tag_be(AVIOContext *pb) { - avio_wb32(pb, 10); - ffio_wfourcc(pb, "enda"); - avio_wb16(pb, 0); /* big endian */ - return 10; + avio_wb32(pb, 10); + ffio_wfourcc(pb, "enda"); + avio_wb16(pb, 0); /* big endian */ + return 10; } static void put_descr(AVIOContext *pb, int tag, unsigned int size) @@ -979,9 +979,9 @@ static int mov_write_wave_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra ffio_wfourcc(pb, "wave"); if (track->par->codec_id != AV_CODEC_ID_QDM2) { - avio_wb32(pb, 12); /* size */ - ffio_wfourcc(pb, "frma"); - avio_wl32(pb, track->tag); + avio_wb32(pb, 12); /* size */ + ffio_wfourcc(pb, "frma"); + avio_wl32(pb, track->tag); } if (track->par->codec_id == AV_CODEC_ID_AAC) { @@ -991,9 +991,9 @@ static int mov_write_wave_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra avio_wb32(pb, 0); mov_write_esds_tag(pb, track); } else if (mov_pcm_le_gt16(track->par->codec_id)) { - mov_write_enda_tag(pb); + mov_write_enda_tag(pb); } else if (mov_pcm_be_gt16(track->par->codec_id)) { - mov_write_enda_tag_be(pb); + mov_write_enda_tag_be(pb); } else if (track->par->codec_id == AV_CODEC_ID_AMR_NB) { mov_write_amr_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_AC3) { @@ -1805,11 +1805,11 @@ static const struct { static int mov_get_dnxhd_codec_tag(AVFormatContext *s, MOVTrack *track) { - int tag = MKTAG('A','V','d','n'); - if (track->par->profile != AV_PROFILE_UNKNOWN && - track->par->profile != AV_PROFILE_DNXHD) - tag = MKTAG('A','V','d','h'); - return tag; + int tag = MKTAG('A','V','d','n'); + if (track->par->profile != AV_PROFILE_UNKNOWN && + track->par->profile != AV_PROFILE_DNXHD) + tag = MKTAG('A','V','d','h'); + return tag; } static int mov_get_rawvideo_codec_tag(AVFormatContext *s, MOVTrack *track) @@ -2997,18 +2997,18 @@ static int mov_write_gmhd_tag(AVIOContext *pb, MOVTrack *track) * bytes are copied verbatim. */ if (track->tag != MKTAG('c','6','0','8')) { - avio_wb32(pb, 0x2C); /* size */ - ffio_wfourcc(pb, "text"); - avio_wb16(pb, 0x01); - avio_wb32(pb, 0x00); - avio_wb32(pb, 0x00); - avio_wb32(pb, 0x00); - avio_wb32(pb, 0x01); - avio_wb32(pb, 0x00); - avio_wb32(pb, 0x00); - avio_wb32(pb, 0x00); - avio_wb32(pb, 0x00004000); - avio_wb16(pb, 0x0000); + avio_wb32(pb, 0x2C); /* size */ + ffio_wfourcc(pb, "text"); + avio_wb16(pb, 0x01); + avio_wb32(pb, 0x00); + avio_wb32(pb, 0x00); + avio_wb32(pb, 0x00); + avio_wb32(pb, 0x01); + avio_wb32(pb, 0x00); + avio_wb32(pb, 0x00); + avio_wb32(pb, 0x00); + avio_wb32(pb, 0x00004000); + avio_wb16(pb, 0x0000); } if (track->par->codec_tag == MKTAG('t','m','c','d')) { @@ -4853,16 +4853,15 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat param_write_int(pb, "DisplayHeight", track->par->height); } else { if (track->par->codec_id == AV_CODEC_ID_AAC) { - switch (track->par->profile) - { - case AV_PROFILE_AAC_HE_V2: - param_write_string(pb, "FourCC", "AACP"); - break; - case AV_PROFILE_AAC_HE: - param_write_string(pb, "FourCC", "AACH"); - break; - default: - param_write_string(pb, "FourCC", "AACL"); + switch (track->par->profile) { + case AV_PROFILE_AAC_HE_V2: + param_write_string(pb, "FourCC", "AACP"); + break; + case AV_PROFILE_AAC_HE: + param_write_string(pb, "FourCC", "AACH"); + break; + default: + param_write_string(pb, "FourCC", "AACL"); } } else if (track->par->codec_id == AV_CODEC_ID_WMAPRO) { param_write_string(pb, "FourCC", "WMAP"); -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".