#include <regex.h>
#include "para.h"
+#include "error.h"
#include "portable_io.h"
#include "string.h"
#include "mp4.h"
-struct mp4ff_track {
- int32_t type;
- int32_t channelCount;
- int32_t sampleSize;
+struct mp4_track {
+ uint16_t channelCount;
uint16_t sampleRate;
- int32_t audioType;
-
- /* stsd */
- int32_t stsd_entry_count;
/* stsz */
- int32_t stsz_sample_size;
- int32_t stsz_sample_count;
- int32_t *stsz_table;
+ uint32_t stsz_sample_size;
+ uint32_t stsz_sample_count;
+ uint32_t *stsz_table;
/* stts */
- int32_t stts_entry_count;
- int32_t *stts_sample_count;
- int32_t *stts_sample_delta;
+ uint32_t stts_entry_count;
+ uint32_t *stts_sample_count;
/* stsc */
- int32_t stsc_entry_count;
- int32_t *stsc_first_chunk;
- int32_t *stsc_samples_per_chunk;
- int32_t *stsc_sample_desc_index;
+ uint32_t stsc_entry_count;
+ uint32_t *stsc_first_chunk;
+ uint32_t *stsc_samples_per_chunk;
/* stsc */
- int32_t stco_entry_count;
- int32_t *stco_chunk_offset;
-
- /* ctts */
- int32_t ctts_entry_count;
- int32_t *ctts_sample_count;
- int32_t *ctts_sample_offset;
-
- /* esde */
- uint8_t *decoderConfig;
- int32_t decoderConfigLen;
-
- uint32_t maxBitrate;
- uint32_t avgBitrate;
+ uint32_t stco_entry_count;
+ uint32_t *stco_chunk_offset;
uint32_t timeScale;
uint64_t duration;
#define MAX_TRACKS 1024
-struct mp4ff {
- /* stream to read from */
- struct mp4ff_callback *stream;
+struct mp4 {
+ const struct mp4_callback *cb;
int64_t current_position;
uint64_t moov_offset;
uint64_t moov_size;
uint8_t last_atom;
uint64_t file_size;
- uint32_t error;
-
- /* mvhd */
- int32_t time_scale;
- int32_t duration;
/* incremental track index while reading the file */
int32_t total_tracks;
-
/* track data */
- struct mp4ff_track *track[MAX_TRACKS];
+ struct mp4_track *track[MAX_TRACKS];
+ /* the first audio track found */
+ struct mp4_track *audio_track;
/* metadata */
- struct mp4ff_metadata tags;
+ struct mp4_metadata meta;
};
-int32_t mp4ff_total_tracks(const struct mp4ff *f)
+/*
+ * Returns -1, 0, or 1 on errors/EOF/success. Partial reads followed by EOF or
+ * read errors are treated as errors.
+ */
+static int read_data(struct mp4 *f, void *data, size_t size)
{
- return f->total_tracks;
+ while (size > 0) {
+ ssize_t ret = f->cb->read(f->cb->user_data, data, size);
+ if (ret < 0 && errno == EINTR)
+ continue;
+ /* regard EAGAIN as an error as reads should be blocking. */
+ if (ret <= 0)
+ return ret < 0? -1 : 0;
+ f->current_position += ret;
+ size -= ret;
+ }
+ return 1;
}
-static int32_t read_data(struct mp4ff *f, void *data, uint32_t size)
+static int read_int64(struct mp4 *f, uint64_t *result)
{
- int32_t result = 1;
+ uint8_t data[8];
+ int ret = read_data(f, data, 8);
+
+ if (ret > 0 && result)
+ *result = read_u64_be(data);
+ return ret;
+}
- result = f->stream->read(f->stream->user_data, data, size);
+static int read_int32(struct mp4 *f, uint32_t *result)
+{
+ uint8_t data[4];
+ int ret = read_data(f, data, 4);
- if (result < size)
- f->stream->read_error++;
+ if (ret > 0 && result)
+ *result = read_u32_be(data);
+ return ret;
+}
- f->current_position += size;
+static int read_int24(struct mp4 *f, uint32_t *result)
+{
+ uint8_t data[3];
+ int ret = read_data(f, data, 3);
- return result;
+ if (ret > 0 && result)
+ *result = read_u24_be(data);
+ return ret;
}
-static uint64_t read_int64(struct mp4ff *f)
+static int read_int16(struct mp4 *f, uint16_t *result)
{
- uint8_t data[8];
+ uint8_t data[2];
+ int ret = read_data(f, data, 2);
- read_data(f, data, 8);
- return read_u64_be(data);
+ if (ret > 0 && result)
+ *result = read_u16_be(data);
+ return ret;
}
-/* comnapre 2 atom names, returns 1 for equal, 0 for unequal */
-static int32_t atom_compare(int8_t a1, int8_t b1, int8_t c1, int8_t d1,
- int8_t a2, int8_t b2, int8_t c2, int8_t d2)
+static uint8_t read_int8(struct mp4 *f, uint8_t *result)
{
- if (a1 == a2 && b1 == b2 && c1 == c2 && d1 == d2)
- return 1;
- else
- return 0;
+ uint8_t data[1];
+ int ret = read_data(f, data, 1);
+
+ if (ret > 0 && result)
+ *result = data[0];
+ return ret;
}
-enum tracks {
- TRACK_UNKNOWN = 0,
- TRACK_AUDIO = 1,
- TRACK_VIDEO = 2,
- TRACK_SYSTEM = 3
-};
+static bool atom_compare(int8_t a1, int8_t b1, int8_t c1, int8_t d1,
+ int8_t a2, int8_t b2, int8_t c2, int8_t d2)
+{
+ return a1 == a2 && b1 == b2 && c1 == c2 && d1 == d2;
+}
enum atoms {
/* atoms with subatoms */
ATOM_MVHD = 131,
ATOM_TKHD = 132,
ATOM_TREF = 133,
- ATOM_MDHD = 134,
+ ATOM_MDHD = 134, /* track header */
ATOM_VMHD = 135,
ATOM_SMHD = 136,
ATOM_HMHD = 137,
- ATOM_STSD = 138,
- ATOM_STTS = 139,
- ATOM_STSZ = 140,
+ ATOM_STSD = 138, /* sample description box */
+ ATOM_STTS = 139, /* time to sample box */
+ ATOM_STSZ = 140, /* sample size box */
ATOM_STZ2 = 141,
- ATOM_STCO = 142,
- ATOM_STSC = 143,
+ ATOM_STCO = 142, /* chunk offset box */
+ ATOM_STSC = 143, /* sample to chunk box */
ATOM_MP4A = 144,
ATOM_MP4V = 145,
ATOM_MP4S = 146,
return ATOM_UNKNOWN;
}
-/* read atom header, return atom size, atom size is with header included */
-static uint64_t atom_read_header(struct mp4ff *f, uint8_t * atom_type,
- uint8_t * header_size)
+/* read atom header, atom size is returned with header included. */
+static int atom_read_header(struct mp4 *f, uint8_t *atom_type,
+ uint8_t *header_size, uint64_t *atom_size)
{
- uint64_t size;
- int32_t ret;
+ uint32_t size;
+ int ret;
int8_t atom_header[8];
ret = read_data(f, atom_header, 8);
- if (ret != 8)
- return 0;
-
+ if (ret <= 0)
+ return ret;
size = read_u32_be(atom_header);
- *header_size = 8;
-
- /* check for 64 bit atom size */
- if (size == 1) {
- *header_size = 16;
- size = read_int64(f);
+ if (size == 1) { /* 64 bit atom size */
+ if (header_size)
+ *header_size = 16;
+ ret = read_int64(f, atom_size);
+ if (ret <= 0)
+ return ret;
+ } else {
+ if (header_size)
+ *header_size = 8;
+ if (atom_size)
+ *atom_size = size;
}
*atom_type = atom_name_to_type(atom_header[4], atom_header[5],
atom_header[6], atom_header[7]);
- return size;
+ return 1;
}
-static int64_t get_position(const struct mp4ff *f)
+static int64_t get_position(const struct mp4 *f)
{
return f->current_position;
}
-static int need_parse_when_meta_only(uint8_t atom_type)
+static int32_t set_position(struct mp4 *f, int64_t position)
{
- switch (atom_type) {
- case ATOM_EDTS:
- case ATOM_DRMS:
- case ATOM_SINF:
- case ATOM_SCHI:
- case ATOM_STTS:
- case ATOM_STSZ:
- case ATOM_STZ2:
- case ATOM_STCO:
- case ATOM_STSC:
- case ATOM_FRMA:
- case ATOM_IVIV:
- case ATOM_PRIV:
- return 0;
- default:
- return 1;
- }
-}
-
-static int32_t set_position(struct mp4ff *f, int64_t position)
-{
- f->stream->seek(f->stream->user_data, position);
+ f->cb->seek(f->cb->user_data, position);
f->current_position = position;
return 0;
}
-static void track_add(struct mp4ff *f)
-{
- f->total_tracks++;
-
- if (f->total_tracks > MAX_TRACKS) {
- f->total_tracks = 0;
- f->error++;
- return;
- }
- f->track[f->total_tracks - 1] = para_calloc(sizeof(struct mp4ff_track));
-}
-
-static uint8_t read_char(struct mp4ff *f)
-{
- uint8_t output;
- read_data(f, &output, 1);
- return output;
-}
-
-static uint32_t read_int24(struct mp4ff *f)
-{
- int8_t data[4];
-
- read_data(f, data, 3);
- return read_u24_be(data);
-}
-
-static uint32_t read_int32(struct mp4ff *f)
-{
- int8_t data[4];
-
- read_data(f, data, 4);
- return read_u32_be(data);
-}
-
-static int32_t read_stsz(struct mp4ff *f)
+static int read_stsz(struct mp4 *f)
{
+ int ret;
int32_t i;
- struct mp4ff_track *t;
+ struct mp4_track *t;
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
- read_char(f); /* version */
- read_int24(f); /* flags */
- t->stsz_sample_size = read_int32(f);
- t->stsz_sample_count = read_int32(f);
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ return ret;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->stsz_sample_size);
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->stsz_sample_count);
+ if (ret <= 0)
+ return ret;
if (t->stsz_sample_size != 0)
- return 0;
+ return 1;
t->stsz_table = para_malloc(t->stsz_sample_count * sizeof(int32_t));
- for (i = 0; i < t->stsz_sample_count && !f->stream->read_error; i++)
- t->stsz_table[i] = read_int32(f);
- return 0;
+ for (i = 0; i < t->stsz_sample_count; i++) {
+ ret = read_int32(f, &t->stsz_table[i]);
+ if (ret <= 0)
+ return ret;
+ }
+ return 1;
}
-static int32_t read_stts(struct mp4ff *f)
+static int read_stts(struct mp4 *f)
{
+ int ret;
int32_t i;
- struct mp4ff_track *t;
+ struct mp4_track *t;
- /* CVE-2017-9223 */
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
if (t->stts_entry_count)
return 0;
- read_char(f); /* version */
- read_int24(f); /* flags */
- t->stts_entry_count = read_int32(f);
-
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ return ret;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->stts_entry_count);
+ if (ret <= 0)
+ return ret;
t->stts_sample_count = para_malloc(t->stts_entry_count
* sizeof(int32_t));
- t->stts_sample_delta = para_malloc(t->stts_entry_count
- * sizeof (int32_t));
- /* CVE-2017-9254 */
- for (i = 0; i < t->stts_entry_count && !f->stream->read_error; i++) {
- t->stts_sample_count[i] = read_int32(f);
- t->stts_sample_delta[i] = read_int32(f);
- }
- return 1;
-}
-
-static int32_t read_ctts(struct mp4ff *f)
-{
- int32_t i;
- struct mp4ff_track *t;
-
- if (f->total_tracks == 0)
- return f->error++;
- t = f->track[f->total_tracks - 1];
- if (t->ctts_entry_count)
- return 0;
-
- read_char(f); /* version */
- read_int24(f); /* flags */
- t->ctts_entry_count = read_int32(f);
-
- t->ctts_sample_count = para_malloc(t->ctts_entry_count
- * sizeof (int32_t));
- t->ctts_sample_offset = para_malloc(t->ctts_entry_count
- * sizeof (int32_t));
-
- /* CVE-2017-9257 */
- for (i = 0; i < t->ctts_entry_count && !f->stream->read_error; i++) {
- t->ctts_sample_count[i] = read_int32(f);
- t->ctts_sample_offset[i] = read_int32(f);
+ for (i = 0; i < t->stts_entry_count; i++) {
+ ret = read_int32(f, &t->stts_sample_count[i]);
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, NULL); /* sample delta */
+ if (ret <= 0)
+ return ret;
}
return 1;
}
-static int32_t read_stsc(struct mp4ff *f)
+static int read_stsc(struct mp4 *f)
{
+ int ret;
int32_t i;
- struct mp4ff_track *t;
+ struct mp4_track *t;
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
- read_char(f); /* version */
- read_int24(f); /* flags */
- t->stsc_entry_count = read_int32(f);
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ return ret;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->stsc_entry_count);
+ if (ret <= 0)
+ return ret;
t->stsc_first_chunk = para_malloc(t->stsc_entry_count * sizeof(int32_t));
t->stsc_samples_per_chunk = para_malloc(t->stsc_entry_count
* sizeof (int32_t));
- t->stsc_sample_desc_index = para_malloc(t->stsc_entry_count *
- sizeof (int32_t));
-
- /* CVE-2017-9255 */
- for (i = 0; i < t->stsc_entry_count && !f->stream->read_error; i++) {
- t->stsc_first_chunk[i] = read_int32(f);
- t->stsc_samples_per_chunk[i] = read_int32(f);
- t->stsc_sample_desc_index[i] = read_int32(f);
+ for (i = 0; i < t->stsc_entry_count; i++) {
+ ret = read_int32(f, &t->stsc_first_chunk[i]);
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->stsc_samples_per_chunk[i]);
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, NULL); /* sample desc index */
+ if (ret <= 0)
+ return ret;
}
- return 0;
+ return 1;
}
-static int32_t read_stco(struct mp4ff *f)
+static int read_stco(struct mp4 *f)
{
+ int ret;
int32_t i;
- struct mp4ff_track *t;
+ struct mp4_track *t;
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
- read_char(f); /* version */
- read_int24(f); /* flags */
- t->stco_entry_count = read_int32(f);
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ return ret;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->stco_entry_count);
+ if (ret <= 0)
+ return ret;
t->stco_chunk_offset = para_malloc(t->stco_entry_count
* sizeof(int32_t));
- /* CVE-2017-9256 */
- for (i = 0; i < t->stco_entry_count && !f->stream->read_error; i++)
- t->stco_chunk_offset[i] = read_int32(f);
- return 0;
-}
-
-static uint16_t read_int16(struct mp4ff *f)
-{
- int8_t data[2];
-
- read_data(f, data, 2);
- return read_u16_be(data);
-}
-
-static uint32_t read_mp4_descr_length(struct mp4ff *f)
-{
- uint8_t b;
- uint8_t numBytes = 0;
- uint32_t length = 0;
-
- do {
- b = read_char(f);
- numBytes++;
- length = (length << 7) | (b & 0x7F);
- } while ((b & 0x80) && numBytes < 4);
-
- return length;
-}
-static int32_t read_esds(struct mp4ff *f)
-{
- uint8_t tag;
- uint32_t temp;
- struct mp4ff_track *t;
-
- if (f->total_tracks == 0)
- return f->error++;
- t = f->track[f->total_tracks - 1];
- read_char(f); /* version */
- read_int24(f); /* flags */
- /* get and verify ES_DescrTag */
- tag = read_char(f);
- if (tag == 0x03) {
- /* read length */
- if (read_mp4_descr_length(f) < 5 + 15) {
- return 1;
- }
- /* skip 3 bytes */
- read_int24(f);
- } else {
- /* skip 2 bytes */
- read_int16(f);
- }
-
- /* get and verify DecoderConfigDescrTab */
- if (read_char(f) != 0x04) {
- return 1;
+ for (i = 0; i < t->stco_entry_count; i++) {
+ ret = read_int32(f, &t->stco_chunk_offset[i]);
+ if (ret <= 0)
+ return ret;
}
-
- /* read length */
- temp = read_mp4_descr_length(f);
- if (temp < 13)
- return 1;
-
- t->audioType = read_char(f);
- read_int32(f); //0x15000414 ????
- t->maxBitrate = read_int32(f);
- t->avgBitrate = read_int32(f);
-
- /* get and verify DecSpecificInfoTag */
- if (read_char(f) != 0x05) {
- return 1;
- }
-
- /* read length */
- t->decoderConfigLen = read_mp4_descr_length(f);
- free(t->decoderConfig);
- t->decoderConfig = para_malloc(t->decoderConfigLen);
- read_data(f, t->decoderConfig, t->decoderConfigLen);
- /* will skip the remainder of the atom */
- return 0;
+ return 1;
}
-static int32_t read_mp4a(struct mp4ff *f)
+static int read_mp4a(struct mp4 *f)
{
+ int ret;
int32_t i;
- uint8_t atom_type = 0;
- uint8_t header_size = 0;
- struct mp4ff_track *t;
+ struct mp4_track *t;
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
for (i = 0; i < 6; i++) {
- read_char(f); /* reserved */
+ ret = read_int8(f, NULL); /* reserved */
+ if (ret <= 0)
+ return ret;
}
- /* data_reference_index */ read_int16(f);
-
- read_int32(f); /* reserved */
- read_int32(f); /* reserved */
-
- t->channelCount = read_int16(f);
- t->sampleSize = read_int16(f);
-
- read_int16(f);
- read_int16(f);
+ ret = read_int16(f, NULL); /* data_reference_index */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, NULL); /* reserved */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, NULL); /* reserved */
+ if (ret <= 0)
+ return ret;
+ ret = read_int16(f, &t->channelCount);
+ if (ret <= 0)
+ return ret;
+ ret = read_int16(f, NULL);
+ if (ret <= 0)
+ return ret;
+ ret = read_int16(f, NULL);
+ if (ret <= 0)
+ return ret;
+ ret = read_int16(f, NULL);
+ if (ret <= 0)
+ return ret;
+ return read_int16(f, &t->sampleRate);
+}
+
+static int read_stsd(struct mp4 *f)
+{
+ int ret;
+ uint32_t i, entry_count;
+ struct mp4_track *t;
- t->sampleRate = read_int16(f);
-
- read_int16(f);
-
- atom_read_header(f, &atom_type, &header_size);
- if (atom_type == ATOM_ESDS)
- read_esds(f);
- return 0;
-}
-
-static int32_t read_stsd(struct mp4ff *f)
-{
- int32_t i;
- uint8_t header_size = 0;
- struct mp4ff_track *t;
-
- /* CVE-2017-9218 */
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
-
- read_char(f); /* version */
- read_int24(f); /* flags */
-
- t->stsd_entry_count = read_int32(f);
-
- /* CVE-2017-9253 */
- for (i = 0; i < t->stsd_entry_count && !f->stream->read_error; i++) {
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ return ret;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &entry_count);
+ if (ret <= 0)
+ return ret;
+ for (i = 0; i < entry_count; i++) {
uint64_t skip = get_position(f);
uint64_t size;
uint8_t atom_type = 0;
- size = atom_read_header(f, &atom_type, &header_size);
+ ret = atom_read_header(f, &atom_type, NULL, &size);
+ if (ret <= 0)
+ return ret;
skip += size;
-
- if (atom_type == ATOM_MP4A) {
- t->type = TRACK_AUDIO;
+ if (!f->audio_track && atom_type == ATOM_MP4A) {
+ f->audio_track = t;
read_mp4a(f);
- } else if (atom_type == ATOM_MP4V) {
- t->type = TRACK_VIDEO;
- } else if (atom_type == ATOM_MP4S) {
- t->type = TRACK_SYSTEM;
- } else {
- t->type = TRACK_UNKNOWN;
}
set_position(f, skip);
}
-
- return 0;
-}
-
-static int32_t read_mvhd(struct mp4ff *f)
-{
- int32_t i;
-
- read_char(f); /* version */
- read_int24(f); /* flags */
- read_int32(f); /* creation_time */
- read_int32(f); /* modification_time */
- f->time_scale = read_int32(f);
- f->duration = read_int32(f);
- read_int32(f); /* preferred_rate */
- read_int16(f); /* preferred_volume */
- for (i = 0; i < 10; i++)
- read_char(f); /* reserved */
- for (i = 0; i < 9; i++)
- read_int32(f); /* matrix */
- read_int32(f); /* preview_time */
- read_int32(f); /* preview_duration */
- read_int32(f); /* poster_time */
- read_int32(f); /* selection_time */
- read_int32(f); /* selection_duration */
- read_int32(f); /* current_time */
- read_int32(f); /* next_track_id */
- return 0;
-}
-
-static int32_t tag_add_field(struct mp4ff_metadata *tags, const char *item,
- const char *value, int32_t len)
-{
- if (!item || (item && !*item) || !value)
- return 0;
- tags->tags = para_realloc(tags->tags,
- (tags->count + 1) * sizeof(struct mp4ff_tag));
- tags->tags[tags->count].item = para_strdup(item);
- tags->tags[tags->count].len = len;
- if (len >= 0) {
- tags->tags[tags->count].value = para_malloc(len + 1);
- memcpy(tags->tags[tags->count].value, value, len);
- tags->tags[tags->count].value[len] = 0;
- } else {
- tags->tags[tags->count].value = para_strdup(value);
- }
- tags->count++;
return 1;
}
-static const char *ID3v1GenreList[] = {
- "Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk",
- "Grunge", "Hip-Hop", "Jazz", "Metal", "New Age", "Oldies",
- "Other", "Pop", "R&B", "Rap", "Reggae", "Rock",
- "Techno", "Industrial", "Alternative", "Ska", "Death Metal", "Pranks",
- "Soundtrack", "Euro-Techno", "Ambient", "Trip-Hop", "Vocal",
- "Jazz+Funk", "Fusion", "Trance", "Classical", "Instrumental", "Acid",
- "House", "Game", "Sound Clip", "Gospel", "Noise", "AlternRock", "Bass",
- "Soul", "Punk", "Space", "Meditative", "Instrumental Pop",
- "Instrumental Rock", "Ethnic", "Gothic", "Darkwave",
- "Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance", "Dream",
- "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40",
- "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret",
- "New Wave", "Psychadelic", "Rave", "Showtunes", "Trailer", "Lo-Fi",
- "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical",
- "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk",
- "Swing", "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic",
- "Bluegrass", "Avantgarde", "Gothic Rock", "Progressive Rock",
- "Psychedelic Rock", "Symphonic Rock", "Slow Rock", "Big Band",
- "Chorus", "Easy Listening", "Acoustic", "Humour", "Speech", "Chanson",
- "Opera", "Chamber Music", "Sonata", "Symphony", "Booty Bass", "Primus",
- "Porn Groove", "Satire", "Slow Jam", "Club", "Tango", "Samba",
- "Folklore", "Ballad", "Power Ballad", "Rhythmic Soul", "Freestyle",
- "Duet", "Punk Rock", "Drum Solo", "A capella", "Euro-House",
- "Dance Hall", "Goa", "Drum & Bass", "Club House", "Hardcore", "Terror",
- "Indie", "BritPop", "NegerPunk", "Polsk Punk", "Beat",
- "Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover",
- "Contemporary C", "Christian Rock", "Merengue", "Salsa", "Thrash Metal",
- "Anime", "JPop", "SynthPop",
-};
-
-static const char *meta_index_to_genre(uint32_t idx)
-{
- if (idx > 0 && idx <= sizeof (ID3v1GenreList) / sizeof (ID3v1GenreList[0])) {
- return ID3v1GenreList[idx - 1];
- } else {
- return 0;
- }
-}
-
-static char *read_string(struct mp4ff *f, uint32_t length)
+static const char *get_metadata_name(uint8_t atom_type)
{
- char *str = para_malloc(length + 1);
- if ((uint32_t)read_data(f, str, length) != length) {
- free(str);
- str = NULL;
- } else
- str[length] = 0;
- return str;
-}
-
-static int32_t set_metadata_name(uint8_t atom_type, char **name)
-{
- static char *tag_names[] = {
- "unknown", "title", "artist", "writer", "album",
- "date", "tool", "comment", "genre", "track",
- "disc", "compilation", "genre", "tempo", "cover",
- "album_artist", "contentgroup", "lyrics", "description",
- "network", "show", "episodename",
- "sorttitle", "sortalbum", "sortartist", "sortalbumartist",
- "sortwriter", "sortshow",
- "season", "episode", "podcast"
- };
- uint8_t tag_idx = 0;
-
switch (atom_type) {
- case ATOM_TITLE:
- tag_idx = 1;
- break;
- case ATOM_ARTIST:
- tag_idx = 2;
- break;
- case ATOM_WRITER:
- tag_idx = 3;
- break;
- case ATOM_ALBUM:
- tag_idx = 4;
- break;
- case ATOM_DATE:
- tag_idx = 5;
- break;
- case ATOM_TOOL:
- tag_idx = 6;
- break;
- case ATOM_COMMENT:
- tag_idx = 7;
- break;
- case ATOM_GENRE1:
- tag_idx = 8;
- break;
- case ATOM_TRACK:
- tag_idx = 9;
- break;
- case ATOM_DISC:
- tag_idx = 10;
- break;
- case ATOM_COMPILATION:
- tag_idx = 11;
- break;
- case ATOM_GENRE2:
- tag_idx = 12;
- break;
- case ATOM_TEMPO:
- tag_idx = 13;
- break;
- case ATOM_COVER:
- tag_idx = 14;
- break;
- case ATOM_ALBUM_ARTIST:
- tag_idx = 15;
- break;
- case ATOM_CONTENTGROUP:
- tag_idx = 16;
- break;
- case ATOM_LYRICS:
- tag_idx = 17;
- break;
- case ATOM_DESCRIPTION:
- tag_idx = 18;
- break;
- case ATOM_NETWORK:
- tag_idx = 19;
- break;
- case ATOM_SHOW:
- tag_idx = 20;
- break;
- case ATOM_EPISODENAME:
- tag_idx = 21;
- break;
- case ATOM_SORTTITLE:
- tag_idx = 22;
- break;
- case ATOM_SORTALBUM:
- tag_idx = 23;
- break;
- case ATOM_SORTARTIST:
- tag_idx = 24;
- break;
- case ATOM_SORTALBUMARTIST:
- tag_idx = 25;
- break;
- case ATOM_SORTWRITER:
- tag_idx = 26;
- break;
- case ATOM_SORTSHOW:
- tag_idx = 27;
- break;
- case ATOM_SEASON:
- tag_idx = 28;
- break;
- case ATOM_EPISODE:
- tag_idx = 29;
- break;
- case ATOM_PODCAST:
- tag_idx = 30;
- break;
- default:
- tag_idx = 0;
- break;
- }
-
- *name = para_strdup(tag_names[tag_idx]);
- return 0;
-}
-
-static uint32_t min_body_size(uint8_t atom_type)
-{
- switch(atom_type) {
- case ATOM_GENRE2:
- case ATOM_TEMPO:
- return 10;
- case ATOM_TRACK:
- return sizeof (char) /* version */
- + sizeof(uint8_t) * 3 /* flags */
- + sizeof(uint32_t) /* reserved */
- + sizeof(uint16_t) /* leading uint16_t */
- + sizeof(uint16_t) /* track */
- + sizeof(uint16_t); /* totaltracks */
- case ATOM_DISC:
- return sizeof (char) /* version */
- + sizeof(uint8_t) * 3 /* flags */
- + sizeof(uint32_t) /* reserved */
- + sizeof(uint16_t) /* disc */
- + sizeof(uint16_t); /* totaldiscs */
- default: assert(false);
+ case ATOM_TITLE: return "title";
+ case ATOM_ARTIST: return "artist";
+ case ATOM_ALBUM: return "album";
+ case ATOM_DATE: return "date";
+ case ATOM_COMMENT: return "comment";
+ default: return "unknown";
}
}
-static int32_t parse_tag(struct mp4ff *f, uint8_t parent, int32_t size)
+static int parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
{
- uint8_t atom_type;
- uint8_t header_size = 0;
+ int ret;
uint64_t subsize, sumsize;
- char *name = NULL;
- char *data = NULL;
- uint32_t done = 0;
+ char *value = NULL;
uint32_t len = 0;
uint64_t destpos;
+ struct mp4_tag *tag;
for (
sumsize = 0;
- sumsize < size && !f->stream->read_error; /* CVE-2017-9222 */
+ sumsize < size;
set_position(f, destpos), sumsize += subsize
) {
- subsize = atom_read_header(f, &atom_type, &header_size);
+ uint8_t atom_type;
+ uint8_t header_size = 0;
+ ret = atom_read_header(f, &atom_type, &header_size, &subsize);
+ if (ret <= 0)
+ goto fail;
destpos = get_position(f) + subsize - header_size;
- if (done)
- continue;
- if (atom_type == ATOM_NAME) {
- read_char(f); /* version */
- read_int24(f); /* flags */
- free(name);
- name = read_string(f, subsize - (header_size + 4));
- continue;
- }
if (atom_type != ATOM_DATA)
continue;
- read_char(f); /* version */
- read_int24(f); /* flags */
- read_int32(f); /* reserved */
-
- /* some need special attention */
- if (parent == ATOM_GENRE2 || parent == ATOM_TEMPO) {
- uint16_t val;
- if (subsize - header_size < min_body_size(parent))
- continue;
- val = read_int16(f);
- if (parent == ATOM_TEMPO) {
- char temp[16];
- sprintf(temp, "%.5u BPM", val);
- tag_add_field(&(f-> tags), "tempo",
- temp, -1);
- } else {
- const char *tmp = meta_index_to_genre(val);
- if (tmp)
- tag_add_field (&(f->tags),
- "genre", tmp, -1);
- }
- done = 1;
- } else if (parent == ATOM_TRACK || parent == ATOM_DISC) {
- uint16_t index, total;
- char temp[32];
- if (subsize - header_size < min_body_size(parent))
- continue;
- read_int16(f);
- index = read_int16(f);
- total = read_int16(f);
- if (parent == ATOM_TRACK)
- read_int16(f);
- sprintf(temp, "%d", index);
- tag_add_field(&(f->tags), parent == ATOM_TRACK?
- "track" : "disc", temp, -1);
- if (total > 0) {
- sprintf(temp, "%d", total);
- tag_add_field(& (f-> tags),
- parent == ATOM_TRACK?
- "totaltracks" : "totaldiscs", temp, -1);
- }
- done = 1;
- } else {
- free(data);
- data = read_string(f, subsize - (header_size + 8));
- len = subsize - (header_size + 8);
- }
- }
- if (data) {
- if (!done) {
- if (name == NULL)
- set_metadata_name(parent , &name);
- if (name)
- tag_add_field(&(f->tags), name, data, len);
- }
-
- free(data);
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ goto fail;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ goto fail;
+ ret = read_int32(f, NULL); /* reserved */
+ if (ret <= 0)
+ goto fail;
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ if (subsize < header_size + 8 || subsize > UINT_MAX)
+ goto fail;
+ len = subsize - (header_size + 8);
+ free(value);
+ value = para_malloc(len + 1);
+ ret = read_data(f, value, len);
+ if (ret <= 0)
+ goto fail;
+ value[len] = '\0';
}
- free(name);
+ if (!value)
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+ f->meta.tags = para_realloc(f->meta.tags, (f->meta.count + 1)
+ * sizeof(struct mp4_tag));
+ tag = f->meta.tags + f->meta.count;
+ tag->item = para_strdup(get_metadata_name(parent));
+ tag->value = value;
+ tag->len = len;
+ f->meta.count++;
return 1;
+fail:
+ free(value);
+ return ret;
}
-static int32_t read_mdhd(struct mp4ff *f)
+static int read_mdhd(struct mp4 *f)
{
+ int ret;
uint32_t version;
- struct mp4ff_track *t;
+ struct mp4_track *t;
- /* CVE-2017-9221 */
if (f->total_tracks == 0)
- return f->error++;
+ return -1;
t = f->track[f->total_tracks - 1];
- version = read_int32(f);
+ ret = read_int32(f, &version);
+ if (ret <= 0)
+ return ret;
if (version == 1) {
- read_int64(f); //creation-time
- read_int64(f); //modification-time
- t->timeScale = read_int32(f); //timescale
- t->duration = read_int64(f); //duration
+ ret = read_int64(f, NULL); /* creation-time */
+ if (ret <= 0)
+ return ret;
+ ret = read_int64(f, NULL); /* modification-time */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->timeScale);
+ if (ret <= 0)
+ return ret;
+ ret = read_int64(f, &t->duration);
+ if (ret <= 0)
+ return ret;
} else { //version == 0
uint32_t temp;
- read_int32(f); //creation-time
- read_int32(f); //modification-time
- t->timeScale = read_int32(f); //timescale
- temp = read_int32(f);
+ ret = read_int32(f, NULL); /* creation-time */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, NULL); /* modification-time */
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &t->timeScale);
+ if (ret <= 0)
+ return ret;
+ ret = read_int32(f, &temp);
+ if (ret <= 0)
+ return ret;
t->duration = (temp == (uint32_t) (-1))?
(uint64_t) (-1) : (uint64_t) (temp);
}
- read_int16(f);
- read_int16(f);
+ ret = read_int16(f, NULL);
+ if (ret <= 0)
+ return ret;
+ ret = read_int16(f, NULL);
+ if (ret <= 0)
+ return ret;
return 1;
}
-static int32_t parse_metadata(struct mp4ff *f, int32_t size)
+static int32_t read_ilst(struct mp4 *f, int32_t size)
{
- uint64_t subsize, sumsize = 0;
- uint8_t atom_type;
- uint8_t header_size = 0;
+ int ret;
+ uint64_t sumsize = 0;
while (sumsize < size) {
- subsize = atom_read_header(f, &atom_type, &header_size);
- if (subsize == 0)
- break;
- parse_tag(f, atom_type, (uint32_t)(subsize - header_size));
+ uint8_t atom_type;
+ uint64_t subsize, destpos;
+ uint8_t header_size = 0;
+ ret = atom_read_header(f, &atom_type, &header_size, &subsize);
+ if (ret <= 0)
+ return ret;
+ destpos = get_position(f) + subsize - header_size;
+ switch (atom_type) {
+ case ATOM_ARTIST:
+ case ATOM_TITLE:
+ case ATOM_ALBUM:
+ case ATOM_COMMENT:
+ case ATOM_DATE:
+ ret = parse_tag(f, atom_type, subsize - header_size);
+ if (ret <= 0)
+ return ret;
+ }
+ set_position(f, destpos);
sumsize += subsize;
}
-
- return 0;
+ return 1;
}
-static int32_t read_meta(struct mp4ff *f, uint64_t size)
+static int32_t read_meta(struct mp4 *f, uint64_t size)
{
+ int ret;
uint64_t subsize, sumsize = 0;
uint8_t atom_type;
uint8_t header_size = 0;
- read_char(f); /* version */
- read_int24(f); /* flags */
-
+ ret = read_int8(f, NULL); /* version */
+ if (ret <= 0)
+ return ret;
+ ret = read_int24(f, NULL); /* flags */
+ if (ret <= 0)
+ return ret;
while (sumsize < (size - (header_size + 4))) {
- subsize = atom_read_header(f, &atom_type, &header_size);
+ ret = atom_read_header(f, &atom_type, &header_size, &subsize);
+ if (ret <= 0)
+ return ret;
if (subsize <= header_size + 4)
return 1;
if (atom_type == ATOM_ILST) {
- parse_metadata(f, (uint32_t) (subsize - (header_size + 4)));
- } else {
+ ret = read_ilst(f, subsize - (header_size + 4));
+ if (ret <= 0)
+ return ret;
+ } else
set_position(f, get_position(f) + subsize - header_size);
- }
sumsize += subsize;
}
-
- return 0;
+ return 1;
}
-static int32_t atom_read(struct mp4ff *f, int32_t size, uint8_t atom_type)
+static int parse_leaf_atom(struct mp4 *f, uint64_t size, uint8_t atom_type)
{
uint64_t dest_position = get_position(f) + size - 8;
- if (atom_type == ATOM_STSZ) {
- /* sample size box */
- read_stsz(f);
- } else if (atom_type == ATOM_STTS) {
- /* time to sample box */
- read_stts(f);
- } else if (atom_type == ATOM_CTTS) {
- /* composition offset box */
- read_ctts(f);
- } else if (atom_type == ATOM_STSC) {
- /* sample to chunk box */
- read_stsc(f);
- } else if (atom_type == ATOM_STCO) {
- /* chunk offset box */
- read_stco(f);
- } else if (atom_type == ATOM_STSD) {
- /* sample description box */
- read_stsd(f);
- } else if (atom_type == ATOM_MVHD) {
- /* movie header box */
- read_mvhd(f);
- } else if (atom_type == ATOM_MDHD) {
- /* track header */
- read_mdhd(f);
- } else if (atom_type == ATOM_META) {
- /* iTunes Metadata box */
- read_meta(f, size);
- }
+ int ret = 1; /* return success for atoms we don't care about */
+ switch (atom_type) {
+ case ATOM_STSZ: ret = read_stsz(f); break;
+ case ATOM_STTS: ret = read_stts(f); break;
+ case ATOM_STSC: ret = read_stsc(f); break;
+ case ATOM_STCO: ret = read_stco(f); break;
+ case ATOM_STSD: ret = read_stsd(f); break;
+ case ATOM_MDHD: ret = read_mdhd(f); break;
+ case ATOM_META: ret = read_meta(f, size); break;
+ }
set_position(f, dest_position);
- return 0;
+ return ret;
+}
+
+static bool need_atom(uint8_t atom_type, bool meta_only)
+{
+ /* these are needed in any case */
+ switch (atom_type) {
+ case ATOM_STSD:
+ case ATOM_META:
+ case ATOM_TRAK:
+ case ATOM_MDIA:
+ case ATOM_MINF:
+ case ATOM_STBL:
+ return true;
+ }
+ /* meta-only opens don't need anything else */
+ if (meta_only)
+ return false;
+ /* these are only required for regular opens */
+ switch (atom_type) {
+ case ATOM_STTS:
+ case ATOM_STSZ:
+ case ATOM_STCO:
+ case ATOM_STSC:
+ case ATOM_MDHD:
+ case ATOM_UDTA:
+ return true;
+ }
+ return false;
}
/* parse atoms that are sub atoms of other atoms */
-static int32_t parse_sub_atoms(struct mp4ff *f, uint64_t total_size, int meta_only)
+static int parse_sub_atoms(struct mp4 *f, uint64_t total_size, bool meta_only)
{
+ int ret;
uint64_t size;
uint8_t atom_type = 0;
uint64_t counted_size = 0;
uint8_t header_size = 0;
while (counted_size < total_size) {
- size = atom_read_header(f, &atom_type, &header_size);
- counted_size += size;
-
- /* check for end of file */
+ ret = atom_read_header(f, &atom_type, &header_size, &size);
+ if (ret <= 0)
+ return ret;
if (size == 0)
- break;
-
- /* we're starting to read a new track, update index,
- * so that all data and tables get written in the right place
- */
- if (atom_type == ATOM_TRAK)
- track_add(f);
- /* parse subatoms */
- if (meta_only && !need_parse_when_meta_only(atom_type)) {
+ return -1;
+ counted_size += size;
+ if (atom_type == ATOM_TRAK) {
+ if (f->total_tracks >= MAX_TRACKS)
+ return -1;
+ f->total_tracks++;
+ f->track[f->total_tracks - 1] = para_calloc(
+ sizeof(struct mp4_track));
+ }
+ if (!need_atom(atom_type, meta_only)) {
set_position(f, get_position(f) + size - header_size);
- } else if (atom_type < SUBATOMIC) {
- parse_sub_atoms(f, size - header_size, meta_only);
- } else {
- atom_read(f, (uint32_t) size, atom_type);
+ continue;
}
+ if (atom_type < SUBATOMIC) /* atom contains subatoms */
+ ret = parse_sub_atoms(f, size - header_size, meta_only);
+ else
+ ret = parse_leaf_atom(f, size, atom_type);
+ if (ret <= 0)
+ return ret;
}
-
- return 0;
+ return 1;
}
-/* parse root atoms */
-static int32_t parse_atoms(struct mp4ff *f, int meta_only)
+static int parse_root_atoms(struct mp4 *f, bool meta_only)
{
+ int ret;
uint64_t size;
uint8_t atom_type = 0;
uint8_t header_size = 0;
f->file_size = 0;
- f->stream->read_error = 0;
- while ((size =
- atom_read_header(f, &atom_type, &header_size)) != 0) {
+ while ((ret = atom_read_header(f, &atom_type, &header_size, &size)) > 0) {
f->file_size += size;
f->last_atom = atom_type;
-
- if (atom_type == ATOM_MOOV && size > header_size) {
- f->moov_offset = get_position(f) - header_size;
- f->moov_size = size;
- }
-
- /* parse subatoms */
- if (meta_only && !need_parse_when_meta_only(atom_type)) {
- set_position(f, get_position(f) + size - header_size);
- } else if (atom_type < SUBATOMIC) {
- parse_sub_atoms(f, size - header_size, meta_only);
- } else {
- /* skip this atom */
+ if (atom_type != ATOM_MOOV || size <= header_size) { /* skip */
set_position(f, get_position(f) + size - header_size);
+ continue;
}
+ f->moov_offset = get_position(f) - header_size;
+ f->moov_size = size;
+ ret = parse_sub_atoms(f, size - header_size, meta_only);
+ if (ret <= 0)
+ break;
}
-
- return 0;
-}
-
-void mp4ff_get_decoder_config(const struct mp4ff *f, int track,
- unsigned char **ppBuf, unsigned int *pBufSize)
-{
- if (track >= f->total_tracks) {
- *ppBuf = NULL;
- *pBufSize = 0;
- return;
- }
-
- if (f->track[track]->decoderConfig == NULL
- || f->track[track]->decoderConfigLen == 0) {
- *ppBuf = NULL;
- *pBufSize = 0;
- } else {
- *ppBuf = para_malloc(f->track[track]->decoderConfigLen);
- memcpy(*ppBuf, f->track[track]->decoderConfig,
- f->track[track]->decoderConfigLen);
- *pBufSize = f->track[track]->decoderConfigLen;
- }
-}
-
-struct mp4ff *mp4ff_open_read(struct mp4ff_callback *f)
-{
- struct mp4ff *ff = para_calloc(sizeof(struct mp4ff));
-
- ff->stream = f;
-
- parse_atoms(ff, 0);
-
- if (ff->error) {
- free(ff);
- ff = NULL;
- }
-
- return ff;
+ if (ret < 0)
+ return ret;
+ if (!f->audio_track)
+ return -E_MP4_TRACK;
+ return ret;
}
-static int32_t tag_delete(struct mp4ff_metadata *tags)
+struct mp4 *mp4_open_read(const struct mp4_callback *cb)
{
- uint32_t i;
+ int ret;
+ struct mp4 *f = para_calloc(sizeof(struct mp4));
- for (i = 0; i < tags->count; i++) {
- free(tags->tags[i].item);
- free(tags->tags[i].value);
+ f->cb = cb;
+ ret = parse_root_atoms(f, false);
+ if (ret < 0) {
+ free(f);
+ return NULL;
}
- free(tags->tags);
- tags->tags = NULL;
- tags->count = 0;
-
- return 0;
+ return f;
}
-void mp4ff_close(struct mp4ff *ff)
+void mp4_close(struct mp4 *f)
{
int32_t i;
- for (i = 0; i < ff->total_tracks; i++) {
- if (ff->track[i]) {
- free(ff->track[i]->stsz_table);
- free(ff->track[i]->stts_sample_count);
- free(ff->track[i]->stts_sample_delta);
- free(ff->track[i]->stsc_first_chunk);
- free(ff->track[i]->stsc_samples_per_chunk);
- free(ff->track[i]->stsc_sample_desc_index);
- free(ff->track[i]->stco_chunk_offset);
- free(ff->track[i]->decoderConfig);
- free(ff->track[i]->ctts_sample_count);
- free(ff->track[i]->ctts_sample_offset);
- free(ff->track[i]);
+ for (i = 0; i < f->total_tracks; i++) {
+ if (f->track[i]) {
+ free(f->track[i]->stsz_table);
+ free(f->track[i]->stts_sample_count);
+ free(f->track[i]->stsc_first_chunk);
+ free(f->track[i]->stsc_samples_per_chunk);
+ free(f->track[i]->stco_chunk_offset);
+ free(f->track[i]);
}
}
-
- tag_delete(&(ff->tags));
- free(ff);
+ for (i = 0; i < f->meta.count; i++) {
+ free(f->meta.tags[i].item);
+ free(f->meta.tags[i].value);
+ }
+ free(f->meta.tags);
+ free(f);
}
-static int32_t chunk_of_sample(const struct mp4ff *f, int32_t track,
- int32_t sample, int32_t *chunk_sample, int32_t *chunk)
+static int32_t chunk_of_sample(const struct mp4 *f, int32_t sample,
+ int32_t *chunk)
{
- int32_t total_entries = 0;
- int32_t chunk2entry;
- int32_t chunk1, chunk2, chunk1samples, range_samples, total = 0;
-
- *chunk_sample = 0;
- *chunk = 1;
- if (f->track[track] == NULL) {
- return -1;
- }
-
- total_entries = f->track[track]->stsc_entry_count;
+ const struct mp4_track *t = f->audio_track;
+ uint32_t *fc = t->stsc_first_chunk, *spc = t->stsc_samples_per_chunk;
+ int32_t chunk1, chunk1samples, n, total, i;
- chunk1 = 1;
- chunk1samples = 0;
- chunk2entry = 0;
-
- do {
- chunk2 = f->track[track]->stsc_first_chunk[chunk2entry];
- *chunk = chunk2 - chunk1;
- range_samples = *chunk * chunk1samples;
-
- if (sample < total + range_samples)
+ for (i = 1, total = 0; i < t->stsc_entry_count; i++, total += n) {
+ n = (fc[i] - fc[i - 1]) * spc[i - 1]; /* number of samples */
+ if (sample < total + n)
break;
-
- chunk1samples = f->track[track]->stsc_samples_per_chunk[chunk2entry];
- chunk1 = chunk2;
-
- if (chunk2entry < total_entries) {
- chunk2entry++;
- total += range_samples;
- }
- } while (chunk2entry < total_entries);
-
- if (chunk1samples)
+ }
+ chunk1 = fc[i - 1];
+ chunk1samples = spc[i - 1];
+ if (chunk1samples != 0)
*chunk = (sample - total) / chunk1samples + chunk1;
else
*chunk = 1;
-
- *chunk_sample = total + (*chunk - chunk1) * chunk1samples;
-
- return 0;
-}
-
-static int32_t chunk_to_offset(const struct mp4ff *f, int32_t track,
- int32_t chunk)
-{
- const struct mp4ff_track *p_track = f->track[track];
-
- if (p_track->stco_entry_count && (chunk > p_track->stco_entry_count)) {
- return p_track->stco_chunk_offset[p_track->stco_entry_count -
- 1];
- } else if (p_track->stco_entry_count) {
- return p_track->stco_chunk_offset[chunk - 1];
- } else {
- return 8;
- }
-
- return 0;
-}
-
-static int32_t sample_range_size(const struct mp4ff *f, int32_t track,
- int32_t chunk_sample, int32_t sample)
-{
- int32_t i, total;
- const struct mp4ff_track *p_track = f->track[track];
-
- if (p_track->stsz_sample_size) {
- return (sample - chunk_sample) * p_track->stsz_sample_size;
- } else {
- if (sample >= p_track->stsz_sample_count)
- return 0; //error
-
- for (i = chunk_sample, total = 0; i < sample; i++) {
- total += p_track->stsz_table[i];
- }
- }
-
- return total;
-}
-
-static int32_t sample_to_offset(const struct mp4ff *f, int32_t track,
- int32_t sample)
-{
- int32_t chunk, chunk_sample, chunk_offset1, chunk_offset2;
-
- chunk_of_sample(f, track, sample, &chunk_sample, &chunk);
-
- chunk_offset1 = chunk_to_offset(f, track, chunk);
- chunk_offset2 = chunk_offset1 + sample_range_size(f,
- track, chunk_sample, sample);
- return chunk_offset2;
+ return total + (*chunk - chunk1) * chunk1samples;
}
/**
- * Return the number of milliseconds of the given track.
+ * Return the number of milliseconds of the audio track.
*
- * \param f As returned by \ref mp4ff_open_read(), must not be NULL.
- * \param track Between zero and the value returned by \ref mp4ff_total_tracks().
- *
- * The function returns zero if the audio file is of zero length or contains a
- * corrupt track header.
+ * \param f As returned by \ref mp4_open_read(), must not be NULL.
*/
-uint64_t mp4ff_get_duration(const struct mp4ff *f, int32_t track)
+uint64_t mp4_get_duration(const struct mp4 *f)
{
- const struct mp4ff_track *t = f->track[track];
+ const struct mp4_track *t = f->audio_track;
if (t->timeScale == 0)
return 0;
return t->duration * 1000 / t->timeScale;
}
-void mp4ff_set_sample_position(struct mp4ff *f, int32_t track, int32_t sample)
+int mp4_set_sample_position(struct mp4 *f, int32_t sample)
{
- int32_t offset = sample_to_offset(f, track, sample);
- set_position(f, offset);
+ const struct mp4_track *t = f->audio_track;
+ int32_t offset, chunk, chunk_sample;
+ uint32_t n, srs; /* sample range size */
+
+ if (sample >= t->stsz_sample_count)
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+ chunk_sample = chunk_of_sample(f, sample, &chunk);
+ if (t->stsz_sample_size > 0)
+ srs = (sample - chunk_sample) * t->stsz_sample_size;
+ else {
+ for (srs = 0, n = chunk_sample; n < sample; n++)
+ srs += t->stsz_table[n];
+ }
+ if (t->stco_entry_count > 0 && chunk > t->stco_entry_count)
+ offset = t->stco_chunk_offset[t->stco_entry_count - 1];
+ else if (t->stco_entry_count > 0)
+ offset = t->stco_chunk_offset[chunk - 1];
+ else
+ offset = 8;
+ set_position(f, offset + srs);
+ return 1;
}
-int32_t mp4ff_get_sample_size(const struct mp4ff *f, int track, int sample)
+int32_t mp4_get_sample_size(const struct mp4 *f, int sample)
{
- const struct mp4ff_track *t = f->track[track];
+ const struct mp4_track *t = f->audio_track;
if (t->stsz_sample_size != 0)
return t->stsz_sample_size;
return t->stsz_table[sample];
}
-uint32_t mp4ff_get_sample_rate(const struct mp4ff *f, int32_t track)
+uint32_t mp4_get_sample_rate(const struct mp4 *f)
{
- return f->track[track]->sampleRate;
+ return f->audio_track->sampleRate;
}
-uint32_t mp4ff_get_channel_count(const struct mp4ff *f, int32_t track)
+uint32_t mp4_get_channel_count(const struct mp4 *f)
{
- return f->track[track]->channelCount;
+ return f->audio_track->channelCount ;
}
-int32_t mp4ff_num_samples(const struct mp4ff *f, int32_t track)
+int32_t mp4_num_samples(const struct mp4 *f)
{
+ const struct mp4_track *t = f->audio_track;
int32_t i;
int32_t total = 0;
- for (i = 0; i < f->track[track]->stts_entry_count; i++) {
- total += f->track[track]->stts_sample_count[i];
- }
+ for (i = 0; i < t->stts_entry_count; i++)
+ total += t->stts_sample_count[i];
return total;
}
-struct mp4ff *mp4ff_open_read_metaonly(struct mp4ff_callback *f)
+struct mp4 *mp4_open_meta(const struct mp4_callback *cb)
{
- struct mp4ff *ff = para_calloc(sizeof(struct mp4ff));
-
- ff->stream = f;
-
- parse_atoms(ff, 1);
+ int ret;
+ struct mp4 *f = para_calloc(sizeof(struct mp4));
- if (ff->error) {
- free(ff);
- ff = NULL;
+ f->cb = cb;
+ ret = parse_root_atoms(f, true);
+ if (ret < 0) {
+ free(f);
+ return NULL;
}
-
- return ff;
+ return f;
}
-int32_t mp4ff_meta_get_num_items(const struct mp4ff *f)
-{
- return f->tags.count;
-}
-
-int32_t mp4ff_meta_get_by_index(const struct mp4ff *f, uint32_t index,
- char **item, char **value)
+/**
+ * Return the metadata of an mp4 file.
+ *
+ * \param f As returned by either \ref mp4_open_read() or \ref mp4_open_meta().
+ *
+ * The caller is allowed to add, delete or modify the entries of the returned
+ * structure in order to pass the modified version to \ref mp4_meta_update().
+ */
+struct mp4_metadata *mp4_get_meta(struct mp4 *f)
{
- if (index >= f->tags.count) {
- *item = NULL;
- *value = NULL;
- return 0;
- } else {
- *item = para_strdup(f->tags.tags[index].item);
- *value = para_strdup(f->tags.tags[index].value);
- return 1;
- }
+ return &f->meta;
}
-static uint32_t find_atom(struct mp4ff *f, uint64_t base, uint32_t size,
- const char *name)
+static int find_atom(struct mp4 *f, uint64_t base, uint32_t size,
+ const char *name)
{
uint32_t remaining = size;
uint64_t atom_offset = base;
+
for (;;) {
+ int ret;
char atom_name[4];
uint32_t atom_size;
set_position(f, atom_offset);
if (remaining < 8)
- break;
- atom_size = read_int32(f);
+ return -1;
+ ret = read_int32(f, &atom_size);
+ if (ret <= 0)
+ return ret;
if (atom_size > remaining || atom_size < 8)
- break;
- read_data(f, atom_name, 4);
-
+ return -1;
+ ret = read_data(f, atom_name, 4);
+ if (ret <= 0)
+ return ret;
if (!memcmp(atom_name, name, 4)) {
set_position(f, atom_offset);
return 1;
}
-
remaining -= atom_size;
atom_offset += atom_size;
}
- return 0;
}
-static uint32_t find_atom_v2(struct mp4ff *f, uint64_t base, uint32_t size,
+/*
+ * Try to find atom <name> with atom <name_inside> in it. Besides -1/0/1 for
+ * error, EOF and success, this function may return 2 to indicate that the
+ * desired atoms were not found.
+ */
+static int find_atom_v2(struct mp4 *f, uint64_t base, uint32_t size,
const char *name, uint32_t extraheaders, const char *name_inside)
{
uint64_t first_base = (uint64_t) (-1);
- while (find_atom(f, base, size, name)) //try to find atom <name> with atom <name_inside> in it
- {
- uint64_t mybase = get_position(f);
- uint32_t mysize = read_int32(f);
+ for (;;) {
+ uint64_t mybase;
+ uint32_t mysize;
+ int ret = find_atom(f, base, size, name);
+
+ if (ret <= 0)
+ return ret;
+ mybase = get_position(f);
+ ret = read_int32(f, &mysize);
+ if (ret <= 0)
+ return ret;
if (first_base == (uint64_t) (-1))
first_base = mybase;
if (find_atom (f, mybase + (8 + extraheaders),
mysize - (8 + extraheaders), name_inside)) {
set_position(f, mybase);
- return 2;
+ return 1;
}
base += mysize;
- if (size <= mysize) {
- size = 0;
+ if (size <= mysize)
break;
- }
size -= mysize;
}
-
- if (first_base != (uint64_t) (-1)) //wanted atom inside not found
- {
+ if (first_base != (uint64_t)(-1)) {
set_position(f, first_base);
return 1;
- } else
- return 0;
+ }
+ /* wanted atom inside not found */
+ return 2;
}
struct membuffer {
void *data;
unsigned written;
unsigned allocated;
- unsigned error;
};
static struct membuffer *membuffer_create(void)
{
- const unsigned initial_size = 256;
-
- struct membuffer *buf = para_malloc(sizeof(*buf));
- buf->data = para_malloc(initial_size);
- buf->written = 0;
- buf->allocated = initial_size;
- buf->error = buf->data == 0 ? 1 : 0;
+ struct membuffer *buf = para_calloc(sizeof(*buf));
+ buf->allocated = 256;
+ buf->data = para_malloc(buf->allocated);
return buf;
}
-static unsigned membuffer_write(struct membuffer *buf, const void *ptr, unsigned bytes)
+static void membuffer_write(struct membuffer *buf, const void *ptr,
+ unsigned bytes)
{
unsigned dest_size = buf->written + bytes;
- if (buf->error)
- return 0;
if (dest_size > buf->allocated) {
do {
buf->allocated <<= 1;
if (ptr)
memcpy((char *) buf->data + buf->written, ptr, bytes);
buf->written += bytes;
- return bytes;
}
-static unsigned membuffer_write_atom_name(struct membuffer *buf, const char *data)
+static void membuffer_write_atom_name(struct membuffer *buf, const char *data)
{
- return membuffer_write(buf, data, 4) == 4 ? 1 : 0;
+ membuffer_write(buf, data, 4);
}
-static unsigned membuffer_write_int16(struct membuffer *buf, uint16_t data)
-{
- uint8_t temp[2];
-
- write_u16_be(temp, data);
- return membuffer_write(buf, temp, 2);
-}
-
-static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
+static void membuffer_write_int32(struct membuffer *buf, uint32_t data)
{
uint8_t temp[4];
write_u32_be(temp, data);
- return membuffer_write(buf, temp, 4);
-}
-
-static void membuffer_write_track_tag(struct membuffer *buf, const char *name,
- uint32_t index, uint32_t total)
-{
- membuffer_write_int32(buf,
- 8 /*atom header */ + 8 /*data atom header */ +
- 8 /*flags + reserved */ + 8 /*actual data */ );
- membuffer_write_atom_name(buf, name);
- membuffer_write_int32(buf,
- 8 /*data atom header */ +
- 8 /*flags + reserved */ + 8 /*actual data */ );
- membuffer_write_atom_name(buf, "data");
- membuffer_write_int32(buf, 0); //flags
- membuffer_write_int32(buf, 0); //reserved
- membuffer_write_int16(buf, 0);
- membuffer_write_int16(buf, (uint16_t) index); //track number
- membuffer_write_int16(buf, (uint16_t) total); //total tracks
- membuffer_write_int16(buf, 0);
-}
-
-static void membuffer_write_int16_tag(struct membuffer *buf, const char *name,
- uint16_t value)
-{
- membuffer_write_int32(buf,
- 8 /*atom header */ + 8 /*data atom header */ +
- 8 /*flags + reserved */ + 2 /*actual data */ );
- membuffer_write_atom_name(buf, name);
- membuffer_write_int32(buf,
- 8 /*data atom header */ +
- 8 /*flags + reserved */ + 2 /*actual data */ );
- membuffer_write_atom_name(buf, "data");
- membuffer_write_int32(buf, 0); //flags
- membuffer_write_int32(buf, 0); //reserved
- membuffer_write_int16(buf, value); //value
-}
-
-static uint32_t myatoi(const char *param)
-{
- return param ? atoi(param) : 0;
-}
-
-static uint32_t meta_genre_to_index(const char *genrestr)
-{
- unsigned n;
- for (n = 0; n < sizeof (ID3v1GenreList) / sizeof (ID3v1GenreList[0]); n++) {
- if (!strcasecmp(genrestr, ID3v1GenreList[n]))
- return n + 1;
- }
- return 0;
-}
-
-struct stdmeta_entry {
- const char *atom;
- const char *name;
-};
-
-struct stdmeta_entry stdmetas[] = {
- {"\xA9" "nam", "title"},
- {"\xA9" "ART", "artist"},
- {"\xA9" "wrt", "writer"},
- {"\xA9" "alb", "album"},
- {"\xA9" "day", "date"},
- {"\xA9" "too", "tool"},
- {"\xA9" "cmt", "comment"},
- {"cpil", "compilation"},
- {"covr", "cover"},
- {"aART", "album_artist"},
-};
-
-static const char *find_standard_meta(const char *name) //returns atom name if found, 0 if not
-{
- unsigned n;
- for (n = 0; n < sizeof (stdmetas) / sizeof (stdmetas[0]); n++) {
- if (!strcasecmp(name, stdmetas[n].name))
- return stdmetas[n].atom;
- }
- return 0;
+ membuffer_write(buf, temp, 4);
}
static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
const char *value)
{
- uint32_t flags = 1;
-
- /* special check for compilation flag */
- if (strcmp(name, "cpil") == 0) {
- flags = 21;
- }
-
- membuffer_write_int32(buf,
- 8 /*atom header */ + 8 /*data atom header */ +
- 8 /*flags + reserved */ + strlen(value));
+ uint32_t len = strlen(value);
+ membuffer_write_int32(buf, 8 /* atom header */
+ + 8 /* data atom header */
+ + 8 /* flags + reserved */
+ + len);
membuffer_write_atom_name(buf, name);
- membuffer_write_int32(buf,
- 8 /*data atom header */ +
- 8 /*flags + reserved */ + strlen(value));
- membuffer_write_atom_name(buf, "data");
- membuffer_write_int32(buf, flags); //flags
- membuffer_write_int32(buf, 0); //reserved
- membuffer_write(buf, value, strlen(value));
-}
-
-static void membuffer_write_custom_tag(struct membuffer *buf, const char *name,
- const char *value)
-{
- membuffer_write_int32(buf,
- 8 /*atom header */ +
- 0x1C /*weirdo itunes atom */ +
- 12 /*name atom header */ + strlen(name) +
- 16 /*data atom header + flags */ + strlen(value));
- membuffer_write_atom_name(buf, "----");
- membuffer_write_int32(buf, 0x1C); //weirdo itunes atom
- membuffer_write_atom_name(buf, "mean");
- membuffer_write_int32(buf, 0);
- membuffer_write(buf, "com.apple.iTunes", 16);
- membuffer_write_int32(buf, 12 + strlen(name));
- membuffer_write_atom_name(buf, "name");
- membuffer_write_int32(buf, 0);
- membuffer_write(buf, name, strlen(name));
- membuffer_write_int32(buf,
- 8 /*data atom header */ +
- 8 /*flags + reserved */ + strlen(value));
+ membuffer_write_int32(buf, 8 /* data atom header */
+ + 8 /* flags + reserved */
+ + len);
membuffer_write_atom_name(buf, "data");
- membuffer_write_int32(buf, 1); //flags
- membuffer_write_int32(buf, 0); //reserved
- membuffer_write(buf, value, strlen(value));
-}
-
-static unsigned membuffer_error(const struct membuffer *buf)
-{
- return buf->error;
-}
-
-static void membuffer_free(struct membuffer *buf)
-{
- free(buf->data);
- free(buf);
+ membuffer_write_int32(buf, 1); /* flags */
+ membuffer_write_int32(buf, 0); /* reserved */
+ membuffer_write(buf, value, len);
}
static unsigned membuffer_get_size(const struct membuffer *buf)
static void *membuffer_detach(struct membuffer *buf)
{
- void *ret;
-
- if (buf->error)
- return 0;
- ret = para_realloc(buf->data, buf->written);
- buf->data = 0;
- buf->error = 1;
+ void *ret = para_realloc(buf->data, buf->written);
+ free(buf);
return ret;
}
-static uint32_t create_ilst(const struct mp4ff_metadata *data, void **out_buffer,
- uint32_t * out_size)
+static void *create_ilst(const struct mp4_metadata *meta, uint32_t *out_size)
{
struct membuffer *buf = membuffer_create();
- unsigned metaptr;
- char *mask = para_calloc(data->count);
- const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
- const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
- const char *genre_ptr = 0, *tempo_ptr = 0;
-
- for (metaptr = 0; metaptr < data->count; metaptr++) {
- struct mp4ff_tag *tag = &data->tags[metaptr];
- if (!strcasecmp(tag->item, "tracknumber")
- || !strcasecmp(tag->item, "track")) {
- if (tracknumber_ptr == 0)
- tracknumber_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "totaltracks")) {
- if (totaltracks_ptr == 0)
- totaltracks_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "discnumber")
- || !strcasecmp(tag->item, "disc")) {
- if (discnumber_ptr == 0)
- discnumber_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "totaldiscs")) {
- if (totaldiscs_ptr == 0)
- totaldiscs_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "genre")) {
- if (genre_ptr == 0)
- genre_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "tempo")) {
- if (tempo_ptr == 0)
- tempo_ptr = tag->value;
- mask[metaptr] = 1;
- }
- }
-
- if (tracknumber_ptr)
- membuffer_write_track_tag(buf, "trkn", myatoi(tracknumber_ptr),
- myatoi(totaltracks_ptr));
- if (discnumber_ptr)
- membuffer_write_track_tag(buf, "disk", myatoi(discnumber_ptr),
- myatoi(totaldiscs_ptr));
- if (tempo_ptr)
- membuffer_write_int16_tag(buf, "tmpo", myatoi(tempo_ptr));
-
- if (genre_ptr) {
- uint32_t index = meta_genre_to_index(genre_ptr);
- if (index == 0)
- membuffer_write_std_tag(buf, "©gen", genre_ptr);
- else
- membuffer_write_int16_tag(buf, "gnre", index);
- }
- for (metaptr = 0; metaptr < data->count; metaptr++) {
- struct mp4ff_tag *tag;
- const char *std_meta_atom;
+ unsigned n;
- if (mask[metaptr])
- continue;
- tag = &data->tags[metaptr];
- std_meta_atom = find_standard_meta(tag->item);
- if (std_meta_atom)
- membuffer_write_std_tag(buf, std_meta_atom, tag->value);
+ for (n = 0; n < meta->count; n++) {
+ struct mp4_tag *tag = meta->tags + n;
+ const char *atom_name;
+ if (!strcasecmp(tag->item, "title"))
+ atom_name = "\xA9" "nam";
+ else if (!strcasecmp(tag->item, "artist"))
+ atom_name = "\xA9" "ART";
+ else if (!strcasecmp(tag->item, "album"))
+ atom_name = "\xA9" "alb";
+ else if (!strcasecmp(tag->item, "date"))
+ atom_name = "\xA9" "day";
+ else if (!strcasecmp(tag->item, "comment"))
+ atom_name = "\xA9" "cmt";
else
- membuffer_write_custom_tag(buf, tag->item, tag->value);
+ assert(false);
+ membuffer_write_std_tag(buf, atom_name, tag->value);
}
- free(mask);
-
- if (membuffer_error(buf)) {
- membuffer_free(buf);
- return 0;
- }
-
*out_size = membuffer_get_size(buf);
- *out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
-
- return 1;
+ return membuffer_detach(buf);
}
static void membuffer_write_atom(struct membuffer *buf, const char *name, unsigned size,
return buf->data;
}
-static void membuffer_set_error(struct membuffer *buf)
-{
- buf->error = 1;
-}
-
-static unsigned membuffer_transfer_from_file(struct membuffer *buf, struct mp4ff *src,
+static bool membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
unsigned bytes)
{
- unsigned oldsize;
- void *bufptr;
-
- oldsize = membuffer_get_size(buf);
- if (membuffer_write(buf, 0, bytes) != bytes)
- return 0;
+ unsigned oldsize = membuffer_get_size(buf);
+ char *bufptr;
+ membuffer_write(buf, 0, bytes);
bufptr = membuffer_get_ptr(buf);
- if (bufptr == 0)
- return 0;
-
- if ((unsigned)read_data(src, (char *) bufptr + oldsize, bytes) !=
- bytes) {
- membuffer_set_error(buf);
- return 0;
+ if (read_data(src, bufptr + oldsize, bytes) != 1) {
+ free(buf->data);
+ free(buf);
+ return false;
}
-
- return bytes;
+ return true;
}
-static uint32_t create_meta(const struct mp4ff_metadata *data, void **out_buffer,
+static uint32_t create_meta(const struct mp4_metadata *meta, void **out_buffer,
uint32_t * out_size)
{
struct membuffer *buf;
uint32_t ilst_size;
void *ilst_buffer;
- if (!create_ilst(data, &ilst_buffer, &ilst_size))
- return 0;
+ ilst_buffer = create_ilst(meta, &ilst_size);
buf = membuffer_create();
-
membuffer_write_int32(buf, 0);
membuffer_write_atom(buf, "ilst", ilst_size, ilst_buffer);
free(ilst_buffer);
*out_size = membuffer_get_size(buf);
*out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
return 1;
}
-static uint32_t create_udta(const struct mp4ff_metadata *data, void **out_buffer,
+static uint32_t create_udta(const struct mp4_metadata *meta, void **out_buffer,
uint32_t * out_size)
{
struct membuffer *buf;
uint32_t meta_size;
void *meta_buffer;
- if (!create_meta(data, &meta_buffer, &meta_size))
+ if (!create_meta(meta, &meta_buffer, &meta_size))
return 0;
buf = membuffer_create();
*out_size = membuffer_get_size(buf);
*out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
return 1;
}
return read_u32_be(&src);
}
-static uint32_t modify_moov(struct mp4ff *f, const struct mp4ff_metadata *data,
- void **out_buffer, uint32_t * out_size)
+static void *modify_moov(struct mp4 *f, uint32_t *out_size)
{
+ int ret;
uint64_t total_base = f->moov_offset + 8;
uint32_t total_size = (uint32_t) (f->moov_size - 8);
-
uint64_t udta_offset, meta_offset, ilst_offset;
uint32_t udta_size, meta_size, ilst_size;
-
uint32_t new_ilst_size;
- void *new_ilst_buffer;
-
+ void *new_ilst_buffer, *out_buffer;
uint8_t *p_out;
int32_t size_delta;
+ uint32_t tmp;
- if (!find_atom_v2(f, total_base, total_size, "udta", 0, "meta")) {
+ ret = find_atom_v2(f, total_base, total_size, "udta", 0, "meta");
+ if (ret <= 0)
+ return NULL;
+ if (ret == 2) {
struct membuffer *buf;
void *new_udta_buffer;
uint32_t new_udta_size;
- if (!create_udta(data, &new_udta_buffer, &new_udta_size))
- return 0;
+ if (!create_udta(&f->meta, &new_udta_buffer, &new_udta_size))
+ return NULL;
buf = membuffer_create();
set_position(f, total_base);
- membuffer_transfer_from_file(buf, f, total_size);
-
+ if (!membuffer_transfer_from_file(buf, f, total_size)) {
+ free(new_udta_buffer);
+ return NULL;
+ }
membuffer_write_atom(buf, "udta", new_udta_size,
new_udta_buffer);
free(new_udta_buffer);
*out_size = membuffer_get_size(buf);
- *out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
- return 1;
- } else {
- udta_offset = get_position(f);
- udta_size = read_int32(f);
- if (!find_atom_v2 (f, udta_offset + 8, udta_size - 8, "meta", 4, "ilst")) {
- struct membuffer *buf;
- void *new_meta_buffer;
- uint32_t new_meta_size;
- if (!create_meta(data, &new_meta_buffer, &new_meta_size))
- return 0;
-
- buf = membuffer_create();
- set_position(f, total_base);
- membuffer_transfer_from_file(buf, f,
- (uint32_t)(udta_offset - total_base));
-
- membuffer_write_int32(buf, udta_size + 8 + new_meta_size);
- membuffer_write_atom_name(buf, "udta");
- membuffer_transfer_from_file(buf, f, udta_size);
-
- membuffer_write_atom(buf, "meta", new_meta_size,
- new_meta_buffer);
- free(new_meta_buffer);
-
- *out_size = membuffer_get_size(buf);
- *out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
- return 1;
- }
- meta_offset = get_position(f);
- meta_size = read_int32(f);
- if (!find_atom(f, meta_offset + 12, meta_size - 12, "ilst"))
- return 0; //shouldn't happen, find_atom_v2 above takes care of it
- ilst_offset = get_position(f);
- ilst_size = read_int32(f);
+ return membuffer_detach(buf);
+ }
+ udta_offset = get_position(f);
+ ret = read_int32(f, &udta_size);
+ if (ret <= 0)
+ return NULL;
+ ret = find_atom_v2(f, udta_offset + 8, udta_size - 8, "meta", 4, "ilst");
+ if (ret <= 0)
+ return NULL;
+ if (ret == 2) {
+ struct membuffer *buf;
+ void *new_meta_buffer;
+ uint32_t new_meta_size;
- if (!create_ilst(data, &new_ilst_buffer, &new_ilst_size))
- return 0;
+ if (!create_meta(&f->meta, &new_meta_buffer, &new_meta_size))
+ return NULL;
- size_delta = new_ilst_size - (ilst_size - 8);
+ buf = membuffer_create();
+ set_position(f, total_base);
+ if (!membuffer_transfer_from_file(buf, f,
+ udta_offset - total_base)) {
+ free(new_meta_buffer);
+ return NULL;
+ }
- *out_size = total_size + size_delta;
- *out_buffer = para_malloc(*out_size);
- p_out = (uint8_t *) * out_buffer;
+ membuffer_write_int32(buf, udta_size + 8 + new_meta_size);
+ membuffer_write_atom_name(buf, "udta");
+ if (!membuffer_transfer_from_file(buf, f, udta_size)) {
+ free(new_meta_buffer);
+ return NULL;
+ }
+ membuffer_write_atom(buf, "meta", new_meta_size,
+ new_meta_buffer);
+ free(new_meta_buffer);
- set_position(f, total_base);
- read_data(f, p_out,
- (uint32_t) (udta_offset - total_base));
- p_out += (uint32_t) (udta_offset - total_base);
- *(uint32_t *) p_out = fix_byte_order_32(read_int32(f) + size_delta);
- p_out += 4;
- read_data(f, p_out, 4);
- p_out += 4;
- read_data(f, p_out,
- (uint32_t) (meta_offset - udta_offset - 8));
- p_out += (uint32_t) (meta_offset - udta_offset - 8);
- *(uint32_t *) p_out = fix_byte_order_32(read_int32(f) + size_delta);
- p_out += 4;
- read_data(f, p_out, 4);
- p_out += 4;
- read_data(f, p_out,
- (uint32_t) (ilst_offset - meta_offset - 8));
- p_out += (uint32_t) (ilst_offset - meta_offset - 8);
- *(uint32_t *) p_out = fix_byte_order_32(read_int32(f) + size_delta);
- p_out += 4;
- read_data(f, p_out, 4);
- p_out += 4;
-
- memcpy(p_out, new_ilst_buffer, new_ilst_size);
- p_out += new_ilst_size;
-
- set_position(f, ilst_offset + ilst_size);
- read_data(f, p_out, (uint32_t) (total_size
- - (ilst_offset - total_base) - ilst_size));
-
- free(new_ilst_buffer);
+ *out_size = membuffer_get_size(buf);
+ return membuffer_detach(buf);
}
- return 1;
-}
-
-static int32_t write_data(struct mp4ff *f, void *data, uint32_t size)
+ meta_offset = get_position(f);
+ ret = read_int32(f, &meta_size);
+ if (ret <= 0)
+ return NULL;
+ /* shouldn't happen, find_atom_v2 above takes care of it */
+ if (!find_atom(f, meta_offset + 12, meta_size - 12, "ilst"))
+ return NULL;
+ ilst_offset = get_position(f);
+ ret = read_int32(f, &ilst_size);
+ if (ret <= 0)
+ return NULL;
+ new_ilst_buffer = create_ilst(&f->meta, &new_ilst_size);
+ size_delta = new_ilst_size - (ilst_size - 8);
+ *out_size = total_size + size_delta;
+ out_buffer = para_malloc(*out_size);
+ p_out = out_buffer;
+ set_position(f, total_base);
+ ret = read_data(f, p_out, udta_offset - total_base);
+ if (ret <= 0)
+ return NULL;
+ p_out += (uint32_t) (udta_offset - total_base);
+ ret = read_int32(f, &tmp);
+ if (ret <= 0)
+ return NULL;
+ *(uint32_t *)p_out = fix_byte_order_32(tmp + size_delta);
+ p_out += 4;
+ ret = read_data(f, p_out, 4);
+ if (ret <= 0)
+ return NULL;
+ p_out += 4;
+ ret = read_data(f, p_out, meta_offset - udta_offset - 8);
+ if (ret <= 0)
+ return NULL;
+ p_out += (uint32_t) (meta_offset - udta_offset - 8);
+ ret = read_int32(f, &tmp);
+ if (ret <= 0)
+ return NULL;
+ *(uint32_t *)p_out = fix_byte_order_32(tmp + size_delta);
+ p_out += 4;
+ ret = read_data(f, p_out, 4);
+ if (ret <= 0)
+ return NULL;
+ p_out += 4;
+ ret = read_data(f, p_out, ilst_offset - meta_offset - 8);
+ if (ret <= 0)
+ return NULL;
+ p_out += (uint32_t) (ilst_offset - meta_offset - 8);
+ ret = read_int32(f, &tmp);
+ if (ret <= 0)
+ return NULL;
+ *(uint32_t *)p_out = fix_byte_order_32(tmp + size_delta);
+ p_out += 4;
+ ret = read_data(f, p_out, 4);
+ if (ret <= 0)
+ return NULL;
+ p_out += 4;
+ memcpy(p_out, new_ilst_buffer, new_ilst_size);
+ p_out += new_ilst_size;
+ set_position(f, ilst_offset + ilst_size);
+ ret = read_data(f, p_out, total_size
+ - (ilst_offset - total_base) - ilst_size);
+ if (ret <= 0)
+ return NULL;
+ free(new_ilst_buffer);
+ return out_buffer;
+}
+
+static int32_t write_data(struct mp4 *f, void *data, uint32_t size)
{
int32_t result = 1;
- result = f->stream->write(f->stream->user_data, data, size);
+ result = f->cb->write(f->cb->user_data, data, size);
f->current_position += size;
return result;
}
-static int32_t write_int32(struct mp4ff *f, uint32_t data)
+static int32_t write_int32(struct mp4 *f, uint32_t data)
{
int8_t temp[4];
write_u32_be(temp, data);
return write_data(f, temp, sizeof(temp));
}
-static int32_t truncate_stream(struct mp4ff *f)
-{
- return f->stream->truncate(f->stream->user_data);
-}
-
-int32_t mp4ff_meta_update(struct mp4ff_callback *f, const struct mp4ff_metadata *data)
+int32_t mp4_meta_update(struct mp4 *f)
{
void *new_moov_data;
uint32_t new_moov_size;
- struct mp4ff *ff = para_calloc(sizeof(struct mp4ff));
- ff->stream = f;
- set_position(ff, 0);
-
- parse_atoms(ff, 1);
-
- if (!modify_moov(ff, data, &new_moov_data, &new_moov_size)) {
- mp4ff_close(ff);
+ set_position(f, 0);
+ new_moov_data = modify_moov(f, &new_moov_size);
+ if (!new_moov_data ) {
+ mp4_close(f);
return 0;
}
-
/* copy moov atom to end of the file */
- if (ff->last_atom != ATOM_MOOV) {
+ if (f->last_atom != ATOM_MOOV) {
char *free_data = "free";
/* rename old moov to free */
- set_position(ff, ff->moov_offset + 4);
- write_data(ff, free_data, 4);
+ set_position(f, f->moov_offset + 4);
+ write_data(f, free_data, 4);
- set_position(ff, ff->file_size);
- write_int32(ff, new_moov_size + 8);
- write_data(ff, "moov", 4);
- write_data(ff, new_moov_data, new_moov_size);
+ set_position(f, f->file_size);
+ write_int32(f, new_moov_size + 8);
+ write_data(f, "moov", 4);
+ write_data(f, new_moov_data, new_moov_size);
} else {
- set_position(ff, ff->moov_offset);
- write_int32(ff, new_moov_size + 8);
- write_data(ff, "moov", 4);
- write_data(ff, new_moov_data, new_moov_size);
+ set_position(f, f->moov_offset);
+ write_int32(f, new_moov_size + 8);
+ write_data(f, "moov", 4);
+ write_data(f, new_moov_data, new_moov_size);
}
-
- truncate_stream(ff);
-
- mp4ff_close(ff);
+ free(new_moov_data);
+ f->cb->truncate(f->cb->user_data);
return 1;
}
-/* find a metadata item by name */
-/* returns 0 if item found, 1 if no such item */
-static int32_t meta_find_by_name(const struct mp4ff *f, const char *item,
- char **value)
+static char *meta_find_by_name(const struct mp4 *f, const char *item)
{
uint32_t i;
- for (i = 0; i < f->tags.count; i++) {
- if (!strcasecmp(f->tags.tags[i].item, item)) {
- *value = para_strdup(f->tags.tags[i].value);
- return 1;
- }
- }
-
- *value = NULL;
-
- /* not found */
- return 0;
+ for (i = 0; i < f->meta.count; i++)
+ if (!strcasecmp(f->meta.tags[i].item, item))
+ return para_strdup(f->meta.tags[i].value);
+ return NULL;
}
-int32_t mp4ff_meta_get_artist(const struct mp4ff *f, char **value)
+/**
+ * Return the value of the artist meta tag of an mp4 file.
+ *
+ * \param f Must not be NULL.
+ *
+ * \return If the file does not contain this metadata tag, the function returns
+ * NULL. Otherwise, a copy of the tag value is returned. The caller should free
+ * this memory when it is no longer needed.
+ */
+char *mp4_meta_get_artist(const struct mp4 *f)
{
- return meta_find_by_name(f, "artist", value);
+ return meta_find_by_name(f, "artist");
}
-int32_t mp4ff_meta_get_title(const struct mp4ff *f, char **value)
+/**
+ * Return the value of the title meta tag of an mp4 file.
+ *
+ * \param f See \ref mp4_meta_get_artist().
+ * \return See \ref mp4_meta_get_artist().
+ */
+char *mp4_meta_get_title(const struct mp4 *f)
{
- return meta_find_by_name(f, "title", value);
+ return meta_find_by_name(f, "title");
}
-int32_t mp4ff_meta_get_date(const struct mp4ff *f, char **value)
+/**
+ * Return the value of the date meta tag of an mp4 file.
+ *
+ * \param f See \ref mp4_meta_get_artist().
+ * \return See \ref mp4_meta_get_artist().
+ */
+char *mp4_meta_get_date(const struct mp4 *f)
{
- return meta_find_by_name(f, "date", value);
+ return meta_find_by_name(f, "date");
}
-int32_t mp4ff_meta_get_album(const struct mp4ff *f, char **value)
+/**
+ * Return the value of the album meta tag of an mp4 file.
+ *
+ * \param f See \ref mp4_meta_get_artist().
+ * \return See \ref mp4_meta_get_artist().
+ */
+char *mp4_meta_get_album(const struct mp4 *f)
{
- return meta_find_by_name(f, "album", value);
+ return meta_find_by_name(f, "album");
}
-int32_t mp4ff_meta_get_comment(const struct mp4ff *f, char **value)
+/**
+ * Return the value of the comment meta tag of an mp4 file.
+ *
+ * \param f See \ref mp4_meta_get_artist().
+ * \return See \ref mp4_meta_get_artist().
+ */
+char *mp4_meta_get_comment(const struct mp4 *f)
{
- return meta_find_by_name(f, "comment", value);
+ return meta_find_by_name(f, "comment");
}
projects / paraslash.git / blobdiff