diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2013-05-29 14:05:26 +0400 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-05-31 01:16:57 +0400 |
| commit | f468325d34899a9b44ac6a38b24c6a9426682a28 (patch) | |
| tree | f060904767e42bde1a177b749df5838afd4e94d3 | |
| parent | c4e0e314248865830ec073e5a3ef08e0a40aabf2 (diff) | |
lavf/id3v2enc: fix cover art display on some software
Adding an arbitrary amount of padding bytes at the end of the
ID3 metadata fixes cover art display for some software (iTunes,
Traktor, Serato, Torq).
For reference (ID3 metadata):
[ Apic frames ] -> cover doesn't show up
[ Apic frames, Padding ] -> ok
[ Apic frames, ID3 frames ] -> ok
[ ID3 frames, Apic frames ] -> cover doesn't show up
[ ID3 frames, Apic frames, Padding ] -> ok
| -rw-r--r-- | libavformat/id3v2enc.c | 13 | ||||
| -rw-r--r-- | libavformat/version.h | 2 | ||||
| -rw-r--r-- | tests/ref/lavf-fate/mp3 | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/libavformat/id3v2enc.c b/libavformat/id3v2enc.c index 60ddbaaafc..f7c37ebbdb 100644 --- a/libavformat/id3v2enc.c +++ b/libavformat/id3v2enc.c @@ -26,8 +26,11 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "avio.h" +#include "avio_internal.h" #include "id3v2.h" +#define PADDING_BYTES 10 + static void id3v2_put_size(AVIOContext *pb, int size) { avio_w8(pb, size >> 21 & 0x7f); @@ -319,7 +322,15 @@ int ff_id3v2_write_apic(AVFormatContext *s, ID3v2EncContext *id3, AVPacket *pkt) void ff_id3v2_finish(ID3v2EncContext *id3, AVIOContext *pb) { - int64_t cur_pos = avio_tell(pb); + int64_t cur_pos; + + /* adding an arbitrary amount of padding bytes at the end of the + * ID3 metadata fixes cover art display for some software (iTunes, + * Traktor, Serato, Torq) */ + ffio_fill(pb, 0, PADDING_BYTES); + id3->len += PADDING_BYTES; + + cur_pos = avio_tell(pb); avio_seek(pb, id3->size_pos, SEEK_SET); id3v2_put_size(pb, id3->len); avio_seek(pb, cur_pos, SEEK_SET); diff --git a/libavformat/version.h b/libavformat/version.h index 8517fb17af..8db210ee07 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 8 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/tests/ref/lavf-fate/mp3 b/tests/ref/lavf-fate/mp3 index 361314b2ca..6f201e00fe 100644 --- a/tests/ref/lavf-fate/mp3 +++ b/tests/ref/lavf-fate/mp3 @@ -1,3 +1,3 @@ -7fcf80c2059b5c058a6cdd2e2f798b6c *./tests/data/lavf-fate/lavf.mp3 -96366 ./tests/data/lavf-fate/lavf.mp3 +6bdea919dc6856d76ef2553698e2b0d3 *./tests/data/lavf-fate/lavf.mp3 +96376 ./tests/data/lavf-fate/lavf.mp3 ./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe |