highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utf8 title support for psp (untested)

Browse Source 
Originally committed as revision 6939 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-11-08 01:15:06 +00:00
parent 997baf0141
commit 79e5a53c0a
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/movenc.c
View File

@ -1225,19 +1225,25 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
return updateSize(pb, pos); return updateSize(pb, pos);
} }
static int utf8len(uint8_t *b){
int len=0;
int val;
while(*b){
GET_UTF8(val, *b++, return -1;)
len++;
}
return len;
}
static size_t ascii_to_wc (ByteIOContext *pb, char *b, size_t n) static int ascii_to_wc (ByteIOContext *pb, uint8_t *b)
{ {
size_t i; int val;
unsigned char c; while(*b){
for (i = 0; i < n - 1; i++) { GET_UTF8(val, *b++, return -1;)
c = b[i]; put_be16(pb, val);
if (! (0x20 <= c && c <= 0x7f ))
c = 0x3f; /* '?' */
put_be16(pb, c);
} }
put_be16(pb, 0x00); put_be16(pb, 0x00);
return 2*n; return 0;
} }
static uint16_t language_code (const char *str) static uint16_t language_code (const char *str)
@ -1275,31 +1281,37 @@ static int mov_write_uuidusmt_tag (ByteIOContext *pb, AVFormatContext *s)
size += 12; size += 12;
// Encoder // Encoder
len = strlen(LIBAVCODEC_IDENT)+1; len = utf8len(LIBAVCODEC_IDENT)+1;
if(len<=0)
goto not_utf8;
put_be16(pb, len*2+10); /* size */ put_be16(pb, len*2+10); /* size */
put_be32(pb, 0x04); /* type */ put_be32(pb, 0x04); /* type */
put_be16(pb, language_code("eng")); /* language */ put_be16(pb, language_code("eng")); /* language */
put_be16(pb, 0x01); /* ? */ put_be16(pb, 0x01); /* ? */
ascii_to_wc(pb, LIBAVCODEC_IDENT, len); ascii_to_wc(pb, LIBAVCODEC_IDENT);
size += len*2+10; size += len*2+10;
// Title // Title
len = strlen(s->title)+1; len = utf8len(s->title)+1;
if(len<=0)
goto not_utf8;
put_be16(pb, len*2+10); /* size */ put_be16(pb, len*2+10); /* size */
put_be32(pb, 0x01); /* type */ put_be32(pb, 0x01); /* type */
put_be16(pb, language_code("eng")); /* language */ put_be16(pb, language_code("eng")); /* language */
put_be16(pb, 0x01); /* ? */ put_be16(pb, 0x01); /* ? */
ascii_to_wc (pb, s->title, len); ascii_to_wc (pb, s->title);
size += len*2+10; size += len*2+10;
// Date // Date
// snprintf(dt,32,"%04d/%02d/%02d %02d:%02d:%02d",t_st->tm_year+1900,t_st->tm_mon+1,t_st->tm_mday,t_st->tm_hour,t_st->tm_min,t_st->tm_sec); // snprintf(dt,32,"%04d/%02d/%02d %02d:%02d:%02d",t_st->tm_year+1900,t_st->tm_mon+1,t_st->tm_mday,t_st->tm_hour,t_st->tm_min,t_st->tm_sec);
len = strlen("2006/04/01 11:11:11")+1; len = utf8len("2006/04/01 11:11:11")+1;
if(len<=0)
goto not_utf8;
put_be16(pb, len*2+10); /* size */ put_be16(pb, len*2+10); /* size */
put_be32(pb, 0x03); /* type */ put_be32(pb, 0x03); /* type */
put_be16(pb, language_code("und")); /* language */ put_be16(pb, language_code("und")); /* language */
put_be16(pb, 0x01); /* ? */ put_be16(pb, 0x01); /* ? */
ascii_to_wc (pb, "2006/04/01 11:11:11", len); ascii_to_wc (pb, "2006/04/01 11:11:11");
size += len*2+10; size += len*2+10;
// size // size
@ -1312,6 +1324,9 @@ static int mov_write_uuidusmt_tag (ByteIOContext *pb, AVFormatContext *s)
} }
return size; return size;
not_utf8:
av_log(s, AV_LOG_ERROR, "not utf8\n");
return -1;
} }
static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov, static int mov_write_moov_tag(ByteIOContext *pb, MOVContext *mov,