har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/evc: Don't cast const away, avoid loop

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-07-06 23:05:00 +02:00
parent e5ab2dab2c
commit e52676e20b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/evc.h
View File

@ -23,16 +23,17 @@
#define AVFORMAT_EVC_H #define AVFORMAT_EVC_H
#include <stdint.h> #include <stdint.h>
#include "libavutil/intreadwrite.h"
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "libavcodec/evc.h" #include "libavcodec/evc.h"
#include "avio.h" #include "avio.h"
static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size) static inline int evc_get_nalu_type(const uint8_t *p, int bits_size)
{ {
int unit_type_plus1 = 0; int unit_type_plus1 = 0;
if (bits_size >= EVC_NALU_HEADER_SIZE) { if (bits_size >= EVC_NALU_HEADER_SIZE) {
unsigned char *p = (unsigned char *)bits;
// forbidden_zero_bit // forbidden_zero_bit
if ((p[0] & 0x80) != 0) // Cannot get bitstream information. Malformed bitstream. if ((p[0] & 0x80) != 0) // Cannot get bitstream information. Malformed bitstream.
return -1; return -1;
@ -46,16 +47,10 @@ static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size)
static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_size) static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_size)
{ {
uint32_t nalu_len = 0; if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE)
return AV_RB32(bits);
if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { return 0;
unsigned char *p = (unsigned char *)bits;
for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++)
nalu_len = (nalu_len << 8) | p[i];
}
return nalu_len;
} }
/** /**