virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec: add dvaudio parser

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-01-27 14:37:09 +01:00
parent 27f1ea5097
commit 2edd47582b
5 changed files with 81 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/Makefile
View File

@ -866,6 +866,7 @@ OBJS-$(CONFIG_DCA_PARSER) += dca_parser.o dca.o
OBJS-$(CONFIG_DIRAC_PARSER) += dirac_parser.o
OBJS-$(CONFIG_DNXHD_PARSER) += dnxhd_parser.o
OBJS-$(CONFIG_DPX_PARSER) += dpx_parser.o
OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o
OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o
OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o
OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o

1
libavcodec/allcodecs.c
View File

@ -621,6 +621,7 @@ void avcodec_register_all(void)
REGISTER_PARSER(DIRAC, dirac);
REGISTER_PARSER(DNXHD, dnxhd);
REGISTER_PARSER(DPX, dpx);
REGISTER_PARSER(DVAUDIO, dvaudio);
REGISTER_PARSER(DVBSUB, dvbsub);
REGISTER_PARSER(DVDSUB, dvdsub);
REGISTER_PARSER(DVD_NAV, dvd_nav);

32
libavcodec/dvaudio.h Normal file
View File

@ -0,0 +1,32 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg 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.
*
* FFmpeg 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
static inline int dv_get_audio_sample_count(const uint8_t *buffer, int dsf)
{
int samples = buffer[0] & 0x3f; /* samples in this frame - min samples */
switch ((buffer[3] >> 3) & 0x07) {
case 0:
return samples + (dsf ? 1896 : 1580);
case 1:
return samples + (dsf ? 1742 : 1452);
case 2:
default:
return samples + (dsf ? 1264 : 1053);
}
}

46
libavcodec/dvaudio_parser.c Normal file
View File

@ -0,0 +1,46 @@
/*
* This file is part of FFmpeg.
*
* FFmpeg 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.
*
* FFmpeg 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* Ulead DV audio parser
*
* Determines the duration for each packet.
*/
#include "parser.h"
#include "dvaudio.h"
static int dvaudio_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size)
{
if (buf_size >= 248)
s1->duration = dv_get_audio_sample_count(buf + 244, avctx->block_align == 8640);
/* always return the full packet. this parser isn't doing any splitting or
combining, only packet analysis */
*poutbuf = buf;
*poutbuf_size = buf_size;
return buf_size;
}
AVCodecParser ff_dvaudio_parser = {
.codec_ids = { AV_CODEC_ID_DVAUDIO },
.parser_parse = dvaudio_parse,
};

16
libavcodec/dvaudiodec.c
View File

@ -21,6 +21,7 @@
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "internal.h"
#include "dvaudio.h"
typedef struct DVAudioContext {
int block_size;
@ -66,21 +67,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0;
}
static inline int dv_get_audio_sample_count(const uint8_t *buffer, int dsf)
{
int samples = buffer[0] & 0x3f; /* samples in this frame - min samples */
switch ((buffer[3] >> 3) & 0x07) {
case 0:
return samples + (dsf ? 1896 : 1580);
case 1:
return samples + (dsf ? 1742 : 1452);
case 2:
default:
return samples + (dsf ? 1264 : 1053);
}
}
static inline uint16_t dv_audio_12to16(uint16_t sample)
{
uint16_t shift, result;