virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/aadec: Use smaller scope for variables

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-12-06 01:14:00 +01:00
parent e5ba554edf
commit 72745beb44
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/aadec.c
View File

@@ -71,7 +71,7 @@ static int get_second_size(char *codec_name)
static int aa_read_header(AVFormatContext *s) static int aa_read_header(AVFormatContext *s)
{ {
int i, idx, largest_idx = -1; int largest_idx = -1;
uint32_t toc_size, npairs, header_seed = 0, start; uint32_t toc_size, npairs, header_seed = 0, start;
char codec_name[64] = {0}; char codec_name[64] = {0};
uint8_t buf[24]; uint8_t buf[24];
@@ -80,7 +80,6 @@ static int aa_read_header(AVFormatContext *s)
uint32_t offset; uint32_t offset;
uint32_t size; uint32_t size;
} TOC[MAX_TOC_ENTRIES]; } TOC[MAX_TOC_ENTRIES];
uint32_t header_key_part[4];
uint8_t header_key[16] = {0}; uint8_t header_key[16] = {0};
AADemuxContext *c = s->priv_data; AADemuxContext *c = s->priv_data;
char file_key[2 * sizeof(c->file_key) + 1]; char file_key[2 * sizeof(c->file_key) + 1];
@@ -96,7 +95,7 @@ static int aa_read_header(AVFormatContext *s)
avio_skip(pb, 4); // unidentified integer avio_skip(pb, 4); // unidentified integer
if (toc_size > MAX_TOC_ENTRIES || toc_size < 2) if (toc_size > MAX_TOC_ENTRIES || toc_size < 2)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for (i = 0; i < toc_size; i++) { // read TOC for (uint32_t i = 0; i < toc_size; i++) { // read TOC
avio_skip(pb, 4); // TOC entry index avio_skip(pb, 4); // TOC entry index
TOC[i].offset = avio_rb32(pb); // block offset TOC[i].offset = avio_rb32(pb); // block offset
TOC[i].size = avio_rb32(pb); // block size TOC[i].size = avio_rb32(pb); // block size
@@ -105,7 +104,7 @@ static int aa_read_header(AVFormatContext *s)
npairs = avio_rb32(pb); // read dictionary entries npairs = avio_rb32(pb); // read dictionary entries
if (npairs > MAX_DICTIONARY_ENTRIES) if (npairs > MAX_DICTIONARY_ENTRIES)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for (i = 0; i < npairs; i++) { for (uint32_t i = 0; i < npairs; i++) {
char key[128], val[128]; char key[128], val[128];
uint32_t nkey, nval; uint32_t nkey, nval;
@@ -121,6 +120,7 @@ static int aa_read_header(AVFormatContext *s)
av_log(s, AV_LOG_DEBUG, "HeaderSeed is <%s>\n", val); av_log(s, AV_LOG_DEBUG, "HeaderSeed is <%s>\n", val);
header_seed = atoi(val); header_seed = atoi(val);
} else if (!strcmp(key, "HeaderKey")) { // this looks like "1234567890 1234567890 1234567890 1234567890" } else if (!strcmp(key, "HeaderKey")) { // this looks like "1234567890 1234567890 1234567890 1234567890"
uint32_t header_key_part[4];
av_log(s, AV_LOG_DEBUG, "HeaderKey is <%s>\n", val); av_log(s, AV_LOG_DEBUG, "HeaderKey is <%s>\n", val);
ret = sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32, ret = sscanf(val, "%"SCNu32"%"SCNu32"%"SCNu32"%"SCNu32,
@@ -128,9 +128,8 @@ static int aa_read_header(AVFormatContext *s)
if (ret != 4) if (ret != 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
for (idx = 0; idx < 4; idx++) { for (int idx = 0; idx < 4; idx++)
AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE! AV_WB32(&header_key[idx * 4], header_key_part[idx]); // convert each part to BE!
}
ff_data_to_hex(key, header_key, sizeof(header_key), 1); ff_data_to_hex(key, header_key, sizeof(header_key), 1);
av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is %s\n", key); av_log(s, AV_LOG_DEBUG, "Processed HeaderKey is %s\n", key);
} else { } else {
@@ -195,7 +194,7 @@ static int aa_read_header(AVFormatContext *s)
} }
/* determine, and jump to audio start offset */ /* determine, and jump to audio start offset */
for (i = 1; i < toc_size; i++) { // skip the first entry! for (uint32_t i = 1; i < toc_size; i++) { // skip the first entry!
current_size = TOC[i].size; current_size = TOC[i].size;
if (current_size > largest_size) { if (current_size > largest_size) {
largest_idx = i; largest_idx = i;