Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fixing some warnings

Browse Source 
Originally committed as revision 386 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Zdenek Kabelac 23 years ago
parent 7ba8435d64
commit 684f44d9a0
1 changed files with 24 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      libav/mov.c

52
libav/mov.c
Unescape View File

@ -169,7 +169,7 @@ struct MOVParseTableEntry;
0: continue to parse next atom 0: continue to parse next atom
-1: error occured, exit -1: error occured, exit
*/ */
typedef int (*mov_parse_function)(struct MOVParseTableEntry *parse_table, typedef int (*mov_parse_function)(const struct MOVParseTableEntry *parse_table,
ByteIOContext *pb, ByteIOContext *pb,
UINT32 atom_type, UINT32 atom_type,
INT64 atom_offset, /* after the size and type field (and eventually the extended size) */ INT64 atom_offset, /* after the size and type field (and eventually the extended size) */
@ -182,7 +182,7 @@ typedef struct MOVParseTableEntry {
mov_parse_function func; mov_parse_function func;
} MOVParseTableEntry; } MOVParseTableEntry;
static int parse_leaf(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_leaf(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
#ifdef DEBUG #ifdef DEBUG
print_atom("leaf", atom_type, atom_offset, atom_size); print_atom("leaf", atom_type, atom_offset, atom_size);
@ -194,7 +194,7 @@ static int parse_leaf(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
} }
static int parse_default(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_default(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
UINT32 type, foo=0; UINT32 type, foo=0;
UINT64 offset, size; UINT64 offset, size;
@ -233,7 +233,7 @@ static int parse_default(MOVParseTableEntry *parse_table, ByteIOContext *pb, UIN
for(i=0; parse_table[i].type != 0L && parse_table[i].type != type; i++); for(i=0; parse_table[i].type != 0L && parse_table[i].type != type; i++);
// printf(" i=%ld\n", i); // printf(" i=%ld\n", i);
if(parse_table[i].type == NULL) { /* skip leaf atoms data */ if (parse_table[i].type == 0) { /* skip leaf atoms data */
// url_seek(pb, atom_offset+atom_size, SEEK_SET); // url_seek(pb, atom_offset+atom_size, SEEK_SET);
#ifdef DEBUG #ifdef DEBUG
print_atom("unknown", type, offset, size); print_atom("unknown", type, offset, size);
@ -252,7 +252,7 @@ static int parse_default(MOVParseTableEntry *parse_table, ByteIOContext *pb, UIN
return err; return err;
} }
static int parse_mvhd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_mvhd(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
#ifdef DEBUG #ifdef DEBUG
@ -287,7 +287,7 @@ static int parse_mvhd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
} }
/* this atom should contain all header atoms */ /* this atom should contain all header atoms */
static int parse_moov(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_moov(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
int err; int err;
MOVContext *c; MOVContext *c;
@ -306,9 +306,8 @@ static int parse_moov(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
} }
/* this atom contains actual media data */ /* this atom contains actual media data */
static int parse_mdat(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_mdat(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
int err;
MOVContext *c; MOVContext *c;
#ifdef DEBUG #ifdef DEBUG
print_atom("mdat", atom_type, atom_offset, atom_size); print_atom("mdat", atom_type, atom_offset, atom_size);
@ -326,7 +325,7 @@ static int parse_mdat(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return 0; /* now go for moov */ return 0; /* now go for moov */
} }
static int parse_trak(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_trak(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
AVStream *st; AVStream *st;
@ -347,7 +346,7 @@ static int parse_trak(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return parse_default(parse_table, pb, atom_type, atom_offset, atom_size, param); return parse_default(parse_table, pb, atom_type, atom_offset, atom_size, param);
} }
static int parse_tkhd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_tkhd(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
AVStream *st; AVStream *st;
@ -391,7 +390,7 @@ static int parse_tkhd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return 0; return 0;
} }
static int parse_hdlr(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_hdlr(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
int len; int len;
@ -413,7 +412,7 @@ static int parse_hdlr(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
type = get_le32(pb); /* component subtype */ type = get_le32(pb); /* component subtype */
#ifdef DEBUG #ifdef DEBUG
printf("ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], ctype); printf("ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype);
printf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]); printf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
#endif #endif
#ifdef DEBUG #ifdef DEBUG
@ -458,7 +457,7 @@ static int parse_hdlr(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
#ifdef DEBUG #ifdef DEBUG
puts("MP4!!!"); puts("MP4!!!");
#endif #endif
while(ch=get_byte(pb)); while ((ch = get_byte(pb)));
} else { } else {
len = get_byte(pb); len = get_byte(pb);
if(len) { if(len) {
@ -475,11 +474,10 @@ static int parse_hdlr(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return 0; return 0;
} }
static int parse_stsd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_stsd(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
int entries, size, samp_sz, frames_per_sample; int entries, size, samp_sz, frames_per_sample;
char *buf;
UINT32 format; UINT32 format;
AVStream *st; AVStream *st;
#ifdef DEBUG #ifdef DEBUG
@ -518,7 +516,7 @@ static int parse_stsd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
get_be32(pb); /* data size, always 0 */ get_be32(pb); /* data size, always 0 */
frames_per_sample = get_be16(pb); /* frame per samples */ frames_per_sample = get_be16(pb); /* frame per samples */
#ifdef DEBUG #ifdef DEBUG
printf("frames/samples = %ld\n", frames_per_sample); printf("frames/samples = %d\n", frames_per_sample);
#endif #endif
url_fskip(pb, 32); /* codec name */ url_fskip(pb, 32); /* codec name */
@ -590,7 +588,7 @@ static int parse_stsd(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return 0; return 0;
} }
static int parse_stco(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_stco(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
int entries, i; int entries, i;
@ -624,7 +622,7 @@ static int parse_stco(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return 0; return 0;
} }
static int parse_stsc(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_stsc(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
int entries, i; int entries, i;
@ -654,7 +652,7 @@ static int parse_stsc(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32
return 0; return 0;
} }
static int parse_stsz(MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param) static int parse_stsz(const MOVParseTableEntry *parse_table, ByteIOContext *pb, UINT32 atom_type, INT64 atom_offset, INT64 atom_size, void *param)
{ {
MOVContext *c; MOVContext *c;
int entries, i; int entries, i;
@ -771,10 +769,8 @@ int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
MOVContext *mov; MOVContext *mov;
ByteIOContext *pb = &s->pb; ByteIOContext *pb = &s->pb;
UINT32 tag, tag1; int i, j, nb, err;
int i, j, nb, bps, err;
INT64 size; INT64 size;
AVStream *st;
mov = malloc(sizeof(MOVContext)); mov = malloc(sizeof(MOVContext));
if (!mov) if (!mov)
@ -791,7 +787,7 @@ int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
size = 0x7FFFFFFFFFFFFFFF; size = 0x7FFFFFFFFFFFFFFF;
#ifdef DEBUG #ifdef DEBUG
printf("filesz=%ld\n", size); printf("filesz=%Ld\n", size);
#endif #endif
/* check MOV header */ /* check MOV header */
@ -801,7 +797,7 @@ int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
exit(1); exit(1);
} }
#ifdef DEBUG #ifdef DEBUG
printf("on_parse_exit_offset=%ld\n", url_ftell(pb)); printf("on_parse_exit_offset=%d\n", (int) url_ftell(pb));
#endif #endif
/* some cleanup : make sure we are on the mdat atom */ /* some cleanup : make sure we are on the mdat atom */
if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset)) if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset))
@ -810,11 +806,11 @@ int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */ mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */
#ifdef DEBUG #ifdef DEBUG
printf("mdat_reset_offset=%ld\n", url_ftell(pb)); printf("mdat_reset_offset=%d\n", (int) url_ftell(pb));
#endif #endif
#ifdef DEBUG #ifdef DEBUG
printf("streams= %ld\n", s->nb_streams); printf("streams= %d\n", s->nb_streams);
#endif #endif
mov->total_streams = nb = s->nb_streams; mov->total_streams = nb = s->nb_streams;
@ -836,7 +832,7 @@ int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
} }
#endif #endif
#ifdef DEBUG #ifdef DEBUG
printf("real streams= %ld\n", s->nb_streams); printf("real streams= %d\n", s->nb_streams);
#endif #endif
return 0; return 0;
} }
@ -847,7 +843,7 @@ int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;
INT64 offset = 0x0FFFFFFFFFFFFFFF; INT64 offset = 0x0FFFFFFFFFFFFFFF;
int i, j; int i;
int st_id = 0, size; int st_id = 0, size;
size = 0x0FFFFFFF; size = 0x0FFFFFFF;

Write Preview
Loading…
Cancel
Save