RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37' 

* commit '2d0432d918a71468419b7ac1e543ab3b399d3d37':
  vocdec: put the code not shared with other demuxers under appropriate ifdef

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-01 17:14:46 +01:00
parent 95daa9e09a 2d0432d918
commit 5c06fc4bd8
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libavformat/vocdec.c
View File

@ -23,44 +23,6 @@
#include "voc.h"
#include "internal.h"
static int voc_probe(AVProbeData *p)
{
int version, check;
if (memcmp(p->buf, ff_voc_magic, sizeof(ff_voc_magic) - 1))
return 0;
version = AV_RL16(p->buf + 22);
check = AV_RL16(p->buf + 24);
if (~version + 0x1234 != check)
return 10;
return AVPROBE_SCORE_MAX;
}
static int voc_read_header(AVFormatContext *s)
{
VocDecContext *voc = s->priv_data;
AVIOContext *pb = s->pb;
int header_size;
AVStream *st;
avio_skip(pb, 20);
header_size = avio_rl16(pb) - 22;
if (header_size != 4) {
av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size);
return AVERROR(ENOSYS);
}
avio_skip(pb, header_size);
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
voc->remaining_size = 0;
return 0;
}
int
ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
{
@ -178,6 +140,44 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
return ret;
}
#if CONFIG_VOC_DEMUXER
static int voc_probe(AVProbeData *p)
{
int version, check;
if (memcmp(p->buf, ff_voc_magic, sizeof(ff_voc_magic) - 1))
return 0;
version = AV_RL16(p->buf + 22);
check = AV_RL16(p->buf + 24);
if (~version + 0x1234 != check)
return 10;
return AVPROBE_SCORE_MAX;
}
static int voc_read_header(AVFormatContext *s)
{
VocDecContext *voc = s->priv_data;
AVIOContext *pb = s->pb;
int header_size;
AVStream *st;
avio_skip(pb, 20);
header_size = avio_rl16(pb) - 22;
if (header_size != 4) {
av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size);
return AVERROR(ENOSYS);
}
avio_skip(pb, header_size);
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
voc->remaining_size = 0;
return 0;
}
static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
{
return ff_voc_get_packet(s, pkt, s->streams[0], 0);
@ -215,3 +215,4 @@ AVInputFormat ff_voc_demuxer = {
.read_seek = voc_read_seek,
.codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
};
#endif /* CONFIG_VOC_DEMUXER */