From patchwork Wed Dec 30 23:31:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24706 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 E04DB44A7BE for ; Thu, 31 Dec 2020 01:32:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6F3D68A912; Thu, 31 Dec 2020 01:32:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A658068A81D for ; Thu, 31 Dec 2020 01:32:47 +0200 (EET) Received: by mail-ej1-f41.google.com with SMTP id g20so23726584ejb.1 for ; Wed, 30 Dec 2020 15:32:47 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=PTENOAimCQduSifvSiicNSaCvGOx5MFVMLhbODDy4q0=; b=rE/pnJVwtQa5xgWa9Uar1vNxt+4oU/YsHs/3o4pF5WM6EETLb5vjsn3yIhvifLxE8i iU/6X/zsq47YdiRUWXbOa8C3flLgx+QT6obwGuR9Htz+HX1gnMidbnGyYMAGyXtbBk5f t7yJp1AIzdrlm7N00JES8UCUhHJxMlAZZGc7WUGcsfxwzsljdhv265UYCxku4Pp/o9lJ el9yYFN6Iw+kPBc5XvcbrnjyAVqVcsDYJTWFOD+tqKN7ZYCLhTZdiR5/lie5fpKKqtng pzKAvOiahc4ToCldLYqohAVEt2FkTak2mADkG8TwhY6w9xq+dLxuw6h3yM4DFR2xL3Qt G7Bw== 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:reply-to:mime-version:content-transfer-encoding; bh=PTENOAimCQduSifvSiicNSaCvGOx5MFVMLhbODDy4q0=; b=j+I9E4rPRJnQPNAFhhlWCtdOCZ6SjGXpNu656lNXTaI9+//j35NazcnGgzi8d1hoeX TXIsUjMQPpyXJ6Id8ygHVm1gsLZoMV5l5PV/ra7ZaYMENJYv4N9/7Fca6tqn2RohIHm7 oMLU6mJEQz3igAdTlLdLDkMtlQcrTIoIfcprqrqfs5H8AtuKa7D5BaxO5dgr/G4M7tb0 KuewEKcn/pz72drB5ur6AbZ7zT4QfrtLa4H+msfmh1PCc9uMnhppceI1GJnVQ9spX8ls BhBeR/puXfpaN98MOE/OqC71LGZpt1y5dBYcRwJiuxzIriCRPzqKIKqDNwOMSzu4wuDE H75Q== X-Gm-Message-State: AOAM533imNfbLnHCrQIv73Wzw56f5QrO0d1vQNOLvQU4+lSk9JPu34qW L83MtSQbtTBQsNZ3IqiIHDSUL02U+Hg= X-Google-Smtp-Source: ABdhPJztkYgFHo8XrUUC+pJ67Bsm1Kcis/PQLGdAiEXF81lQM4lEMl+pqGFq8rQMBodyi0rMoRYYKg== X-Received: by 2002:a17:906:378f:: with SMTP id n15mr50388535ejc.263.1609371167046; Wed, 30 Dec 2020 15:32:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:41 +0100 Message-Id: <20201230233157.1055287-14-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/30] avcodec/rtpdec: Constify RTPDynamicProtocolHandlers 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" Also constify the list of pointers to said RTPDynamicProtocolHandlers. Signed-off-by: Andreas Rheinhardt --- libavformat/rdt.c | 2 +- libavformat/rtpdec.c | 22 +++++++++++----------- libavformat/rtpdec_qt.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 60c36f09e6..e5824f6a48 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -554,7 +554,7 @@ rdt_close_context (PayloadContext *rdt) } #define RDT_HANDLER(n, s, t) \ -RTPDynamicProtocolHandler ff_rdt_ ## n ## _handler = { \ +const RTPDynamicProtocolHandler ff_rdt_ ## n ## _handler = { \ .enc_name = s, \ .codec_type = t, \ .codec_id = AV_CODEC_ID_NONE, \ diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 3d5b200099..dfecb722d5 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -33,48 +33,48 @@ #define MIN_FEEDBACK_INTERVAL 200000 /* 200 ms in us */ -static RTPDynamicProtocolHandler l24_dynamic_handler = { +static const RTPDynamicProtocolHandler l24_dynamic_handler = { .enc_name = "L24", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_PCM_S24BE, }; -static RTPDynamicProtocolHandler gsm_dynamic_handler = { +static const RTPDynamicProtocolHandler gsm_dynamic_handler = { .enc_name = "GSM", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_GSM, }; -static RTPDynamicProtocolHandler realmedia_mp3_dynamic_handler = { +static const RTPDynamicProtocolHandler realmedia_mp3_dynamic_handler = { .enc_name = "X-MP3-draft-00", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_MP3ADU, }; -static RTPDynamicProtocolHandler speex_dynamic_handler = { +static const RTPDynamicProtocolHandler speex_dynamic_handler = { .enc_name = "speex", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_SPEEX, }; -static RTPDynamicProtocolHandler opus_dynamic_handler = { +static const RTPDynamicProtocolHandler opus_dynamic_handler = { .enc_name = "opus", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_OPUS, }; -static RTPDynamicProtocolHandler t140_dynamic_handler = { /* RFC 4103 */ +static const RTPDynamicProtocolHandler t140_dynamic_handler = { /* RFC 4103 */ .enc_name = "t140", .codec_type = AVMEDIA_TYPE_SUBTITLE, .codec_id = AV_CODEC_ID_TEXT, }; -extern RTPDynamicProtocolHandler ff_rdt_video_handler; -extern RTPDynamicProtocolHandler ff_rdt_audio_handler; -extern RTPDynamicProtocolHandler ff_rdt_live_video_handler; -extern RTPDynamicProtocolHandler ff_rdt_live_audio_handler; +extern const RTPDynamicProtocolHandler ff_rdt_video_handler; +extern const RTPDynamicProtocolHandler ff_rdt_audio_handler; +extern const RTPDynamicProtocolHandler ff_rdt_live_video_handler; +extern const RTPDynamicProtocolHandler ff_rdt_live_audio_handler; -static const RTPDynamicProtocolHandler *rtp_dynamic_protocol_handler_list[] = { +static const RTPDynamicProtocolHandler *const rtp_dynamic_protocol_handler_list[] = { /* rtp */ &ff_ac3_dynamic_handler, &ff_amr_nb_dynamic_handler, diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 740c382d07..93bf31746b 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -241,7 +241,7 @@ static void qt_rtp_close(PayloadContext *qt) } #define RTP_QT_HANDLER(m, n, s, t) \ -RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \ +const RTPDynamicProtocolHandler ff_ ## m ## _rtp_ ## n ## _handler = { \ .enc_name = s, \ .codec_type = t, \ .codec_id = AV_CODEC_ID_NONE, \