[FFmpeg-devel] lavf/rtpdec: Constify several pointers

Submitted by Carl Eugen Hoyos on Feb. 10, 2018, 1:57 a.m.

Details

Message ID CAB0OVGrFHiFqgA21ifSit4E6kSfmfSJjMvMXafDQXHazo1XkyA@mail.gmail.com
State Superseded
Headers show

Commit Message

Carl Eugen Hoyos Feb. 10, 2018, 1:57 a.m.
Hi!

Attached patch fixes two warnings.
libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_name’:
libavformat/rtpdec.c:155:20: warning: return discards ‘const’
qualifier from pointer target type [-Wdiscarded-qualifiers]
             return handler;
                    ^~~~~~~
libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_id’:
libavformat/rtpdec.c:168:20: warning: return discards ‘const’
qualifier from pointer target type [-Wdiscarded-qualifiers]
             return handler;
                    ^~~~~~~

Please comment, Carl Eugen

Comments

Muhammad Faiz Feb. 10, 2018, 11:32 p.m.
On Sat, Feb 10, 2018 at 8:57 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> Hi!
>
> Attached patch fixes two warnings.
> libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_name’:
> libavformat/rtpdec.c:155:20: warning: return discards ‘const’
> qualifier from pointer target type [-Wdiscarded-qualifiers]
>              return handler;
>                     ^~~~~~~
> libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_id’:
> libavformat/rtpdec.c:168:20: warning: return discards ‘const’
> qualifier from pointer target type [-Wdiscarded-qualifiers]
>              return handler;
>                     ^~~~~~~
>
> Please comment, Carl Eugen
>
> From b0383afe16c62fcb0fbc7ea49168edd2f26ac0aa Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
> Date: Sat, 10 Feb 2018 02:54:42 +0100
> Subject: [PATCH] lavf/rtpdec: Constify several pointers.
>
> Fixes two warnings:
> libavformat/rtpdec.c:155:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
> libavformat/rtpdec.c:168:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
> ---
>  libavformat/rdt.c    |    2 +-
>  libavformat/rdt.h    |    2 +-
>  libavformat/rtpdec.c |    6 +++---
>  libavformat/rtpdec.h |    6 +++---
>  libavformat/rtsp.c   |    8 ++++----
>  libavformat/rtsp.h   |    2 +-
>  6 files changed, 13 insertions(+), 13 deletions(-)

LGTM. Probably, the variables should also be constified.

Thank's.
Carl Eugen Hoyos Feb. 11, 2018, 7:05 p.m.
2018-02-11 0:32 GMT+01:00 Muhammad Faiz <mfcc64@gmail.com>:
> On Sat, Feb 10, 2018 at 8:57 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>> Hi!
>>
>> Attached patch fixes two warnings.
>> libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_name’:
>> libavformat/rtpdec.c:155:20: warning: return discards ‘const’
>> qualifier from pointer target type [-Wdiscarded-qualifiers]
>>              return handler;
>>                     ^~~~~~~
>> libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_id’:
>> libavformat/rtpdec.c:168:20: warning: return discards ‘const’
>> qualifier from pointer target type [-Wdiscarded-qualifiers]
>>              return handler;
>>                     ^~~~~~~
>>
>> Please comment, Carl Eugen
>>
>> From b0383afe16c62fcb0fbc7ea49168edd2f26ac0aa Mon Sep 17 00:00:00 2001
>> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
>> Date: Sat, 10 Feb 2018 02:54:42 +0100
>> Subject: [PATCH] lavf/rtpdec: Constify several pointers.
>>
>> Fixes two warnings:
>> libavformat/rtpdec.c:155:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
>> libavformat/rtpdec.c:168:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
>> ---
>>  libavformat/rdt.c    |    2 +-
>>  libavformat/rdt.h    |    2 +-
>>  libavformat/rtpdec.c |    6 +++---
>>  libavformat/rtpdec.h |    6 +++---
>>  libavformat/rtsp.c   |    8 ++++----
>>  libavformat/rtsp.h   |    2 +-
>>  6 files changed, 13 insertions(+), 13 deletions(-)
>
> LGTM.

Patch applied.

> Probably, the variables should also be constified.

Not sure which variables you mean.

