RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mp3enc: write ISO8859-1 instead of UTF-16 when possible 

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 5a6de4e7e8)
This commit is contained in:
Anton Khirnov 2011-02-05 22:20:13 +01:00 committed by Michael Niedermayer
parent 9979dcd40e
commit 4a3556542d
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mp3enc.c
View File

@ -77,6 +77,12 @@ static void id3v2_put_size(AVFormatContext *s, int size)
put_byte(s->pb, size & 0x7f); put_byte(s->pb, size & 0x7f);
} }
static int string_is_ascii(const uint8_t *str)
{
while (*str && *str < 128) str++;
return !*str;
}
/** /**
* Write a text frame with one (normal frames) or two (TXXX frames) strings * Write a text frame with one (normal frames) or two (TXXX frames) strings
* according to encoding (only UTF-8 or UTF-16+BOM supported). * according to encoding (only UTF-8 or UTF-16+BOM supported).
@ -92,6 +98,12 @@ static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2
if (url_open_dyn_buf(&dyn_buf) < 0) if (url_open_dyn_buf(&dyn_buf) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
/* check if the strings are ASCII-only and use UTF16 only if
* they're not */
if (enc == ID3v2_ENCODING_UTF16BOM && string_is_ascii(str1) &&
(!str2 || string_is_ascii(str2)))
enc = ID3v2_ENCODING_ISO8859;
put_byte(dyn_buf, enc); put_byte(dyn_buf, enc);
if (enc == ID3v2_ENCODING_UTF16BOM) { if (enc == ID3v2_ENCODING_UTF16BOM) {
put_le16(dyn_buf, 0xFEFF); /* BOM */ put_le16(dyn_buf, 0xFEFF); /* BOM */