History

avformat/id3v2: Remove unnecessary indirection

ff_id3v2_parse_apic/chapters/priv/priv_dict all had a parameter extra_meta of type ID3v2ExtraMeta ** as if the functions wanted to make *extra_meta point to something else. But they don't, so just use an ID3v2ExtraMeta *.

Andreas Rheinhardt committed 6 years ago

Commit 37140eb1 parent f08853b12 files · +33 −33Browse files

Unified · Split

12 files
  1. libavformat/aacdec.c +1 −1
  2. libavformat/aiffdec.c +2 −2
  3. libavformat/asfdec_f.c +2 −2
  4. libavformat/asfdec_o.c +2 −2
  5. libavformat/dsfdec.c +2 −2
  6. libavformat/hls.c +4 −4
  7. libavformat/id3v2.c +7 −7
  8. libavformat/id3v2.h +4 −4
  9. libavformat/iff.c +2 −2
  10. libavformat/omadec.c +1 −1
  11. libavformat/utils.c +3 −3
  12. libavformat/wavdec.c +3 −3
libavformat/aacdec.c+1−1
@@ -146,7 +146,7 @@ static int handle_id3(AVFormatContext *s, AVPacket *pkt) · 145 unmodified lines
146146
147147 ffio_init_context(&ioctx, pkt->data, pkt->size, 0, NULL, NULL, NULL, NULL);
148148 ff_id3v2_read_dict(&ioctx, &metadata, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
149− if ((ret = ff_id3v2_parse_priv_dict(&metadata, &id3v2_extra_meta)) < 0)
149+ if ((ret = ff_id3v2_parse_priv_dict(&metadata, id3v2_extra_meta)) < 0)
150150 goto error;
151151
152152 if (metadata) {
libavformat/aiffdec.c+2−2
@@ -261,8 +261,8 @@ static int aiff_read_header(AVFormatContext *s) · 260 unmodified lines
261261 position = avio_tell(pb);
262262 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, size);
263263 if (id3v2_extra_meta)
264− if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0 ||
265− (ret = ff_id3v2_parse_chapters(s, &id3v2_extra_meta)) < 0) {
264+ if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0 ||
265+ (ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) {
266266 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
267267 return ret;
268268 }
libavformat/asfdec_f.c+2−2
@@ -308,8 +308,8 @@ static void get_id3_tag(AVFormatContext *s, int len) · 307 unmodified lines
308308
309309 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, len);
310310 if (id3v2_extra_meta) {
311− ff_id3v2_parse_apic(s, &id3v2_extra_meta);
312− ff_id3v2_parse_chapters(s, &id3v2_extra_meta);
311+ ff_id3v2_parse_apic(s, id3v2_extra_meta);
312+ ff_id3v2_parse_chapters(s, id3v2_extra_meta);
313313 }
314314 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
315315 }
libavformat/asfdec_o.c+2−2
@@ -461,8 +461,8 @@ static void get_id3_tag(AVFormatContext *s, int len) · 460 unmodified lines
461461
462462 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, len);
463463 if (id3v2_extra_meta) {
464− ff_id3v2_parse_apic(s, &id3v2_extra_meta);
465− ff_id3v2_parse_chapters(s, &id3v2_extra_meta);
464+ ff_id3v2_parse_apic(s, id3v2_extra_meta);
465+ ff_id3v2_parse_chapters(s, id3v2_extra_meta);
466466 }
467467 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
468468 }
libavformat/dsfdec.c+2−2
@@ -56,8 +56,8 @@ static void read_id3(AVFormatContext *s, uint64_t id3pos) · 55 unmodified lines
5656
5757 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0);
5858 if (id3v2_extra_meta) {
59− ff_id3v2_parse_apic(s, &id3v2_extra_meta);
60− ff_id3v2_parse_chapters(s, &id3v2_extra_meta);
59+ ff_id3v2_parse_apic(s, id3v2_extra_meta);
60+ ff_id3v2_parse_chapters(s, id3v2_extra_meta);
6161 }
6262 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
6363 }
libavformat/hls.c+4−4
@@ -1070,12 +1070,12 @@ static void handle_id3(AVIOContext *pb, struct playlist *pls) · 1069 unmodified lines
10701070
10711071 /* get picture attachment and set text metadata */
10721072 if (pls->ctx->nb_streams)
1073− ff_id3v2_parse_apic(pls->ctx, &extra_meta);
1073+ ff_id3v2_parse_apic(pls->ctx, extra_meta);
10741074 else
10751075 /* demuxer not yet opened, defer picture attachment */
10761076 pls->id3_deferred_extra = extra_meta;
10771077
1078− ff_id3v2_parse_priv_dict(&metadata, &extra_meta);
1078+ ff_id3v2_parse_priv_dict(&metadata, extra_meta);
10791079 av_dict_copy(&pls->ctx->metadata, metadata, 0);
10801080 pls->id3_initial = metadata;
10811081
@@ -1965,9 +1965,9 @@ static int hls_read_header(AVFormatContext *s) · 883 unmodified lines
19651965 goto fail;
19661966
19671967 if (pls->id3_deferred_extra && pls->ctx->nb_streams == 1) {
1968− ff_id3v2_parse_apic(pls->ctx, &pls->id3_deferred_extra);
1968+ ff_id3v2_parse_apic(pls->ctx, pls->id3_deferred_extra);
19691969 avformat_queue_attached_pictures(pls->ctx);
1970− ff_id3v2_parse_priv(pls->ctx, &pls->id3_deferred_extra);
1970+ ff_id3v2_parse_priv(pls->ctx, pls->id3_deferred_extra);
19711971 ff_id3v2_free_extra_meta(&pls->id3_deferred_extra);
19721972 }
19731973
libavformat/id3v2.c+7−7
@@ -1127,11 +1127,11 @@ void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta) · 1126 unmodified lines
11271127 *extra_meta = NULL;
11281128 }
11291129
1130−int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta)
1130+int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta *extra_meta)
11311131 {
11321132 ID3v2ExtraMeta *cur;
11331133
1134− for (cur = *extra_meta; cur; cur = cur->next) {
1134+ for (cur = extra_meta; cur; cur = cur->next) {
11351135 ID3v2ExtraMetaAPIC *apic;
11361136 AVStream *st;
11371137
@@ -1167,7 +1167,7 @@ int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta) · 29 unmodified lines
11671167 return 0;
11681168 }
11691169
1170−int ff_id3v2_parse_chapters(AVFormatContext *s, ID3v2ExtraMeta **extra_meta)
1170+int ff_id3v2_parse_chapters(AVFormatContext *s, ID3v2ExtraMeta *extra_meta)
11711171 {
11721172 int ret = 0;
11731173 ID3v2ExtraMeta *cur;
@@ -1178,7 +1178,7 @@ int ff_id3v2_parse_chapters(AVFormatContext *s, ID3v2ExtraMeta **extra_meta) · 4 unmodified lines
11781178
11791179 // since extra_meta is a linked list where elements are prepended,
11801180 // we need to reverse the order of chapters
1181− for (cur = *extra_meta; cur; cur = cur->next) {
1181+ for (cur = extra_meta; cur; cur = cur->next) {
11821182 ID3v2ExtraMetaCHAP *chap;
11831183
11841184 if (strcmp(cur->tag, "CHAP"))
@@ -1218,12 +1218,12 @@ end: · 33 unmodified lines
12181218 return ret;
12191219 }
12201220
1221−int ff_id3v2_parse_priv_dict(AVDictionary **metadata, ID3v2ExtraMeta **extra_meta)
1221+int ff_id3v2_parse_priv_dict(AVDictionary **metadata, ID3v2ExtraMeta *extra_meta)
12221222 {
12231223 ID3v2ExtraMeta *cur;
12241224 int dict_flags = AV_DICT_DONT_OVERWRITE | AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL;
12251225
1226− for (cur = *extra_meta; cur; cur = cur->next) {
1226+ for (cur = extra_meta; cur; cur = cur->next) {
12271227 if (!strcmp(cur->tag, "PRIV")) {
12281228 ID3v2ExtraMetaPRIV *priv = &cur->data.priv;
12291229 AVBPrint bprint;
@@ -1258,7 +1258,7 @@ int ff_id3v2_parse_priv_dict(AVDictionary **metadata, ID3v2ExtraMeta **extra_met · 28 unmodified lines
12581258 return 0;
12591259 }
12601260
1261−int ff_id3v2_parse_priv(AVFormatContext *s, ID3v2ExtraMeta **extra_meta)
1261+int ff_id3v2_parse_priv(AVFormatContext *s, ID3v2ExtraMeta *extra_meta)
12621262 {
12631263 return ff_id3v2_parse_priv_dict(&s->metadata, extra_meta);
12641264 }
libavformat/id3v2.h+4−4
@@ -167,25 +167,25 @@ void ff_id3v2_free_extra_meta(ID3v2ExtraMeta **extra_meta); · 166 unmodified lines
167167 * Create a stream for each APIC (attached picture) extracted from the
168168 * ID3v2 header.
169169 */
170−int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta **extra_meta);
170+int ff_id3v2_parse_apic(AVFormatContext *s, ID3v2ExtraMeta *extra_meta);
171171
172172 /**
173173 * Create chapters for all CHAP tags found in the ID3v2 header.
174174 */
175−int ff_id3v2_parse_chapters(AVFormatContext *s, ID3v2ExtraMeta **extra_meta);
175+int ff_id3v2_parse_chapters(AVFormatContext *s, ID3v2ExtraMeta *extra_meta);
176176
177177 /**
178178 * Parse PRIV tags into a dictionary. The PRIV owner is the metadata key. The
179179 * PRIV data is the value, with non-printable characters escaped.
180180 */
181−int ff_id3v2_parse_priv_dict(AVDictionary **d, ID3v2ExtraMeta **extra_meta);
181+int ff_id3v2_parse_priv_dict(AVDictionary **d, ID3v2ExtraMeta *extra_meta);
182182
183183 /**
184184 * Add metadata for all PRIV tags in the ID3v2 header. The PRIV owner is the
185185 * metadata key. The PRIV data is the value, with non-printable characters
186186 * escaped.
187187 */
188−int ff_id3v2_parse_priv(AVFormatContext *s, ID3v2ExtraMeta **extra_meta);
188+int ff_id3v2_parse_priv(AVFormatContext *s, ID3v2ExtraMeta *extra_meta);
189189
190190 extern const AVMetadataConv ff_id3v2_34_metadata_conv[];
191191 extern const AVMetadataConv ff_id3v2_4_metadata_conv[];
libavformat/iff.c+2−2
@@ -312,8 +312,8 @@ static int parse_dsd_prop(AVFormatContext *s, AVStream *st, uint64_t eof) · 311 unmodified lines
312312 id3v2_extra_meta = NULL;
313313 ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, size);
314314 if (id3v2_extra_meta) {
315− if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0 ||
316− (ret = ff_id3v2_parse_chapters(s, &id3v2_extra_meta)) < 0) {
315+ if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0 ||
316+ (ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0) {
317317 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
318318 return ret;
319319 }
libavformat/omadec.c+1−1
@@ -396,7 +396,7 @@ static int oma_read_header(AVFormatContext *s) · 395 unmodified lines
396396 OMAContext *oc = s->priv_data;
397397
398398 ff_id3v2_read(s, ID3v2_EA3_MAGIC, &extra_meta, 0);
399− if ((ret = ff_id3v2_parse_chapters(s, &extra_meta)) < 0) {
399+ if ((ret = ff_id3v2_parse_chapters(s, extra_meta)) < 0) {
400400 ff_id3v2_free_extra_meta(&extra_meta);
401401 return ret;
402402 }
libavformat/utils.c+3−3
@@ -638,11 +638,11 @@ FF_ENABLE_DEPRECATION_WARNINGS · 637 unmodified lines
638638 if (id3v2_extra_meta) {
639639 if (!strcmp(s->iformat->name, "mp3") || !strcmp(s->iformat->name, "aac") ||
640640 !strcmp(s->iformat->name, "tta") || !strcmp(s->iformat->name, "wav")) {
641− if ((ret = ff_id3v2_parse_apic(s, &id3v2_extra_meta)) < 0)
641+ if ((ret = ff_id3v2_parse_apic(s, id3v2_extra_meta)) < 0)
642642 goto close;
643− if ((ret = ff_id3v2_parse_chapters(s, &id3v2_extra_meta)) < 0)
643+ if ((ret = ff_id3v2_parse_chapters(s, id3v2_extra_meta)) < 0)
644644 goto close;
645− if ((ret = ff_id3v2_parse_priv(s, &id3v2_extra_meta)) < 0)
645+ if ((ret = ff_id3v2_parse_priv(s, id3v2_extra_meta)) < 0)
646646 goto close;
647647 } else
648648 av_log(s, AV_LOG_DEBUG, "demuxer does not support additional id3 data, skipping\n");
libavformat/wavdec.c+3−3
@@ -507,9 +507,9 @@ static int wav_read_header(AVFormatContext *s) · 506 unmodified lines
507507 ID3v2ExtraMeta *id3v2_extra_meta = NULL;
508508 ff_id3v2_read_dict(pb, &s->internal->id3v2_meta, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
509509 if (id3v2_extra_meta) {
510− ff_id3v2_parse_apic(s, &id3v2_extra_meta);
511− ff_id3v2_parse_chapters(s, &id3v2_extra_meta);
512− ff_id3v2_parse_priv(s, &id3v2_extra_meta);
510+ ff_id3v2_parse_apic(s, id3v2_extra_meta);
511+ ff_id3v2_parse_chapters(s, id3v2_extra_meta);
512+ ff_id3v2_parse_priv(s, id3v2_extra_meta);
513513 }
514514 ff_id3v2_free_extra_meta(&id3v2_extra_meta);
515515 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t