|
|
@ -103,10 +103,8 @@ static unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec, |
|
|
|
double sample_rate; |
|
|
|
double sample_rate; |
|
|
|
unsigned int num_frames; |
|
|
|
unsigned int num_frames; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (size & 1) |
|
|
|
if (size & 1) |
|
|
|
size++; |
|
|
|
size++; |
|
|
|
|
|
|
|
|
|
|
|
codec->codec_type = CODEC_TYPE_AUDIO; |
|
|
|
codec->codec_type = CODEC_TYPE_AUDIO; |
|
|
|
codec->channels = get_be16(pb); |
|
|
|
codec->channels = get_be16(pb); |
|
|
|
num_frames = get_be32(pb); |
|
|
|
num_frames = get_be32(pb); |
|
|
@ -174,10 +172,8 @@ static int aiff_write_header(AVFormatContext *s) |
|
|
|
int aifc = 0; |
|
|
|
int aifc = 0; |
|
|
|
|
|
|
|
|
|
|
|
/* First verify if format is ok */ |
|
|
|
/* First verify if format is ok */ |
|
|
|
if (!enc->codec_tag) { |
|
|
|
if (!enc->codec_tag) |
|
|
|
return -1; |
|
|
|
return -1; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (enc->codec_tag != MKTAG('N','O','N','E')) |
|
|
|
if (enc->codec_tag != MKTAG('N','O','N','E')) |
|
|
|
aifc = 1; |
|
|
|
aifc = 1; |
|
|
|
|
|
|
|
|
|
|
@ -343,27 +339,21 @@ static int aiff_read_header(AVFormatContext *s, |
|
|
|
if (offset > 0) // COMM is after SSND
|
|
|
|
if (offset > 0) // COMM is after SSND
|
|
|
|
goto got_sound; |
|
|
|
goto got_sound; |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */ |
|
|
|
case MKTAG('F', 'V', 'E', 'R'): /* Version chunk */ |
|
|
|
version = get_be32(pb); |
|
|
|
version = get_be32(pb); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case MKTAG('N', 'A', 'M', 'E'): /* Sample name chunk */ |
|
|
|
case MKTAG('N', 'A', 'M', 'E'): /* Sample name chunk */ |
|
|
|
get_meta (pb, s->title, sizeof(s->title), size); |
|
|
|
get_meta (pb, s->title, sizeof(s->title), size); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */ |
|
|
|
case MKTAG('A', 'U', 'T', 'H'): /* Author chunk */ |
|
|
|
get_meta (pb, s->author, sizeof(s->author), size); |
|
|
|
get_meta (pb, s->author, sizeof(s->author), size); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */ |
|
|
|
case MKTAG('(', 'c', ')', ' '): /* Copyright chunk */ |
|
|
|
get_meta (pb, s->copyright, sizeof(s->copyright), size); |
|
|
|
get_meta (pb, s->copyright, sizeof(s->copyright), size); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case MKTAG('A', 'N', 'N', 'O'): /* Annotation chunk */ |
|
|
|
case MKTAG('A', 'N', 'N', 'O'): /* Annotation chunk */ |
|
|
|
get_meta (pb, s->comment, sizeof(s->comment), size); |
|
|
|
get_meta (pb, s->comment, sizeof(s->comment), size); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */ |
|
|
|
case MKTAG('S', 'S', 'N', 'D'): /* Sampled sound chunk */ |
|
|
|
offset = get_be32(pb); /* Offset of sound data */ |
|
|
|
offset = get_be32(pb); /* Offset of sound data */ |
|
|
|
get_be32(pb); /* BlockSize... don't care */ |
|
|
|
get_be32(pb); /* BlockSize... don't care */ |
|
|
@ -376,7 +366,6 @@ static int aiff_read_header(AVFormatContext *s, |
|
|
|
} |
|
|
|
} |
|
|
|
url_fskip(pb, size - 8); |
|
|
|
url_fskip(pb, size - 8); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
default: /* Jump */ |
|
|
|
default: /* Jump */ |
|
|
|
if (size & 1) /* Always even aligned */ |
|
|
|
if (size & 1) /* Always even aligned */ |
|
|
|
size++; |
|
|
|
size++; |
|
|
|