| Message ID | GV1P250MB0737A5B6C108D1223DD82FBF8F2CA@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/3] avformat/evcdec: Avoid nonsense casts | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 7/6/2023 6:06 PM, Andreas Rheinhardt wrote: > For uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE], &buf still points > to the beginning of buf, but it is of type "pointer to array of > EVC_NALU_LENGTH_PREFIX_SIZE uint8_t" (i.e. pointer arithmetic > would operate on blocks of size EVC_NALU_LENGTH_PREFIX_SIZE). > This is of course a different type than uint8_t*, which is why > there have been casts in evc_read_packet(). But these are unnecessary > if one justs removes the unnecessary address-of operator. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavformat/evcdec.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c > index 73aab6c52f..9886542311 100644 > --- a/libavformat/evcdec.c > +++ b/libavformat/evcdec.c > @@ -65,7 +65,7 @@ static int annexb_probe(const AVProbeData *p) > int nalu_type; > size_t nalu_size; > int got_sps = 0, got_pps = 0, got_idr = 0, got_nonidr = 0; > - unsigned char *bits = (unsigned char *)p->buf; > + unsigned char *bits = p->buf; > int bytes_to_read = p->buf_size; > > while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { > @@ -159,11 +159,11 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) > if (ret < 0) > return ret; > > - ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); > + ret = avio_read(s->pb, buf, EVC_NALU_LENGTH_PREFIX_SIZE); > if (ret < 0) > return ret; > > - nalu_size = evc_read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); > + nalu_size = evc_read_nal_unit_length(buf, EVC_NALU_LENGTH_PREFIX_SIZE); > if (!nalu_size || nalu_size > INT_MAX) > return AVERROR_INVALIDDATA; LGTM.
diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c index 73aab6c52f..9886542311 100644 --- a/libavformat/evcdec.c +++ b/libavformat/evcdec.c @@ -65,7 +65,7 @@ static int annexb_probe(const AVProbeData *p) int nalu_type; size_t nalu_size; int got_sps = 0, got_pps = 0, got_idr = 0, got_nonidr = 0; - unsigned char *bits = (unsigned char *)p->buf; + unsigned char *bits = p->buf; int bytes_to_read = p->buf_size; while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { @@ -159,11 +159,11 @@ static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; - ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + ret = avio_read(s->pb, buf, EVC_NALU_LENGTH_PREFIX_SIZE); if (ret < 0) return ret; - nalu_size = evc_read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + nalu_size = evc_read_nal_unit_length(buf, EVC_NALU_LENGTH_PREFIX_SIZE); if (!nalu_size || nalu_size > INT_MAX) return AVERROR_INVALIDDATA;
For uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE], &buf still points to the beginning of buf, but it is of type "pointer to array of EVC_NALU_LENGTH_PREFIX_SIZE uint8_t" (i.e. pointer arithmetic would operate on blocks of size EVC_NALU_LENGTH_PREFIX_SIZE). This is of course a different type than uint8_t*, which is why there have been casts in evc_read_packet(). But these are unnecessary if one justs removes the unnecessary address-of operator. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavformat/evcdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)