From patchwork Wed Apr 29 22:21:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19388 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 8B8DD44B57C for ; Thu, 30 Apr 2020 01:22:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7897068C252; Thu, 30 Apr 2020 01:22:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 231B368C1DE for ; Thu, 30 Apr 2020 01:22:30 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id i10so4451157wrv.10 for ; Wed, 29 Apr 2020 15:22:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l3D3UGWOrf13WULMfa6tORkcdb8evhjgUC/q/53mXt4=; b=ZBGjzjG937b22TB6RNYye/GCxiXu2XTmI45CEgTnuKITPDXI188iG0IoWG/Jzai2Q0 2lrJ4c9J/o66jvfF2oP12mOs1agyVE/Q4tyWom/kGQ4AkiNbubJ+F9S2K4JnrywS1IIt CnGSQ4O0skigczYXd8Xe/Nao0alYt0VBqBlmJqXoR8go7cvJjGEngMy7MF+si3e9T9Wf oHGiZz8UZikCPONO5psyf19BBJM6ibSz2/GyyD2lgBDWMpd1CzWujrZYAa3fONeUJ84R aoIaqWNMNLkIqB5RHrQKGw4F3+IHDXk+s7a6/CP0VIu2LsagqKs37xoV1omwsTHcbGMz mQ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=l3D3UGWOrf13WULMfa6tORkcdb8evhjgUC/q/53mXt4=; b=noEpDHDPL6+eC/5clf6gMrKPkzIEgIQUJvJkb6OXKwe05DphqQtmSIlURrNWYccrSd +Ax6kb1Yu8vVX5eikNn76OgExwYUQwGjexhN1JhFgR4ASeDNQZ3N53YbP55gGPFN9Oa2 jIsFKieS9EUX/3nY+xcsDTCu4lVHj0viqzNhGPbFq8q4GaWnxJuMXiXG1ibt2qF/Ql2/ U2lzWJzSAfUbClkcYjpmJATG0CD5thQOdxguvSrU3ETocizNeQJOfeZmzkwj05Y97eAf 7Pn7/XWwM0JtRWf6D8jAf5Bjly9MyBDEH80ZpNyhsiiNfxAiWHkeRP6z8VmmsLp6jJRc 6w8g== X-Gm-Message-State: AGi0Pua8Fc0o4Nt/tFAyzrVbirg3RZKAfYBYWlvMWJyO3kbdP604dZpK PqU9ZVkl0vS3wluGUaw8ihHHIO3C X-Google-Smtp-Source: APiQypLEF17+bJx3KjcOEoIP8htq7sd3osy8ZwK9z/oM9NP3WdmBQpERfWJzjtNCoh0aFog7a/7WVQ== X-Received: by 2002:adf:f24c:: with SMTP id b12mr100656wrp.359.1588198949179; Wed, 29 Apr 2020 15:22:29 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id x6sm1071555wrg.58.2020.04.29.15.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 15:22:28 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 00:21:56 +0200 Message-Id: <20200429222156.29129-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200429222156.29129-1-andreas.rheinhardt@gmail.com> References: <20200429222156.29129-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/matroskaenc: Cosmetics 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Mainly reindentation. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 12c22184a3..d5c69d8d77 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -376,9 +376,9 @@ static int start_ebml_master_crc32(AVIOContext **dyn_cp, MatroskaMuxContext *mkv } static int end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, - MatroskaMuxContext *mkv, uint32_t id, - int length_size, int keep_buffer, - int add_seekentry) + MatroskaMuxContext *mkv, uint32_t id, + int length_size, int keep_buffer, + int add_seekentry) { uint8_t *buf, crc[4]; int ret, size, skip = 0; @@ -413,11 +413,11 @@ fail: * Furthermore always add a SeekHead Entry for this element. */ static int end_ebml_master_crc32_tentatively(AVIOContext *pb, - ebml_stored_master *elem, - MatroskaMuxContext *mkv, uint32_t id) + ebml_stored_master *elem, + MatroskaMuxContext *mkv, uint32_t id) { if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) { - uint8_t *buf; + uint8_t *buf; int size = avio_get_dyn_buf(elem->bc, &buf); if (elem->bc->error < 0) @@ -426,9 +426,9 @@ static int end_ebml_master_crc32_tentatively(AVIOContext *pb, elem->pos = avio_tell(pb); mkv_add_seekhead_entry(mkv, id, elem->pos); - put_ebml_id(pb, id); - put_ebml_length(pb, size, 0); - avio_write(pb, buf, size); + put_ebml_id(pb, id); + put_ebml_length(pb, size, 0); + avio_write(pb, buf, size); return 0; } else @@ -816,17 +816,17 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, } if (ret >= 0) { - codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv); + codecpriv_size = avio_get_dyn_buf(dyn_cp, &codecpriv); if ((ret = dyn_cp->error) >= 0 && codecpriv_size) - put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, - codecpriv_size); + put_ebml_binary(pb, MATROSKA_ID_CODECPRIVATE, codecpriv, + codecpriv_size); } ffio_free_dyn_buf(&dyn_cp); return ret; } -static void mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par, - const AVStream *st) +static void mkv_write_video_color(AVIOContext *pb, const AVStream *st, + const AVCodecParameters *par) { /* 18 Elements with two bytes ID, one byte length field, 8 bytes payload * a master element with two bytes ID and one byte length field @@ -1304,7 +1304,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, uint32_t color_space = av_le2ne32(par->codec_tag); put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space)); } - mkv_write_video_color(pb, par, st); + mkv_write_video_color(pb, st, par); ret = mkv_write_video_projection(s, pb, st); if (ret < 0) @@ -1441,7 +1441,7 @@ static int mkv_write_tracks(AVFormatContext *s) } return end_ebml_master_crc32_tentatively(pb, &mkv->track, mkv, - MATROSKA_ID_TRACKS); + MATROSKA_ID_TRACKS); } static int mkv_write_chapters(AVFormatContext *s) @@ -1693,7 +1693,7 @@ static int mkv_write_tags(AVFormatContext *s) if (mkv->tags.bc) { return end_ebml_master_crc32_tentatively(s->pb, &mkv->tags, mkv, - MATROSKA_ID_TAGS); + MATROSKA_ID_TAGS); } return 0; } @@ -2466,7 +2466,7 @@ static int mkv_write_trailer(AVFormatContext *s) if (mkv->cluster_bc) { ret = end_ebml_master_crc32(pb, &mkv->cluster_bc, mkv, - MATROSKA_ID_CLUSTER, 0, 0, 0); + MATROSKA_ID_CLUSTER, 0, 0, 0); if (ret < 0) return ret; } @@ -2526,7 +2526,7 @@ static int mkv_write_trailer(AVFormatContext *s) } } ret = end_ebml_master_crc32(pb, &cues, mkv, MATROSKA_ID_CUES, - length_size, 0, 1); + length_size, 0, 1); if (ret < 0) return ret; if (mkv->reserve_cues_space) { @@ -2554,7 +2554,7 @@ static int mkv_write_trailer(AVFormatContext *s) // write Tracks master avio_seek(pb, mkv->track.pos, SEEK_SET); ret = end_ebml_master_crc32(pb, &mkv->track.bc, mkv, - MATROSKA_ID_TRACKS, 0, 0, 0); + MATROSKA_ID_TRACKS, 0, 0, 0); if (ret < 0) return ret; } @@ -2585,7 +2585,7 @@ static int mkv_write_trailer(AVFormatContext *s) avio_seek(pb, mkv->tags.pos, SEEK_SET); ret = end_ebml_master_crc32(pb, &mkv->tags.bc, mkv, - MATROSKA_ID_TAGS, 0, 0, 0); + MATROSKA_ID_TAGS, 0, 0, 0); if (ret < 0) return ret; }