RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-08 13:38:07 +00:00
Code Issues Projects Releases Wiki Activity

avio: Add avio_put_str16be

Browse Source
This commit is contained in:
Luca Barbato 2015-06-05 23:21:18 +02:00
parent 9b56ac74b1
commit 252d6200c3
4 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -13,6 +13,9 @@ libavutil: 2014-08-09
API changes, most recent first: API changes, most recent first:
2015-xx-xx - xxxxxxx - lavf 56.20.0 - avio.h
Add avio_put_str16be.
2015-xx-xx - xxxxxxx - lavu 54.14.0 - cpu.h 2015-xx-xx - xxxxxxx - lavu 54.14.0 - cpu.h
Add AV_CPU_FLAG_AVXSLOW. Add AV_CPU_FLAG_AVXSLOW.

12
libavformat/avio.h
View File

@ -178,10 +178,22 @@ int avio_put_str(AVIOContext *s, const char *str);
/** /**
* Convert an UTF-8 string to UTF-16LE and write it. * Convert an UTF-8 string to UTF-16LE and write it.
* @param s the AVIOContext
* @param str NULL-terminated UTF-8 string
*
* @return number of bytes written. * @return number of bytes written.
*/ */
int avio_put_str16le(AVIOContext *s, const char *str); int avio_put_str16le(AVIOContext *s, const char *str);
/**
* Convert an UTF-8 string to UTF-16BE and write it.
* @param s the AVIOContext
* @param str NULL-terminated UTF-8 string
*
* @return number of bytes written.
*/
int avio_put_str16be(AVIOContext *s, const char *str);
/** /**
* Passing this as the "whence" parameter to a seek function causes it to * Passing this as the "whence" parameter to a seek function causes it to
* return the filesize without seeking anywhere. Supporting this is optional. * return the filesize without seeking anywhere. Supporting this is optional.

36
libavformat/aviobuf.c
View File

@ -284,22 +284,28 @@ int avio_put_str(AVIOContext *s, const char *str)
return len; return len;
} }
int avio_put_str16le(AVIOContext *s, const char *str) #define PUT_STR16(type, write) \
{ int avio_put_str16 ## type(AVIOContext * s, const char *str) \
const uint8_t *q = str; { \
int ret = 0; const uint8_t *q = str; \
int ret = 0; \
while (*q) { \
uint32_t ch; while (*q) { \
uint16_t tmp; uint32_t ch; \
uint16_t tmp; \
GET_UTF8(ch, *q++, break;) \
PUT_UTF16(ch, tmp, avio_wl16(s, tmp); ret += 2;) GET_UTF8(ch, *q++, break; ) \
PUT_UTF16(ch, tmp, write(s, tmp); ret += 2; ) \
} \
write(s, 0); \
ret += 2; \
return ret; \
} }
avio_wl16(s, 0);
ret += 2; PUT_STR16(le, avio_wl16)
return ret; PUT_STR16(be, avio_wb16)
}
#undef PUT_STR16
int ff_get_v_length(uint64_t val) int ff_get_v_length(uint64_t val)
{ {

2
libavformat/version.h
View File

@ -30,7 +30,7 @@
#include "libavutil/version.h" #include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 19 #define LIBAVFORMAT_VERSION_MINOR 20
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \