Commit e955f5ac authored by Paul B Mahol's avatar Paul B Mahol

avformat: add binka demuxer

parent b12e713b
......@@ -64,6 +64,7 @@ version <next>:
- colorcontrast filter
- PFM encoder
- colorcorrect filter
- binka demuxer
version 4.3:
......
......@@ -129,6 +129,7 @@ OBJS-$(CONFIG_AVS3_DEMUXER) += avs3dec.o rawdec.o
OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o
OBJS-$(CONFIG_BINK_DEMUXER) += bink.o
OBJS-$(CONFIG_BINKA_DEMUXER) += binka.o
OBJS-$(CONFIG_BINTEXT_DEMUXER) += bintext.o sauce.o
OBJS-$(CONFIG_BIT_DEMUXER) += bit.o
OBJS-$(CONFIG_BIT_MUXER) += bit.o
......
......@@ -94,6 +94,7 @@ extern AVInputFormat ff_bethsoftvid_demuxer;
extern AVInputFormat ff_bfi_demuxer;
extern AVInputFormat ff_bintext_demuxer;
extern AVInputFormat ff_bink_demuxer;
extern AVInputFormat ff_binka_demuxer;
extern AVInputFormat ff_bit_demuxer;
extern AVOutputFormat ff_bit_muxer;
extern AVInputFormat ff_bmv_demuxer;
......
/*
* Copyright (c) 2021 Paul B Mahol
*
* 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
*/
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
static int binka_probe(const AVProbeData *p)
{
if (AV_RB32(p->buf) == MKBETAG('1', 'F', 'C', 'B') &&
(p->buf[4] == 1 || p->buf[4] == 2))
return AVPROBE_SCORE_MAX;
return 0;
}
static int binka_read_header(AVFormatContext *s)
{
AVIOContext *pb = s->pb;
AVStream *st;
int entries, offset;
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
avio_skip(pb, 5);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_DCT;
st->codecpar->channels = avio_r8(pb);
st->codecpar->sample_rate = avio_rl16(pb);
st->duration = avio_rl32(pb);
avio_skip(pb, 8);
entries = avio_rl16(pb);
offset = entries * 2 + 2;
avio_skip(pb, offset);
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);
return 0;
}
static int binka_read_packet(AVFormatContext *s, AVPacket *pkt)
{
AVIOContext *pb = s->pb;
AVStream *st = s->streams[0];
int64_t pos;
int pkt_size;
int ret;
if (avio_feof(pb))
return AVERROR_EOF;
pos = avio_tell(pb);
avio_skip(pb, 2);
pkt_size = avio_rl16(pb) + 4;
if (pkt_size <= 4)
return AVERROR(EIO);
ret = av_new_packet(pkt, pkt_size);
if (ret < 0)
return ret;
avio_read(pb, pkt->data + 4, pkt_size - 4);
AV_WL32(pkt->data, pkt_size);
pkt->pos = pos;
pkt->stream_index = 0;
pkt->duration = av_get_audio_frame_duration2(st->codecpar, 0);
return 0;
}
AVInputFormat ff_binka_demuxer = {
.name = "binka",
.long_name = NULL_IF_CONFIG_SMALL("Bink Audio"),
.read_probe = binka_probe,
.read_header = binka_read_header,
.read_packet = binka_read_packet,
.flags = AVFMT_GENERIC_INDEX,
.extensions = "binka",
};
......@@ -32,8 +32,8 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 65
#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_MINOR 66
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment