X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Faiffdec.c;h=6243bcb30fade8f06d2a54bd5802bfd54e42c4c0;hb=717addecad77d85d329a4b502f4098d4912679d7;hp=8678f9bb9b3748720b079d942d0a0adec87608a6;hpb=8978fedaeefdff50ed4deefbfe822ad07f19f616;p=ffmpeg diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 8678f9bb9b3..6243bcb30fa 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -19,8 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intfloat_readwrite.h" +#include "libavutil/mathematics.h" +#include "libavutil/dict.h" #include "avformat.h" +#include "internal.h" #include "pcm.h" #include "aiff.h" @@ -29,21 +31,22 @@ typedef struct { int64_t data_end; + int block_duration; } AIFFInputContext; -static enum CodecID aiff_codec_get_id(int bps) +static enum AVCodecID aiff_codec_get_id(int bps) { if (bps <= 8) - return CODEC_ID_PCM_S8; + return AV_CODEC_ID_PCM_S8; if (bps <= 16) - return CODEC_ID_PCM_S16BE; + return AV_CODEC_ID_PCM_S16BE; if (bps <= 24) - return CODEC_ID_PCM_S24BE; + return AV_CODEC_ID_PCM_S24BE; if (bps <= 32) - return CODEC_ID_PCM_S32BE; + return AV_CODEC_ID_PCM_S32BE; /* bigger than 32 isn't allowed */ - return CODEC_ID_NONE; + return AV_CODEC_ID_NONE; } /* returns the size of the found tag */ @@ -79,14 +82,18 @@ static void get_meta(AVFormatContext *s, const char *key, int size) return; str[res] = 0; - av_metadata_set2(&s->metadata, key, str, AV_METADATA_DONT_STRDUP_VAL); + av_dict_set(&s->metadata, key, str, AV_DICT_DONT_STRDUP_VAL); } /* Returns the number of sound data frames or negative on error */ -static unsigned int get_aiff_header(AVIOContext *pb, AVCodecContext *codec, - int size, unsigned version) +static unsigned int get_aiff_header(AVFormatContext *s, int size, + unsigned version) { - AVExtFloat ext; + AVIOContext *pb = s->pb; + AVCodecContext *codec = s->streams[0]->codec; + AIFFInputContext *aiff = s->priv_data; + int exp; + uint64_t val; double sample_rate; unsigned int num_frames; @@ -97,49 +104,53 @@ static unsigned int get_aiff_header(AVIOContext *pb, AVCodecContext *codec, num_frames = avio_rb32(pb); codec->bits_per_coded_sample = avio_rb16(pb); - avio_read(pb, (uint8_t*)&ext, sizeof(ext));/* Sample rate is in */ - sample_rate = av_ext2dbl(ext); /* 80 bits BE IEEE extended float */ + exp = avio_rb16(pb); + val = avio_rb64(pb); + sample_rate = ldexp(val, exp - 16383 - 63); codec->sample_rate = sample_rate; size -= 18; - /* Got an AIFF-C? */ + /* get codec id for AIFF-C */ if (version == AIFF_C_VERSION1) { codec->codec_tag = avio_rl32(pb); codec->codec_id = ff_codec_get_id(ff_codec_aiff_tags, codec->codec_tag); + size -= 4; + } + if (version != AIFF_C_VERSION1 || codec->codec_id == AV_CODEC_ID_PCM_S16BE) { + codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample); + codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id); + aiff->block_duration = 1; + } else { switch (codec->codec_id) { - case CODEC_ID_PCM_S16BE: - codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample); - codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id); + case AV_CODEC_ID_PCM_F32BE: + case AV_CODEC_ID_PCM_F64BE: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: + aiff->block_duration = 1; break; - case CODEC_ID_ADPCM_IMA_QT: + case AV_CODEC_ID_ADPCM_IMA_QT: codec->block_align = 34*codec->channels; - codec->frame_size = 64; break; - case CODEC_ID_MACE3: + case AV_CODEC_ID_MACE3: codec->block_align = 2*codec->channels; - codec->frame_size = 6; break; - case CODEC_ID_MACE6: + case AV_CODEC_ID_MACE6: codec->block_align = 1*codec->channels; - codec->frame_size = 6; break; - case CODEC_ID_GSM: + case AV_CODEC_ID_GSM: codec->block_align = 33; - codec->frame_size = 160; break; - case CODEC_ID_QCELP: + case AV_CODEC_ID_QCELP: codec->block_align = 35; - codec->frame_size= 160; break; default: break; } - size -= 4; - } else { - /* Need the codec type */ - codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample); - codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id); + if (codec->block_align > 0) + aiff->block_duration = av_get_audio_frame_duration(codec, + codec->block_align); } /* Block align needs to be computed in all cases, as the definition @@ -147,8 +158,10 @@ static unsigned int get_aiff_header(AVIOContext *pb, AVCodecContext *codec, if (!codec->block_align) codec->block_align = (codec->bits_per_coded_sample * codec->channels) >> 3; - codec->bit_rate = (codec->frame_size ? codec->sample_rate/codec->frame_size : - codec->sample_rate) * (codec->block_align << 3); + if (aiff->block_duration) { + codec->bit_rate = codec->sample_rate * (codec->block_align << 3) / + aiff->block_duration; + } /* Chunk is over */ if (size) @@ -170,8 +183,7 @@ static int aiff_probe(AVProbeData *p) } /* aiff input */ -static int aiff_read_header(AVFormatContext *s, - AVFormatParameters *ap) +static int aiff_read_header(AVFormatContext *s) { int size, filesize; int64_t offset = 0; @@ -195,7 +207,7 @@ static int aiff_read_header(AVFormatContext *s, filesize -= 4; - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -210,7 +222,7 @@ static int aiff_read_header(AVFormatContext *s, switch (tag) { case MKTAG('C', 'O', 'M', 'M'): /* Common chunk */ /* Then for the complete header info */ - st->nb_frames = get_aiff_header(pb, st->codec, size, version); + st->nb_frames = get_aiff_header(s, size, version); if (st->nb_frames < 0) return st->nb_frames; if (offset > 0) // COMM is after SSND @@ -260,20 +272,16 @@ static int aiff_read_header(AVFormatContext *s, } } +got_sound: if (!st->codec->block_align) { - av_log(s, AV_LOG_ERROR, "could not find COMM tag\n"); + av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n"); return -1; } -got_sound: /* Now positioned, get the sound data start and end */ - if (st->nb_frames) - s->file_size = st->nb_frames * st->codec->block_align; - - av_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); st->start_time = 0; - st->duration = st->codec->frame_size ? - st->nb_frames * st->codec->frame_size : st->nb_frames; + st->duration = st->nb_frames * aiff->block_duration; /* Position the stream at the first block */ avio_seek(pb, offset, SEEK_SET); @@ -308,17 +316,17 @@ static int aiff_read_packet(AVFormatContext *s, /* Only one stream in an AIFF file */ pkt->stream_index = 0; + pkt->duration = (res / st->codec->block_align) * aiff->block_duration; return 0; } AVInputFormat ff_aiff_demuxer = { - "aiff", - NULL_IF_CONFIG_SMALL("Audio IFF"), - sizeof(AIFFInputContext), - aiff_probe, - aiff_read_header, - aiff_read_packet, - NULL, - pcm_read_seek, - .codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0}, + .name = "aiff", + .long_name = NULL_IF_CONFIG_SMALL("Audio IFF"), + .priv_data_size = sizeof(AIFFInputContext), + .read_probe = aiff_probe, + .read_header = aiff_read_header, + .read_packet = aiff_read_packet, + .read_seek = ff_pcm_read_seek, + .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 }, };