From patchwork Tue Aug 13 02:47:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14460 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 EC7DA447E79 for ; Tue, 13 Aug 2019 05:48:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBBB068ABA8; Tue, 13 Aug 2019 05:48:52 +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 E26B468A42C for ; Tue, 13 Aug 2019 05:48:45 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id z1so106325715wru.13 for ; Mon, 12 Aug 2019 19:48:45 -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=BQSCzS4+Sv4ssIHR7WCE+GELqVtcM59EB6Nxlz9/0a8=; b=QukkU246xlmMOa5EeKHDq22A6so4UDWISUyvVVj1ZgfHyHz8+X1Kck35xq+ttQMH8Q ua2gDrHeYynigZTR1snyIi+4SK6pu1UlWkgzz4eijAG8eyz9smTHZk4U1t6dcY/MP18T 20sZYn2ZwEp8Ec4Y32Znqzm8riEljmomdzFfl3RentSFGstCfLUy1wDltAuky3IpaoJF /BJMzBiSExjTl3mB8L5ZxdgZgYbmga6SWBWJajEUsTC3WeMJGJ+DIMfX7TjBtGzT6m8R 1jKzF+HzGI8rQQerPWYl4iok3o2bxNaaELdG9207Rlk1PfXp+08akUSRPB943ID7GfWL LEyQ== 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=BQSCzS4+Sv4ssIHR7WCE+GELqVtcM59EB6Nxlz9/0a8=; b=BXHxp4sB7ZZ7CJOisrwXnKOBLp0MSN6FpJJz33VkBud1NYsnqUA059Uzy0q//N0uNS F/6Xa/7m14KTfJOAOrSa5elDGDZfuLQ9QbPRX+IVK6mhKTqXxj939FuIjUKdxxrdKsdu sAJLMRLHCIA8RVXzBngfJ8ZqCxvykKMHhuD7pRJCSTllG9U/grI7ICXb09Rl9F7z1tV9 hWhvWm+KXVUE56hlkd8jxxtGVPwmuoT96sWoXOjvOtHGi1zPJ5s7IQW9e4H3KUJ+OPXV fvVRXIC0eFWbNurcIK7LLPnBG3XzXosRWA9wxUtsjIjpJ/ru43lg3qx/fQNdKjAUg3Vs TXLw== X-Gm-Message-State: APjAAAXd6reg13GEXgLOb2v0C2kn23kV3HNZRqtoFJdpMQei9vWa/1JD 8DwVLe6gMcpLZWw/rl130TYPUS5q X-Google-Smtp-Source: APXvYqykAUf7wBm11kN1Qd3DjINLW4xNkEsdDASs6KrsBjpBM14q/DEaEAtZlFEVU3FlcQGoWI7/vQ== X-Received: by 2002:a05:6000:118a:: with SMTP id g10mr42670204wrx.175.1565664525270; Mon, 12 Aug 2019 19:48:45 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id k13sm25020613wro.97.2019.08.12.19.48.44 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 19:48:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 04:47:16 +0200 Message-Id: <20190813024726.6596-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/13] avformat/mux: Use const AVPacket * in compare functions 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" There is no reason for these functions to modify the given packets at all. Signed-off-by: Andreas Rheinhardt --- libavformat/audiointerleave.c | 2 +- libavformat/audiointerleave.h | 2 +- libavformat/gxfenc.c | 5 +++-- libavformat/internal.h | 2 +- libavformat/mux.c | 6 +++--- libavformat/mxfenc.c | 3 ++- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index dea5d99821..b602eb7105 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -108,7 +108,7 @@ static int interleave_new_audio_packet(AVFormatContext *s, AVPacket *pkt, int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush, int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int), - int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *)) + int (*compare_ts)(AVFormatContext *, const AVPacket *, const AVPacket *)) { int i, ret; diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h index 4d77832fa1..f28d5fefcc 100644 --- a/libavformat/audiointerleave.h +++ b/libavformat/audiointerleave.h @@ -50,6 +50,6 @@ void ff_audio_interleave_close(AVFormatContext *s); */ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush, int (*get_packet)(AVFormatContext *, AVPacket *, AVPacket *, int), - int (*compare_ts)(AVFormatContext *, AVPacket *, AVPacket *)); + int (*compare_ts)(AVFormatContext *, const AVPacket *, const AVPacket *)); #endif /* AVFORMAT_AUDIOINTERLEAVE_H */ diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 3507c00b40..ad9ddea887 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -987,10 +987,11 @@ static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } -static int gxf_compare_field_nb(AVFormatContext *s, AVPacket *next, AVPacket *cur) +static int gxf_compare_field_nb(AVFormatContext *s, const AVPacket *next, + const AVPacket *cur) { GXFContext *gxf = s->priv_data; - AVPacket *pkt[2] = { cur, next }; + const AVPacket *pkt[2] = { cur, next }; int i, field_nb[2]; GXFStreamContext *sc[2]; diff --git a/libavformat/internal.h b/libavformat/internal.h index cf8c16579c..d6a039c497 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -237,7 +237,7 @@ int ff_hex_to_data(uint8_t *data, const char *p); * @return 0, or < 0 on error */ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, - int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); + int (*compare)(AVFormatContext *, const AVPacket *, const AVPacket *)); void ff_read_frame_flush(AVFormatContext *s); diff --git a/libavformat/mux.c b/libavformat/mux.c index 870e716950..2728c62de5 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -917,7 +917,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) #define CHUNK_START 0x1000 int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, - int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)) + int (*compare)(AVFormatContext *, const AVPacket *, const AVPacket *)) { int ret; AVPacketList **next_point, *this_pktl; @@ -991,8 +991,8 @@ next_non_null: return 0; } -static int interleave_compare_dts(AVFormatContext *s, AVPacket *next, - AVPacket *pkt) +static int interleave_compare_dts(AVFormatContext *s, const AVPacket *next, + const AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; AVStream *st2 = s->streams[next->stream_index]; diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 2e54320cf0..8b3d599a6f 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3148,7 +3148,8 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket } } -static int mxf_compare_timestamps(AVFormatContext *s, AVPacket *next, AVPacket *pkt) +static int mxf_compare_timestamps(AVFormatContext *s, const AVPacket *next, + const AVPacket *pkt) { MXFStreamContext *sc = s->streams[pkt ->stream_index]->priv_data; MXFStreamContext *sc2 = s->streams[next->stream_index]->priv_data;