Thank you, Carl Eugen
Muhammad Faiz Feb. 11, 2018, 11:02 p.m.
On Mon, Feb 12, 2018 at 2:05 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> 2018-02-11 0:32 GMT+01:00 Muhammad Faiz <mfcc64@gmail.com>:
>> On Sat, Feb 10, 2018 at 8:57 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>>> Hi!
>>>
>>> Attached patch fixes two warnings.
>>> libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_name’:
>>> libavformat/rtpdec.c:155:20: warning: return discards ‘const’
>>> qualifier from pointer target type [-Wdiscarded-qualifiers]
>>>              return handler;
>>>                     ^~~~~~~
>>> libavformat/rtpdec.c: In function ‘ff_rtp_handler_find_by_id’:
>>> libavformat/rtpdec.c:168:20: warning: return discards ‘const’
>>> qualifier from pointer target type [-Wdiscarded-qualifiers]
>>>              return handler;
>>>                     ^~~~~~~
>>>
>>> Please comment, Carl Eugen
>>>
>>> From b0383afe16c62fcb0fbc7ea49168edd2f26ac0aa Mon Sep 17 00:00:00 2001
>>> From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
>>> Date: Sat, 10 Feb 2018 02:54:42 +0100
>>> Subject: [PATCH] lavf/rtpdec: Constify several pointers.
>>>
>>> Fixes two warnings:
>>> libavformat/rtpdec.c:155:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
>>> libavformat/rtpdec.c:168:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
>>> ---
>>>  libavformat/rdt.c    |    2 +-
>>>  libavformat/rdt.h    |    2 +-
>>>  libavformat/rtpdec.c |    6 +++---
>>>  libavformat/rtpdec.h |    6 +++---
>>>  libavformat/rtsp.c   |    8 ++++----
>>>  libavformat/rtsp.h   |    2 +-
>>>  6 files changed, 13 insertions(+), 13 deletions(-)
>>
>> LGTM.
>
> Patch applied.
>
>> Probably, the variables should also be constified.
>
> Not sure which variables you mean.

ff_*_dynamic_handler.
Carl Eugen Hoyos Feb. 12, 2018, 9:23 p.m.
2018-02-12 0:02 GMT+01:00 Muhammad Faiz <mfcc64@gmail.com>:
> On Mon, Feb 12, 2018 at 2:05 AM, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>> 2018-02-11 0:32 GMT+01:00 Muhammad Faiz <mfcc64@gmail.com>:

>>> Probably, the variables should also be constified.
>>
>> Not sure which variables you mean.
>
> ff_*_dynamic_handler.

Patch sent.

Thank you, Carl Eugen

Patch hide | download patch | download mbox

From b0383afe16c62fcb0fbc7ea49168edd2f26ac0aa Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Date: Sat, 10 Feb 2018 02:54:42 +0100
Subject: [PATCH] lavf/rtpdec: Constify several pointers.

Fixes two warnings:
libavformat/rtpdec.c:155:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
libavformat/rtpdec.c:168:20: warning: return discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
---
 libavformat/rdt.c    |    2 +-
 libavformat/rdt.h    |    2 +-
 libavformat/rtpdec.c |    6 +++---
 libavformat/rtpdec.h |    6 +++---
 libavformat/rtsp.c   |    8 ++++----
 libavformat/rtsp.h   |    2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 31a32ff..60c36f0 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -53,7 +53,7 @@  struct RDTDemuxContext {
 
 RDTDemuxContext *
 ff_rdt_parse_open(AVFormatContext *ic, int first_stream_of_set_idx,
-                  void *priv_data, RTPDynamicProtocolHandler *handler)
+                  void *priv_data, const RTPDynamicProtocolHandler *handler)
 {
     RDTDemuxContext *s = av_mallocz(sizeof(RDTDemuxContext));
     if (!s)
diff --git a/libavformat/rdt.h b/libavformat/rdt.h
index 2480565..67fb308 100644
--- a/libavformat/rdt.h
+++ b/libavformat/rdt.h
@@ -41,7 +41,7 @@  typedef struct RDTDemuxContext RDTDemuxContext;
 RDTDemuxContext *ff_rdt_parse_open(AVFormatContext *ic,
                                    int first_stream_of_set_idx,
                                    void *priv_data,
-                                   RTPDynamicProtocolHandler *handler);
+                                   const RTPDynamicProtocolHandler *handler);
 void ff_rdt_parse_close(RDTDemuxContext *s);
 
 /**
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 6499e27..e75a34c 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -143,7 +143,7 @@  const RTPDynamicProtocolHandler *ff_rtp_handler_iterate(void **opaque)
     return r;
 }
 
-RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
+const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
                                                        enum AVMediaType codec_type)
 {
     void *i = 0;
@@ -157,7 +157,7 @@  RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
     return NULL;
 }
 
-RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id,
+const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id,
                                                      enum AVMediaType codec_type)
 {
     void *i = 0;
@@ -572,7 +572,7 @@  RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
 }
 
 void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
-                                       RTPDynamicProtocolHandler *handler)
+                                       const RTPDynamicProtocolHandler *handler)
 {
     s->dynamic_protocol_context = ctx;
     s->handler                  = handler;
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index fe726a6..5a47d6f 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -43,7 +43,7 @@  typedef struct RTPDemuxContext RTPDemuxContext;
 RTPDemuxContext *ff_rtp_parse_open(AVFormatContext *s1, AVStream *st,
                                    int payload_type, int queue_size);
 void ff_rtp_parse_set_dynamic_protocol(RTPDemuxContext *s, PayloadContext *ctx,
-                                       RTPDynamicProtocolHandler *handler);
+                                       const RTPDynamicProtocolHandler *handler);
 void ff_rtp_parse_set_crypto(RTPDemuxContext *s, const char *suite,
                              const char *params);
 int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt,
@@ -208,7 +208,7 @@  const RTPDynamicProtocolHandler *ff_rtp_handler_iterate(void **opaque);
  * @param name name of the requested rtp dynamic protocol handler
  * @return A rtp dynamic protocol handler if one was found, NULL otherwise.
  */
-RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
+const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
                                                   enum AVMediaType codec_type);
 /**
  * Find a registered rtp dynamic protocol handler with a matching codec ID.
@@ -216,7 +216,7 @@  RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name,
  * @param id AVCodecID of the requested rtp dynamic protocol handler.
  * @return A rtp dynamic protocol handler if one was found, NULL otherwise.
  */
-RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id,
+const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id,
                                                 enum AVMediaType codec_type);
 
 /* from rtsp.c, but used by rtp dynamic protocol handlers. */
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index b3cfbb8..ceb770a 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -211,7 +211,7 @@  static int get_sockaddr(AVFormatContext *s,
 }
 
 #if CONFIG_RTPDEC
-static void init_rtp_handler(RTPDynamicProtocolHandler *handler,
+static void init_rtp_handler(const RTPDynamicProtocolHandler *handler,
                              RTSPStream *rtsp_st, AVStream *st)
 {
     AVCodecParameters *par = st ? st->codecpar : NULL;
@@ -271,7 +271,7 @@  static int sdp_parse_rtpmap(AVFormatContext *s,
     }
 
     if (par->codec_id == AV_CODEC_ID_NONE) {
-        RTPDynamicProtocolHandler *handler =
+        const RTPDynamicProtocolHandler *handler =
             ff_rtp_handler_find_by_name(buf, par->codec_type);
         init_rtp_handler(handler, rtsp_st, st);
         /* If no dynamic handler was found, check with the list of standard
@@ -495,7 +495,7 @@  static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
                 if (CONFIG_RTPDEC && !rt->ts)
                     rt->ts = avpriv_mpegts_parse_open(s);
             } else {
-                RTPDynamicProtocolHandler *handler;
+                const RTPDynamicProtocolHandler *handler;
                 handler = ff_rtp_handler_find_by_id(
                               rtsp_st->sdp_payload_type, AVMEDIA_TYPE_DATA);
                 init_rtp_handler(handler, rtsp_st, NULL);
@@ -513,7 +513,7 @@  static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
             rtsp_st->stream_index = st->index;
             st->codecpar->codec_type = codec_type;
             if (rtsp_st->sdp_payload_type < RTP_PT_PRIVATE) {
-                RTPDynamicProtocolHandler *handler;
+                const RTPDynamicProtocolHandler *handler;
                 /* if standard payload type, we can find the codec right now */
                 ff_rtp_get_codec_info(st->codecpar, rtsp_st->sdp_payload_type);
                 if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index 36fdae4..9a7f366 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -458,7 +458,7 @@  typedef struct RTSPStream {
     /** The following are used for dynamic protocols (rtpdec_*.c/rdt.c) */
     //@{
     /** handler structure */
-    RTPDynamicProtocolHandler *dynamic_handler;
+    const RTPDynamicProtocolHandler *dynamic_handler;
 
     /** private data associated with the dynamic protocol */
     PayloadContext *dynamic_protocol_context;
-- 
1.7.10.4