On 24/11/15 01:00, Vittorio Giovara wrote:
> From: Vladimir Voroshilov <[email protected]>
>
> Signed-off-by: Vittorio Giovara <[email protected]>
> ---
> Changelog | 1 +
> libavformat/Makefile | 1 +
> libavformat/act.c | 203
> +++++++++++++++++++++++++++++++++++++++++++++++
> libavformat/allformats.c | 1 +
> libavformat/genh.c | 11 ++-
> 5 files changed, 216 insertions(+), 1 deletion(-)
> create mode 100644 libavformat/act.c
>
> diff --git a/Changelog b/Changelog
> index 54957f9..aac87a3 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -52,6 +52,7 @@ version <next>:
> - G.729 demuxer
> - GIF demuxer
> - GENH demuxer
> +- ACT demuxer
>
>
> version 11:
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index a0111a7..126376f 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -60,6 +60,7 @@ OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o
> OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o
> OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o
> OBJS-$(CONFIG_AC3_MUXER) += rawenc.o
> +OBJS-$(CONFIG_ACT_DEMUXER) += act.o
> OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o
> OBJS-$(CONFIG_ADX_MUXER) += rawenc.o
> OBJS-$(CONFIG_ADTS_MUXER) += adtsenc.o
> diff --git a/libavformat/act.c b/libavformat/act.c
> new file mode 100644
> index 0000000..ec88b40
> --- /dev/null
> +++ b/libavformat/act.c
> @@ -0,0 +1,203 @@
> +/*
> + * ACT file format muxer/demuxer
demuxer.
> + * Copyright (c) 2007-2008 Vladimir Voroshilov
> + *
> + * This file is part of Libav.
> + *
> + * Libav is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * Libav is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with Libav; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +#include "libavutil/intreadwrite.h"
> +#include "libavutil/mathematics.h"
> +
> +#include "avformat.h"
> +#include "avio.h"
> +#include "riff.h"
> +
> +#define CHUNK_SIZE 512
> +#define RIFF_TAG MKTAG('R', 'I', 'F', 'F')
> +#define WAVE_TAG MKTAG('W', 'A', 'V', 'E')
> +
> +typedef struct {
> + int bytes_left_in_chunk;
> + uint8_t audio_buffer[22]; ///< temporary buffer for ACT frame
> + char second_packet; ///< 1 - if temporary buffer contains valid
> (second) G.729 packet
> +} ACTContext;
> +
> +static int probe(AVProbeData *p)
> +{
> + int i;
> +
Buffer dimension unchecked again.
> + if ((AV_RL32(&p->buf[0]) != RIFF_TAG) ||
> + (AV_RL32(&p->buf[8]) != WAVE_TAG) ||
> + (AV_RL32(&p->buf[16]) != 16))
> + return 0;
> +
> + // We cant be sure that this is ACT and not regular WAV
> + if (p->buf_size < 512)
> + return 0;
> +
> + for (i = 44; i < 256; i++)
> + if (p->buf[i])
> + return 0;
> +
> + if (p->buf[256] != 0x84)
> + return 0;
> +
> + for (i = 264; i < 512; i++)
> + if (p->buf[i])
> + return 0;
> +
> + return AVPROBE_SCORE_MAX;
> +}
> +
> +static int read_header(AVFormatContext *s)
> +{
> + ACTContext *ctx = s->priv_data;
> + AVIOContext *pb = s->pb;
> + int size, min, sec, msec;
> + AVStream *st;
> +
> + st = avformat_new_stream(s, NULL);
> + if (!st)
> + return AVERROR(ENOMEM);
> +
> + avio_skip(pb, 16);
> + size = avio_rl32(pb);
> + ff_get_wav_header(s, pb, st->codec, size);
> +
> + /*
> + * 8000Hz (Fine-rec) file format has 10 bytes long
> + * packets with 10ms of sound data in them
> + */
> + if (st->codec->sample_rate != 8000) {
> + av_log(s, AV_LOG_ERROR,
> + "Sample rate %d is not supported.\n", st->codec->sample_rate);
> + return AVERROR(EINVAL);
Why it is not supported by the demuxer? Below the code seems to support
it just fine.
> + }
> +
> + st->codec->frame_size = 80;
> + st->codec->channels = 1;
> + avpriv_set_pts_info(st, 64, 1, 100);
> +
> + st->codec->codec_id = AV_CODEC_ID_G729;
> +
> + avio_seek(pb, 257, SEEK_SET);
> + msec = avio_rl16(pb);
> + sec = avio_r8(pb);
> + min = avio_rl32(pb);
> +
> + st->duration = av_rescale(1000 * (min * 60 + sec) + msec,
> + st->codec->sample_rate,
> + 1000 * st->codec->frame_size);
> +
> + ctx->bytes_left_in_chunk = CHUNK_SIZE;
> +
> + avio_seek(pb, 512, SEEK_SET);
> +
> + return 0;
> +}
> +
> +static int read_packet(AVFormatContext *s,
> + AVPacket *pkt)
> +{
> + ACTContext *ctx = s->priv_data;
> + AVIOContext *pb = s->pb;
> + int frame_size = s->streams[0]->codec->sample_rate == 8000 ? 10 : 22;
> + int ret;
> +
> + if (s->streams[0]->codec->sample_rate == 8000)
> + ret = av_new_packet(pkt, 10);
> + else
> + ret = av_new_packet(pkt, 11);
> +
> + if (ret < 0)
> + return ret;
> +
> + if (s->streams[0]->codec->sample_rate == 4400 && !ctx->second_packet) {
> + ret = avio_read(pb, ctx->audio_buffer, frame_size);
> +
> + if (ret < 0)
> + return ret;
> + if (ret != frame_size)
> + return AVERROR(EIO);
> +
> + pkt->data[0] = ctx->audio_buffer[11];
> + pkt->data[1] = ctx->audio_buffer[0];
> + pkt->data[2] = ctx->audio_buffer[12];
> + pkt->data[3] = ctx->audio_buffer[1];
> + pkt->data[4] = ctx->audio_buffer[13];
> + pkt->data[5] = ctx->audio_buffer[2];
> + pkt->data[6] = ctx->audio_buffer[14];
> + pkt->data[7] = ctx->audio_buffer[3];
> + pkt->data[8] = ctx->audio_buffer[15];
> + pkt->data[9] = ctx->audio_buffer[4];
> + pkt->data[10] = ctx->audio_buffer[16];
> +
> + ctx->second_packet = 1;
> + } else if (s->streams[0]->codec->sample_rate == 4400 &&
> ctx->second_packet) {
> + pkt->data[0] = ctx->audio_buffer[5];
> + pkt->data[1] = ctx->audio_buffer[17];
> + pkt->data[2] = ctx->audio_buffer[6];
> + pkt->data[3] = ctx->audio_buffer[18];
> + pkt->data[4] = ctx->audio_buffer[7];
> + pkt->data[5] = ctx->audio_buffer[19];
> + pkt->data[6] = ctx->audio_buffer[8];
> + pkt->data[7] = ctx->audio_buffer[20];
> + pkt->data[8] = ctx->audio_buffer[9];
> + pkt->data[9] = ctx->audio_buffer[21];
> + pkt->data[10] = ctx->audio_buffer[10];
> +
> + ctx->second_packet = 0;
> + } else { // 8000 Hz
> + ret = avio_read(pb, ctx->audio_buffer, frame_size);
> +
> + if (ret < 0)
> + return ret;
> + if (ret != frame_size)
> + return AVERROR(EIO);
> +
> + pkt->data[0] = ctx->audio_buffer[5];
> + pkt->data[1] = ctx->audio_buffer[0];
> + pkt->data[2] = ctx->audio_buffer[6];
> + pkt->data[3] = ctx->audio_buffer[1];
> + pkt->data[4] = ctx->audio_buffer[7];
> + pkt->data[5] = ctx->audio_buffer[2];
> + pkt->data[6] = ctx->audio_buffer[8];
> + pkt->data[7] = ctx->audio_buffer[3];
> + pkt->data[8] = ctx->audio_buffer[9];
> + pkt->data[9] = ctx->audio_buffer[4];
> + }
> +
> + ctx->bytes_left_in_chunk -= frame_size;
> +
> + if (ctx->bytes_left_in_chunk < frame_size) {
> + avio_skip(pb, ctx->bytes_left_in_chunk);
> + ctx->bytes_left_in_chunk = CHUNK_SIZE;
> + }
> +
> + pkt->duration = 1;
> +
> + return 0;
> +}
> +
> +AVInputFormat ff_act_demuxer = {
> + .name = "act",
> + .long_name = "ACT Voice file format",
> + .priv_data_size = sizeof(ACTContext),
> + .read_probe = probe,
> + .read_header = read_header,
> + .read_packet = read_packet,
Those names are a bit too generic.
> +};
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index 7c49d4a..21264a9 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -62,6 +62,7 @@ void av_register_all(void)
> REGISTER_MUXER (A64, a64);
> REGISTER_DEMUXER (AAC, aac);
> REGISTER_MUXDEMUX(AC3, ac3);
> + REGISTER_DEMUXER (ACT, act);
> REGISTER_MUXER (ADTS, adts);
> REGISTER_MUXDEMUX(ADX, adx);
> REGISTER_DEMUXER (AEA, aea);
> diff --git a/libavformat/genh.c b/libavformat/genh.c
This hunk seems unrelated.
> index 9196a96..64f4c32 100644
> --- a/libavformat/genh.c
> +++ b/libavformat/genh.c
> @@ -47,7 +47,7 @@ static int genh_read_header(AVFormatContext *s)
> unsigned start_offset, header_size, codec, coef_type, coef[2];
> GENHDemuxContext *c = s->priv_data;
> unsigned coef_splitted[2];
> - int align, ch;
> + int align, ch, ret;
> AVStream *st;
>
> avio_skip(s->pb, 4);
> @@ -100,6 +100,15 @@ static int genh_read_header(AVFormatContext *s)
> else
> st->codec->codec_id = AV_CODEC_ID_PCM_S8;
> break;
> + case 7:
> + st->codec->extradata_size = 2;
> + st->codec->extradata = av_malloc(2);
> + if (!st->codec->extradata)
> + return AVERROR(ENOMEM);
> +
> + AV_WL16(st->codec->extradata, 3);
> + st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_WS;
> + break;
> case 11:
> st->codec->bits_per_coded_sample = 4;
> st->codec->block_align = 36 * st->codec->channels;
>
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
