RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-01 20:42:19 +00:00
Code Issues Projects Releases Wiki Activity

Move put_le16_nolen() to asf.c and give it a ff_ prefix. This way, it is easier

Browse Source 
to share it with e.g. MMS.

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 22656 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zhentan Feng 2010-03-24 18:40:43 +00:00 committed by Ronald S. Bultje
parent 508f092a78
commit 852e0ca555
3 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/asf.c
View File

@ -152,3 +152,20 @@ const AVMetadataConv ff_asf_metadata_conv[] = {
// { "Year" , "date" }, TODO: conversion year<->date // { "Year" , "date" }, TODO: conversion year<->date
{ 0 } { 0 }
}; };
int ff_put_str16_nolen(ByteIOContext *s, const char *tag)
{
const uint8_t *q = tag;
int ret = 0;
while (*q) {
uint32_t ch;
uint16_t tmp;
GET_UTF8(ch, *q++, break;)
PUT_UTF16(ch, tmp, put_le16(s, tmp);ret += 2;)
}
put_le16(s, 0);
ret += 2;
return ret;
}

1
libavformat/asf.h
View File

@ -229,5 +229,6 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
extern AVInputFormat asf_demuxer; extern AVInputFormat asf_demuxer;
int ff_put_str16_nolen(ByteIOContext *s, const char *tag);
#endif /* AVFORMAT_ASF_H */ #endif /* AVFORMAT_ASF_H */

23
libavformat/asfenc.c
View File

@ -203,23 +203,6 @@ static void put_guid(ByteIOContext *s, const ff_asf_guid *g)
put_buffer(s, *g, sizeof(*g)); put_buffer(s, *g, sizeof(*g));
} }
static int put_str16_nolen(ByteIOContext *s, const char *tag)
{
const uint8_t *q = tag;
int ret = 0;
while (*q) {
uint32_t ch;
uint16_t tmp;
GET_UTF8(ch, *q++, break;)
PUT_UTF16(ch, tmp, put_le16(s, tmp);ret += 2;)
}
put_le16(s, 0);
ret += 2;
return ret;
}
static void put_str16(ByteIOContext *s, const char *tag) static void put_str16(ByteIOContext *s, const char *tag)
{ {
int len; int len;
@ -228,7 +211,7 @@ static void put_str16(ByteIOContext *s, const char *tag)
if (url_open_dyn_buf(&dyn_buf) < 0) if (url_open_dyn_buf(&dyn_buf) < 0)
return; return;
put_str16_nolen(dyn_buf, tag); ff_put_str16_nolen(dyn_buf, tag);
len = url_close_dyn_buf(dyn_buf, &pb); len = url_close_dyn_buf(dyn_buf, &pb);
put_le16(s, len); put_le16(s, len);
put_buffer(s, pb, len); put_buffer(s, pb, len);
@ -361,7 +344,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
hpos = put_header(pb, &ff_asf_comment_header); hpos = put_header(pb, &ff_asf_comment_header);
for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) { for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) {
len = tags[n] ? put_str16_nolen(dyn_buf, tags[n]->value) : 0; len = tags[n] ? ff_put_str16_nolen(dyn_buf, tags[n]->value) : 0;
put_le16(pb, len); put_le16(pb, len);
} }
len = url_close_dyn_buf(dyn_buf, &buf); len = url_close_dyn_buf(dyn_buf, &buf);
@ -489,7 +472,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
if ( url_open_dyn_buf(&dyn_buf) < 0) if ( url_open_dyn_buf(&dyn_buf) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
put_str16_nolen(dyn_buf, desc); ff_put_str16_nolen(dyn_buf, desc);
len = url_close_dyn_buf(dyn_buf, &buf); len = url_close_dyn_buf(dyn_buf, &buf);
put_le16(pb, len / 2); // "number of characters" = length in bytes / 2 put_le16(pb, len / 2); // "number of characters" = length in bytes / 2