From 0955e57ad07640574fc20ce0bea3c0b83982ada1 Mon Sep 17 00:00:00 2001 From: Nidhi Makhijani Date: Mon, 23 Jun 2014 09:33:50 +0530 Subject: daud: split muxer and demuxer Signed-off-by: Diego Biurrun --- libavformat/Makefile | 4 +-- libavformat/daud.c | 95 --------------------------------------------------- libavformat/dauddec.c | 59 ++++++++++++++++++++++++++++++++ libavformat/daudenc.c | 54 +++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 97 deletions(-) delete mode 100644 libavformat/daud.c create mode 100644 libavformat/dauddec.c create mode 100644 libavformat/daudenc.c (limited to 'libavformat') diff --git a/libavformat/Makefile b/libavformat/Makefile index 89d2d424e1..c2d77b37c9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -90,8 +90,8 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o OBJS-$(CONFIG_CRC_MUXER) += crcenc.o -OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o -OBJS-$(CONFIG_DAUD_MUXER) += daud.o +OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o +OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o OBJS-$(CONFIG_DIRAC_MUXER) += rawenc.o diff --git a/libavformat/daud.c b/libavformat/daud.c deleted file mode 100644 index bb7ab7fbcd..0000000000 --- a/libavformat/daud.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - * D-Cinema audio demuxer - * Copyright (c) 2005 Reimar Döffinger - * - * 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/channel_layout.h" -#include "avformat.h" - -static int daud_header(AVFormatContext *s) { - AVStream *st = avformat_new_stream(s, NULL); - if (!st) - return AVERROR(ENOMEM); - st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = AV_CODEC_ID_PCM_S24DAUD; - st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd'); - st->codec->channels = 6; - st->codec->channel_layout = AV_CH_LAYOUT_5POINT1; - st->codec->sample_rate = 96000; - st->codec->bit_rate = 3 * 6 * 96000 * 8; - st->codec->block_align = 3 * 6; - st->codec->bits_per_coded_sample = 24; - return 0; -} - -static int daud_packet(AVFormatContext *s, AVPacket *pkt) { - AVIOContext *pb = s->pb; - int ret, size; - if (pb->eof_reached) - return AVERROR(EIO); - size = avio_rb16(pb); - avio_rb16(pb); // unknown - ret = av_get_packet(pb, pkt, size); - pkt->stream_index = 0; - return ret; -} - -static int daud_write_header(struct AVFormatContext *s) -{ - AVCodecContext *codec = s->streams[0]->codec; - if (codec->channels!=6 || codec->sample_rate!=96000) - return -1; - return 0; -} - -static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt) -{ - if (pkt->size > 65535) { - av_log(s, AV_LOG_ERROR, - "Packet size too large for s302m. (%d > 65535)\n", pkt->size); - return -1; - } - avio_wb16(s->pb, pkt->size); - avio_wb16(s->pb, 0x8010); // unknown - avio_write(s->pb, pkt->data, pkt->size); - return 0; -} - -#if CONFIG_DAUD_DEMUXER -AVInputFormat ff_daud_demuxer = { - .name = "daud", - .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), - .read_header = daud_header, - .read_packet = daud_packet, - .extensions = "302", -}; -#endif - -#if CONFIG_DAUD_MUXER -AVOutputFormat ff_daud_muxer = { - .name = "daud", - .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), - .extensions = "302", - .audio_codec = AV_CODEC_ID_PCM_S24DAUD, - .video_codec = AV_CODEC_ID_NONE, - .write_header = daud_write_header, - .write_packet = daud_write_packet, - .flags = AVFMT_NOTIMESTAMPS, -}; -#endif diff --git a/libavformat/dauddec.c b/libavformat/dauddec.c new file mode 100644 index 0000000000..1855e84aae --- /dev/null +++ b/libavformat/dauddec.c @@ -0,0 +1,59 @@ +/* + * D-Cinema audio demuxer + * Copyright (c) 2005 Reimar Döffinger + * + * 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/channel_layout.h" +#include "avformat.h" + +static int daud_header(AVFormatContext *s) { + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codec->codec_type = AVMEDIA_TYPE_AUDIO; + st->codec->codec_id = AV_CODEC_ID_PCM_S24DAUD; + st->codec->codec_tag = MKTAG('d', 'a', 'u', 'd'); + st->codec->channels = 6; + st->codec->channel_layout = AV_CH_LAYOUT_5POINT1; + st->codec->sample_rate = 96000; + st->codec->bit_rate = 3 * 6 * 96000 * 8; + st->codec->block_align = 3 * 6; + st->codec->bits_per_coded_sample = 24; + return 0; +} + +static int daud_packet(AVFormatContext *s, AVPacket *pkt) { + AVIOContext *pb = s->pb; + int ret, size; + if (pb->eof_reached) + return AVERROR(EIO); + size = avio_rb16(pb); + avio_rb16(pb); // unknown + ret = av_get_packet(pb, pkt, size); + pkt->stream_index = 0; + return ret; +} + +AVInputFormat ff_daud_demuxer = { + .name = "daud", + .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), + .read_header = daud_header, + .read_packet = daud_packet, + .extensions = "302", +}; diff --git a/libavformat/daudenc.c b/libavformat/daudenc.c new file mode 100644 index 0000000000..416e895395 --- /dev/null +++ b/libavformat/daudenc.c @@ -0,0 +1,54 @@ +/* + * D-Cinema audio muxer + * Copyright (c) 2005 Reimar Döffinger + * + * 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 "avformat.h" + +static int daud_write_header(struct AVFormatContext *s) +{ + AVCodecContext *codec = s->streams[0]->codec; + if (codec->channels!=6 || codec->sample_rate!=96000) + return -1; + return 0; +} + +static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt) +{ + if (pkt->size > 65535) { + av_log(s, AV_LOG_ERROR, + "Packet size too large for s302m. (%d > 65535)\n", pkt->size); + return -1; + } + avio_wb16(s->pb, pkt->size); + avio_wb16(s->pb, 0x8010); // unknown + avio_write(s->pb, pkt->data, pkt->size); + return 0; +} + +AVOutputFormat ff_daud_muxer = { + .name = "daud", + .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio"), + .extensions = "302", + .audio_codec = AV_CODEC_ID_PCM_S24DAUD, + .video_codec = AV_CODEC_ID_NONE, + .write_header = daud_write_header, + .write_packet = daud_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; -- cgit v1.2.3