openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 11:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

多余空格删除

Browse Source 
Signed-off-by: liushuai <cqliushuai@outlook.com>
This commit is contained in:
liushuai 2024-11-06 22:55:38 +08:00
parent d80043ab7b
commit a2bfd80a73
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/av3a_parser.c
View File

@ -42,7 +42,6 @@ typedef struct {
int16_t total_channels; int16_t total_channels;
} Av3aParseContext; } Av3aParseContext;
static int ff_read_av3a_header_parse(GetBitContext *gb, AATFHeaderInfo *hdf) static int ff_read_av3a_header_parse(GetBitContext *gb, AATFHeaderInfo *hdf)
{ {
int64_t soundbed_bitrate = 0L; int64_t soundbed_bitrate = 0L;

5
libavformat/av3adec.c
View File

@ -107,7 +107,7 @@ static int av3a_read_aatf_frame_header(AATFHeaderInfo *hdf, const uint8_t *buf)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
hdf->bitrate_index_per_channel = get_bits(&gb, 4); hdf->bitrate_index_per_channel = get_bits(&gb, 4);
if ((hdf->bitrate_index_per_channel >= AV3A_BITRATE_TABLE_SIZE) || (hdf->bitrate_index_per_channel < 0)){ if ((hdf->bitrate_index_per_channel >= AV3A_BITRATE_TABLE_SIZE) || (hdf->bitrate_index_per_channel < 0)) {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
hdf->nb_objects = hdf->object_channel_number + 1; hdf->nb_objects = hdf->object_channel_number + 1;
@ -215,6 +215,7 @@ static int av3a_get_packet_size(AVFormatContext *s)
if (read_bytes != AV3A_MAX_NBYTES_HEADER) { if (read_bytes != AV3A_MAX_NBYTES_HEADER) {
return (read_bytes < 0) ? read_bytes : AVERROR_EOF; return (read_bytes < 0) ? read_bytes : AVERROR_EOF;
} }
init_get_bits8(&gb, header, AV3A_MAX_NBYTES_HEADER); init_get_bits8(&gb, header, AV3A_MAX_NBYTES_HEADER);
sync_word = get_bits(&gb, 12); sync_word = get_bits(&gb, 12);
@ -277,7 +278,7 @@ static int av3a_get_packet_size(AVFormatContext *s)
} }
objects += 1; objects += 1;
bitrate_index_per_channel = get_bits(&gb, 4); bitrate_index_per_channel = get_bits(&gb, 4);
if ((bitrate_index_per_channel >= AV3A_BITRATE_TABLE_SIZE) || (bitrate_index_per_channel < 0)){ if ((bitrate_index_per_channel >= AV3A_BITRATE_TABLE_SIZE) || (bitrate_index_per_channel < 0)) {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

1
libavformat/mov.c
View File

@ -7959,7 +7959,6 @@ static int mov_read_dca3(MOVContext *c, AVIOContext *pb, MOVAtom atom)
} }
st->codecpar->frame_size = AV3A_AUDIO_FRAME_SIZE; st->codecpar->frame_size = AV3A_AUDIO_FRAME_SIZE;
sampling_frequency_index = get_bits(&gb, 4); sampling_frequency_index = get_bits(&gb, 4);
if ((sampling_frequency_index >= AV3A_FS_TABLE_SIZE) || (sampling_frequency_index < 0)) { if ((sampling_frequency_index >= AV3A_FS_TABLE_SIZE) || (sampling_frequency_index < 0)) {
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;