From patchwork Sun Apr 5 15:59:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18680 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 9F51144BBAC for ; Sun, 5 Apr 2020 19:02:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 727F168B505; Sun, 5 Apr 2020 19:00:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A83CA68B1DC for ; Sun, 5 Apr 2020 19:00:16 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id a25so14464068wrd.0 for ; Sun, 05 Apr 2020 09:00:16 -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=lXp64nYkMexwNwG3Y8258jIr6OJ0q9HcQ3QLINprOOo=; b=qFixdZ8E5dICEBSovpreHiHfSE7tfmvLBEGw3M6OKVA0Wxf6TnYo34HOnaoO0p33Cq heBIZDUh2DfvsySZvJ3MT0SYmLqQcO2AhcgDk9ZCvbX7OFljXLsrxU1vbiCCxg487pTP GnrNBO9WCY2+oX16+8UbxzRushtG0Ia6wVwTcLwWcH0SWlWReZ443iGZATirqdV2CIMC KE5FDU42tj/q050KkQ7LNVVxbdXJnGfopj5nUJ9rEGhdzamsBl3madhYcSAZ3imDr71H CKyUkxNIibqCL1j/ZAT2xwrFtNt/riWzSA9HzloY4RFHHTHi0jKUJIJXZbvcR1+RiH/x xe6Q== 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=lXp64nYkMexwNwG3Y8258jIr6OJ0q9HcQ3QLINprOOo=; b=OesR9X3H/0DcOSaTaBrelm8QulzoMy3C2PJVXV+ep9ul68smpyJlaFR2ZMtMkKdmd2 pceRuTDyH0cg0nCStHVKfvFTHvvWUyKp9bD22o5ZWDLWfkFeCyo700Xjl5BUJmoB5zxU ETPoGYUkDw9uYeTcd+wEh+lmYvYT54C4X9PVzFvSr9hwZH3IWco1JQQOEIwDwbtScOdg JBIcaaj8dUEYRKBIy1fdcQNEambOdgxvQXpnn7APMIBF0d/NEhABFmi1t7Xlrpo5Z+Z6 AEf4rYpbzWPowGnAAr6Toq0EzzZ8dZX4yaLDQMKV9RcSynysa07hr25sD/S3VU3bu2Sk W0xA== X-Gm-Message-State: AGi0PuajAzznu/axcEIme1Y6SBAow+LfLZphKg78Uv+COFJ+owO1U/iF VKz++rHqOcU3zJcpgg/+3aWiqnzu X-Google-Smtp-Source: APiQypJ9LdgteJoxEBNxjzMSE6OYEpsRCob4MavdtIG71+Lx2VVMyn7sHdelrsLsX++jHnD0/QaRcA== X-Received: by 2002:a5d:4345:: with SMTP id u5mr19207041wrr.417.1586102415409; Sun, 05 Apr 2020 09:00:15 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v21sm20014567wmh.26.2020.04.05.09.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 09:00:14 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Apr 2020 17:59:25 +0200 Message-Id: <20200405155928.9323-18-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200405155928.9323-1-andreas.rheinhardt@gmail.com> References: <20200405155928.9323-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/20] avformat/matroskaenc: Add const where appropriate 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" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 68 +++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 17e1f8dec9..3981986e86 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -548,7 +548,8 @@ static int mkv_assemble_cues(AVStream **streams, AVIOContext *dyn_cp, return 0; } -static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par) +static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, + const AVCodecParameters *par) { const uint8_t *header_start[3]; int header_len[3]; @@ -576,7 +577,7 @@ static int put_xiph_codecpriv(AVFormatContext *s, AVIOContext *pb, AVCodecParame return 0; } -static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par) +static int put_wv_codecpriv(AVIOContext *pb, const AVCodecParameters *par) { if (par->extradata && par->extradata_size == 2) avio_write(pb, par->extradata, 2); @@ -586,7 +587,7 @@ static int put_wv_codecpriv(AVIOContext *pb, AVCodecParameters *par) } static int put_flac_codecpriv(AVFormatContext *s, - AVIOContext *pb, AVCodecParameters *par) + AVIOContext *pb, const AVCodecParameters *par) { int write_comment = (par->channel_layout && !(par->channel_layout & ~0x3ffffULL) && @@ -634,8 +635,9 @@ static int put_flac_codecpriv(AVFormatContext *s, return 0; } -static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extradata_size, - int *sample_rate, int *output_sample_rate) +static int get_aac_sample_rates(AVFormatContext *s, const uint8_t *extradata, + int extradata_size, int *sample_rate, + int *output_sample_rate) { MPEG4AudioConfig mp4ac; int ret; @@ -667,7 +669,7 @@ static int get_aac_sample_rates(AVFormatContext *s, uint8_t *extradata, int extr } static int mkv_write_native_codecprivate(AVFormatContext *s, AVIOContext *pb, - AVCodecParameters *par, + const AVCodecParameters *par, AVIOContext *dyn_cp) { switch (par->codec_id) { @@ -785,7 +787,9 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, return ret; } -static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStream *st) { +static int mkv_write_video_color(AVIOContext *pb, const AVCodecParameters *par, + const AVStream *st) +{ AVIOContext *dyn_cp; uint8_t *colorinfo_ptr; int side_data_size = 0; @@ -876,7 +880,7 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre } static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, - AVStream *st) + const AVStream *st) { ebml_master projection; int side_data_size = 0; @@ -989,7 +993,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb, { int i; int ret = 0; - AVDictionaryEntry *tag; + const AVDictionaryEntry *tag; MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB; *h_width = 1; @@ -1096,7 +1100,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, int display_width_div = 1; int display_height_div = 1; int j, ret; - AVDictionaryEntry *tag; + const AVDictionaryEntry *tag; if (par->codec_type == AVMEDIA_TYPE_ATTACHMENT) { return 0; @@ -1408,10 +1412,10 @@ static int mkv_write_chapters(AVFormatContext *s) } for (i = 0; i < s->nb_chapters; i++) { ebml_master chapteratom, chapterdisplay; - AVChapter *c = s->chapters[i]; + const AVChapter *c = s->chapters[i]; int64_t chapterstart = av_rescale_q(c->start, c->time_base, scale); int64_t chapterend = av_rescale_q(c->end, c->time_base, scale); - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t; if (chapterstart < 0 || chapterstart > chapterend || chapterend < 0) { av_log(s, AV_LOG_ERROR, "Invalid chapter start (%"PRId64") or end (%"PRId64").\n", @@ -1443,7 +1447,7 @@ static int mkv_write_chapters(AVFormatContext *s) return 0; } -static int mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t) +static int mkv_write_simpletag(AVIOContext *pb, const AVDictionaryEntry *t) { uint8_t *key = av_strdup(t->key); uint8_t *p = key; @@ -1516,13 +1520,13 @@ static int mkv_check_tag_name(const char *name, uint32_t elementid) av_strcasecmp(name, "mimetype"))); } -static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, uint32_t elementid, +static int mkv_write_tag(AVFormatContext *s, const AVDictionary *m, uint32_t elementid, uint64_t uid, ebml_master *tag) { MatroskaMuxContext *mkv = s->priv_data; + const AVDictionaryEntry *t = NULL; ebml_master tag2; int ret; - AVDictionaryEntry *t = NULL; ret = mkv_write_tag_targets(s, elementid, uid, tag ? tag : &tag2); if (ret < 0) @@ -1542,9 +1546,9 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, uint32_t elementid return 0; } -static int mkv_check_tag(AVDictionary *m, uint32_t elementid) +static int mkv_check_tag(const AVDictionary *m, uint32_t elementid) { - AVDictionaryEntry *t = NULL; + const AVDictionaryEntry *t = NULL; while ((t = av_dict_get(m, "", t, AV_DICT_IGNORE_SUFFIX))) if (mkv_check_tag_name(t->key, elementid)) @@ -1568,7 +1572,7 @@ static int mkv_write_tags(AVFormatContext *s) tagp = (s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live ? &tag : NULL; for (i = 0; i < s->nb_streams; i++) { - AVStream *st = s->streams[i]; + const AVStream *st = s->streams[i]; mkv_track *track = &mkv->tracks[i]; if (st->codecpar->codec_type == AVMEDIA_TYPE_ATTACHMENT) @@ -1615,8 +1619,8 @@ static int mkv_write_tags(AVFormatContext *s) if (mkv->nb_attachments && mkv->mode != MODE_WEBM) { for (i = 0; i < s->nb_streams; i++) { - mkv_track *track = &mkv->tracks[i]; - AVStream *st = s->streams[i]; + const mkv_track *track = &mkv->tracks[i]; + const AVStream *st = s->streams[i]; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) continue; @@ -1656,10 +1660,10 @@ static int mkv_write_attachments(AVFormatContext *s) if (ret < 0) return ret; for (i = 0; i < s->nb_streams; i++) { - AVStream *st = s->streams[i]; + const AVStream *st = s->streams[i]; mkv_track *track = &mkv->tracks[i]; ebml_master attached_file; - AVDictionaryEntry *t; + const AVDictionaryEntry *t; const char *mimetype = NULL; if (st->codecpar->codec_type != AVMEDIA_TYPE_ATTACHMENT) @@ -1711,7 +1715,7 @@ static int64_t get_metadata_duration(AVFormatContext *s) int64_t max = 0; int64_t us; - AVDictionaryEntry *explicitDuration = av_dict_get(s->metadata, "DURATION", NULL, 0); + const AVDictionaryEntry *explicitDuration = av_dict_get(s->metadata, "DURATION", NULL, 0); if (explicitDuration && (av_parse_time(&us, explicitDuration->value, 1) == 0) && us > 0) { av_log(s, AV_LOG_DEBUG, "get_metadata_duration found duration in context metadata: %" PRId64 "\n", us); return us; @@ -1719,7 +1723,7 @@ static int64_t get_metadata_duration(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { int64_t us; - AVDictionaryEntry *duration = av_dict_get(s->streams[i]->metadata, "DURATION", NULL, 0); + const AVDictionaryEntry *duration = av_dict_get(s->streams[i]->metadata, "DURATION", NULL, 0); if (duration && (av_parse_time(&us, duration->value, 1) == 0)) max = FFMAX(max, us); @@ -1734,7 +1738,7 @@ static int mkv_write_header(AVFormatContext *s) MatroskaMuxContext *mkv = s->priv_data; AVIOContext *pb = s->pb; ebml_master ebml_header; - AVDictionaryEntry *tag; + const AVDictionaryEntry *tag; int ret, i, version = 2; int64_t creation_time; @@ -1953,7 +1957,7 @@ fail: } static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, - uint32_t blockid, AVPacket *pkt, int keyframe) + uint32_t blockid, const AVPacket *pkt, int keyframe) { MatroskaMuxContext *mkv = s->priv_data; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; @@ -2068,7 +2072,7 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, return 0; } -static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) +static int mkv_write_vtt_blocks(AVFormatContext *s, AVIOContext *pb, const AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; mkv_track *track = &mkv->tracks[pkt->stream_index]; @@ -2125,7 +2129,7 @@ static void mkv_end_cluster(AVFormatContext *s) avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT); } -static int mkv_check_new_extra_data(AVFormatContext *s, AVPacket *pkt) +static int mkv_check_new_extra_data(AVFormatContext *s, const AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; mkv_track *track = &mkv->tracks[pkt->stream_index]; @@ -2223,7 +2227,7 @@ static int mkv_check_new_extra_data(AVFormatContext *s, AVPacket *pkt) return 0; } -static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt) +static int mkv_write_packet_internal(AVFormatContext *s, const AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; AVIOContext *pb; @@ -2311,7 +2315,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } -static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) +static int mkv_write_packet(AVFormatContext *s, const AVPacket *pkt) { MatroskaMuxContext *mkv = s->priv_data; int codec_type = s->streams[pkt->stream_index]->codecpar->codec_type; @@ -2509,8 +2513,8 @@ static int mkv_write_trailer(AVFormatContext *s) if (mkv->tags_bc) { int i; for (i = 0; i < s->nb_streams; ++i) { - AVStream *st = s->streams[i]; - mkv_track *track = &mkv->tracks[i]; + const AVStream *st = s->streams[i]; + const mkv_track *track = &mkv->tracks[i]; if (track->duration_offset > 0) { double duration_sec = track->duration * av_q2d(st->time_base);