apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 12:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

mp3enc: handle errors in id3v2_put_ttag

Browse Source 
make the initialization of put clearer

this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478b

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 8c3caf7fb1)
This commit is contained in:
Anton Khirnov
2011-01-22 02:00:13 +01:00
committed by Michael Niedermayer
parent 204a18151c
commit 5052830fec
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/mp3enc.c
View File

@@ -79,23 +79,25 @@ static void id3v2_put_size(AVFormatContext *s, int size)
/**
* Write a text frame with one (normal frames) or two (TXXX frames) strings
* according to encoding (only UTF-8 or UTF-16+BOM supported).
* @return number of bytes written.
* @return number of bytes written or a negative error code.
*/
static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2,
uint32_t tag, enum ID3v2Encoding enc)
uint32_t tag, enum ID3v2Encoding enc)
{
int len;
uint8_t *pb;
void (*put)(ByteIOContext*, const char*) = avio_put_str;
int (*put)(ByteIOContext*, const char*);
ByteIOContext *dyn_buf;
if (url_open_dyn_buf(&dyn_buf) < 0)
return 0;
return AVERROR(ENOMEM);
put_byte(dyn_buf, enc);
if (enc == ID3v2_ENCODING_UTF16BOM) {
put_le16(dyn_buf, 0xFEFF); /* BOM */
put = avio_put_str16le;
}
} else
put = avio_put_str;
put(dyn_buf, str1);
if (str2)
put(dyn_buf, str2);
@@ -167,20 +169,25 @@ static int mp3_write_header(struct AVFormatContext *s)
ff_metadata_conv(&s->metadata, ff_id3v2_metadata_conv, NULL);
while ((t = av_metadata_get(s->metadata, "", t, AV_METADATA_IGNORE_SUFFIX))) {
uint32_t tag = 0;
int ret;
if (t->key[0] == 'T' && strlen(t->key) == 4) {
int i;
for (i = 0; *ff_id3v2_tags[i]; i++)
if (AV_RB32(t->key) == AV_RB32(ff_id3v2_tags[i])) {
tag = AV_RB32(t->key);
totlen += id3v2_put_ttag(s, t->value, NULL, tag, ID3v2_ENCODING_UTF8);
if ((ret = id3v2_put_ttag(s, t->value, NULL, tag, ID3v2_ENCODING_UTF8)) < 0)
return ret;
totlen += ret;
break;
}
}
if (!tag) { /* unknown tag, write as TXXX frame */
tag = MKBETAG('T', 'X', 'X', 'X');
totlen += id3v2_put_ttag(s, t->key, t->value, tag, ID3v2_ENCODING_UTF8);
if ((ret = id3v2_put_ttag(s, t->key, t->value, tag, ID3v2_ENCODING_UTF8)) < 0)
return ret;
totlen += ret;
}
}