return 0;
}
+// 3GPP TS 26.244
static int mov_metadata_loci(MOVContext *c, AVIOContext *pb, unsigned len)
{
char language[4] = { 0 };
len -= 1;
if (len < 12) {
- av_log(c->fc, AV_LOG_ERROR, "no space for coordinates left (%d)\n", len);
+ av_log(c->fc, AV_LOG_ERROR,
+ "loci too short (%u bytes left, need at least %d)\n", len, 12);
return AVERROR_INVALIDDATA;
}
longitude = ((int32_t) avio_rb32(pb)) / (float) (1 << 16);
if (atom.size < 0 || str_size >= INT_MAX/2)
return AVERROR_INVALIDDATA;
- // Allocates enough space if data_type is a float32 number, otherwise
+ // Allocates enough space if data_type is a int32 or float32 number, otherwise
// worst-case requirement for output string in case of utf8 coded input
- num = (data_type == 23);
+ num = (data_type >= 21 && data_type <= 23);
str_size_alloc = (num ? 512 : (raw ? str_size : str_size * 2)) + 1;
str = av_mallocz(str_size_alloc);
if (!str)
else {
if (!raw && (data_type == 3 || (data_type == 0 && (langcode < 0x400 || langcode == 0x7fff)))) { // MAC Encoded
mov_read_mac_string(c, pb, str_size, str, str_size_alloc);
+ } else if (data_type == 21) { // BE signed integer, variable size
+ int val = 0;
+ if (str_size == 1)
+ val = (int8_t)avio_r8(pb);
+ else if (str_size == 2)
+ val = (int16_t)avio_rb16(pb);
+ else if (str_size == 3)
+ val = ((int32_t)(avio_rb24(pb)<<8))>>8;
+ else if (str_size == 4)
+ val = (int32_t)avio_rb32(pb);
+ if (snprintf(str, str_size_alloc, "%d", val) >= str_size_alloc) {
+ av_log(c->fc, AV_LOG_ERROR,
+ "Failed to store the number (%d) in string.\n", val);
+ av_free(str);
+ return AVERROR_INVALIDDATA;
+ }
+ } else if (data_type == 22) { // BE unsigned integer, variable size
+ unsigned int val = 0;
+ if (str_size == 1)
+ val = avio_r8(pb);
+ else if (str_size == 2)
+ val = avio_rb16(pb);
+ else if (str_size == 3)
+ val = avio_rb24(pb);
+ else if (str_size == 4)
+ val = avio_rb32(pb);
+ if (snprintf(str, str_size_alloc, "%u", val) >= str_size_alloc) {
+ av_log(c->fc, AV_LOG_ERROR,
+ "Failed to store the number (%u) in string.\n", val);
+ av_free(str);
+ return AVERROR_INVALIDDATA;
+ }
} else if (data_type == 23 && str_size >= 4) { // BE float32
float val = av_int2float(avio_rb32(pb));
if (snprintf(str, str_size_alloc, "%f", val) >= str_size_alloc) {
return result;
}
-/* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */
+/* FIXME modify QDM2/SVQ3/H.264 decoders to take full atom as extradata */
static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom,
enum AVCodecID codec_id)
{
if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO && id > 0) {
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
} else if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO &&
- /* skip old asf mpeg4 tag */
+ /* skip old ASF MPEG-4 tag */
format && format != MKTAG('m','p','4','s')) {
id = ff_codec_get_id(ff_codec_movvideo_tags, format);
if (id <= 0)
st->codecpar->width &= ~1;
st->codecpar->height &= ~1;
}
- /* Flash Media Server uses tag H263 with Sorenson Spark */
+ /* Flash Media Server uses tag H.263 with Sorenson Spark */
if (st->codecpar->codec_tag == MKTAG('H','2','6','3') &&
!memcmp(codec_name, "Sorenson H263", 13))
st->codecpar->codec_id = AV_CODEC_ID_FLV1;