- value = av_malloc(size+1);
- if (!value)
- return AVERROR(ENOMEM);
- avio_read(pb, value, size);
- value[size] = 0;
- av_metadata_set2(&s->metadata, key, value, AV_METADATA_DONT_STRDUP_VAL);
+ if (flags & APE_TAG_FLAG_IS_BINARY) {
+ uint8_t filename[1024];
+ enum AVCodecID id;
+ AVStream *st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+
+ size -= avio_get_str(pb, size, filename, sizeof(filename));
+ if (size <= 0) {
+ av_log(s, AV_LOG_WARNING, "Skipping binary tag '%s'.\n", key);
+ return 0;
+ }
+
+ av_dict_set(&st->metadata, key, filename, 0);
+
+ if ((id = ff_guess_image2_codec(filename)) != AV_CODEC_ID_NONE) {
+ AVPacket pkt;
+ int ret;
+
+ ret = av_get_packet(s->pb, &pkt, size);
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Error reading cover art.\n");
+ return ret;
+ }
+
+ st->disposition |= AV_DISPOSITION_ATTACHED_PIC;
+ st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codec->codec_id = id;
+
+ st->attached_pic = pkt;
+ st->attached_pic.stream_index = st->index;
+ st->attached_pic.flags |= AV_PKT_FLAG_KEY;
+ } else {
+ st->codec->extradata = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+ if (avio_read(pb, st->codec->extradata, size) != size) {
+ av_freep(&st->codec->extradata);
+ return AVERROR(EIO);
+ }
+ st->codec->extradata_size = size;
+ st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
+ }
+ } else {
+ value = av_malloc(size+1);
+ if (!value)
+ return AVERROR(ENOMEM);
+ c = avio_read(pb, value, size);
+ if (c < 0) {
+ av_free(value);
+ return c;
+ }
+ value[c] = 0;
+ av_dict_set(&s->metadata, key, value, AV_DICT_DONT_STRDUP_VAL);
+ }