diff options
Diffstat (limited to 'libavcodec/tak.h')
| -rw-r--r-- | libavcodec/tak.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/libavcodec/tak.h b/libavcodec/tak.h index c752062521..dc45a8c070 100644 --- a/libavcodec/tak.h +++ b/libavcodec/tak.h @@ -2,20 +2,20 @@ * TAK decoder/demuxer common code * Copyright (c) 2012 Paul B Mahol * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * 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. * - * Libav is distributed in the hope that it will be useful, + * 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -30,7 +30,7 @@ #include <stdint.h> #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" #define TAK_FORMAT_DATA_TYPE_BITS 3 #define TAK_FORMAT_SAMPLE_RATE_BITS 18 @@ -98,7 +98,7 @@ enum TAKCodecType { TAK_CODEC_MONO_STEREO = 2, - TAK_CODEC_MULTICHANNEL = 4 + TAK_CODEC_MULTICHANNEL = 4, }; enum TAKMetaDataType { @@ -139,27 +139,28 @@ typedef struct TAKStreamInfo { int64_t samples; } TAKStreamInfo; -void ff_tak_init_crc(void); - int ff_tak_check_crc(const uint8_t *buf, unsigned int buf_size); /** * Parse the Streaminfo metadata block. - * @param[in] bc pointer to BitstreamContext * @param[out] s storage for parsed information + * @param[in] buf input buffer + * @param[in] size size of input buffer in bytes + * @return non-zero on error, 0 if OK */ -void avpriv_tak_parse_streaminfo(BitstreamContext *bc, TAKStreamInfo *s); +int avpriv_tak_parse_streaminfo(TAKStreamInfo *s, const uint8_t *buf, int size); + +void ff_tak_parse_streaminfo(TAKStreamInfo *s, GetBitContext *gb); /** * Validate and decode a frame header. * @param avctx AVCodecContext to use as av_log() context - * @param[in] bc BitstreamContext from which to read frame header + * @param[in] gb GetBitContext from which to read frame header * @param[out] s frame information * @param log_level_offset log level offset, can be used to silence * error messages. * @return non-zero on error, 0 if OK */ -int ff_tak_decode_frame_header(AVCodecContext *avctx, BitstreamContext *bc, +int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, TAKStreamInfo *s, int log_level_offset); - #endif /* AVCODEC_TAK_H */ |