* LXF demuxer
* Copyright (c) 2010 Tomas Härdin
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * 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.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * 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 FFmpeg; if not, write to the Free Software
+ * 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/intreadwrite.h"
#include "avformat.h"
-#include "riff.h"
+#include "internal.h"
#define LXF_PACKET_HEADER_SIZE 60
#define LXF_HEADER_DATA_SIZE 120
#define LXF_MAX_AUDIO_PACKET (8008*15*4) ///< 15-channel 32-bit NTSC audio frame
static const AVCodecTag lxf_tags[] = {
- { CODEC_ID_MJPEG, 0 },
- { CODEC_ID_MPEG1VIDEO, 1 },
- { CODEC_ID_MPEG2VIDEO, 2 }, //MpMl, 4:2:0
- { CODEC_ID_MPEG2VIDEO, 3 }, //MpPl, 4:2:2
- { CODEC_ID_DVVIDEO, 4 }, //DV25
- { CODEC_ID_DVVIDEO, 5 }, //DVCPRO
- { CODEC_ID_DVVIDEO, 6 }, //DVCPRO50
- { CODEC_ID_RAWVIDEO, 7 }, //PIX_FMT_ARGB, where alpha is used for chroma keying
- { CODEC_ID_RAWVIDEO, 8 }, //16-bit chroma key
- { CODEC_ID_MPEG2VIDEO, 9 }, //4:2:2 CBP ("Constrained Bytes per Gop")
- { CODEC_ID_NONE, 0 },
+ { AV_CODEC_ID_MJPEG, 0 },
+ { AV_CODEC_ID_MPEG1VIDEO, 1 },
+ { AV_CODEC_ID_MPEG2VIDEO, 2 }, //MpMl, 4:2:0
+ { AV_CODEC_ID_MPEG2VIDEO, 3 }, //MpPl, 4:2:2
+ { AV_CODEC_ID_DVVIDEO, 4 }, //DV25
+ { AV_CODEC_ID_DVVIDEO, 5 }, //DVCPRO
+ { AV_CODEC_ID_DVVIDEO, 6 }, //DVCPRO50
+ { AV_CODEC_ID_RAWVIDEO, 7 }, //AV_PIX_FMT_ARGB, where alpha is used for chroma keying
+ { AV_CODEC_ID_RAWVIDEO, 8 }, //16-bit chroma key
+ { AV_CODEC_ID_MPEG2VIDEO, 9 }, //4:2:2 CBP ("Constrained Bytes per Gop")
+ { AV_CODEC_ID_NONE, 0 },
};
typedef struct {
uint8_t buf[LXF_IDENT_LENGTH];
int ret;
- if ((ret = get_buffer(s->pb, buf, LXF_IDENT_LENGTH)) != LXF_IDENT_LENGTH)
+ if ((ret = avio_read(s->pb, buf, LXF_IDENT_LENGTH)) != LXF_IDENT_LENGTH)
return ret < 0 ? ret : AVERROR_EOF;
while (memcmp(buf, LXF_IDENT, LXF_IDENT_LENGTH)) {
- if (url_feof(s->pb))
+ if (s->pb->eof_reached)
return AVERROR_EOF;
memmove(buf, &buf[1], LXF_IDENT_LENGTH-1);
- buf[LXF_IDENT_LENGTH-1] = get_byte(s->pb);
+ buf[LXF_IDENT_LENGTH-1] = avio_r8(s->pb);
}
memcpy(header, LXF_IDENT, LXF_IDENT_LENGTH);
*/
static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *format)
{
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
int track_size, samples, ret;
AVStream *st;
return ret;
//read the rest of the packet header
- if ((ret = get_buffer(pb, header + LXF_IDENT_LENGTH,
+ if ((ret = avio_read(pb, header + LXF_IDENT_LENGTH,
LXF_PACKET_HEADER_SIZE - LXF_IDENT_LENGTH)) !=
LXF_PACKET_HEADER_SIZE - LXF_IDENT_LENGTH) {
return ret < 0 ? ret : AVERROR_EOF;
case 0:
//video
//skip VBI data and metadata
- url_fskip(pb, (int64_t)(uint32_t)AV_RL32(&header[44]) +
+ avio_skip(pb, (int64_t)(uint32_t)AV_RL32(&header[44]) +
(int64_t)(uint32_t)AV_RL32(&header[52]));
break;
case 1:
}
switch (st->codec->bits_per_coded_sample) {
- case 16: st->codec->codec_id = CODEC_ID_PCM_S16LE; break;
- case 20: st->codec->codec_id = CODEC_ID_PCM_LXF; break;
- case 24: st->codec->codec_id = CODEC_ID_PCM_S24LE; break;
- case 32: st->codec->codec_id = CODEC_ID_PCM_S32LE; break;
+ case 16: st->codec->codec_id = AV_CODEC_ID_PCM_S16LE; break;
+ case 20: st->codec->codec_id = AV_CODEC_ID_PCM_LXF; break;
+ case 24: st->codec->codec_id = AV_CODEC_ID_PCM_S24LE; break;
+ case 32: st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; break;
default:
av_log(s, AV_LOG_WARNING,
"only 16-, 20-, 24- and 32-bit PCM currently supported\n");
//use audio packet size to determine video standard
//for NTSC we have one 8008-sample audio frame per five video frames
if (samples == LXF_SAMPLERATE * 5005 / 30000) {
- av_set_pts_info(s->streams[0], 64, 1001, 30000);
+ avpriv_set_pts_info(s->streams[0], 64, 1001, 30000);
} else {
//assume PAL, but warn if we don't have 1920 samples
if (samples != LXF_SAMPLERATE / 25)
av_log(s, AV_LOG_WARNING,
"video doesn't seem to be PAL or NTSC. guessing PAL\n");
- av_set_pts_info(s->streams[0], 64, 1, 25);
+ avpriv_set_pts_info(s->streams[0], 64, 1, 25);
}
//TODO: warning if track mask != (1 << channels) - 1?
return ret;
}
-static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int lxf_read_header(AVFormatContext *s)
{
LXFDemuxContext *lxf = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
uint8_t header[LXF_PACKET_HEADER_SIZE], header_data[LXF_HEADER_DATA_SIZE];
int ret;
AVStream *st;
return AVERROR_INVALIDDATA;
}
- if ((ret = get_buffer(pb, header_data, LXF_HEADER_DATA_SIZE)) != LXF_HEADER_DATA_SIZE)
+ if ((ret = avio_read(pb, header_data, LXF_HEADER_DATA_SIZE)) != LXF_HEADER_DATA_SIZE)
return ret < 0 ? ret : AVERROR_EOF;
- if (!(st = av_new_stream(s, 0)))
- return AVERROR_NOMEM;
+ if (!(st = avformat_new_stream(s, NULL)))
+ return AVERROR(ENOMEM);
st->duration = AV_RL32(&header_data[32]);
video_params = AV_RL32(&header_data[40]);
av_log(s, AV_LOG_WARNING, "VBI data not yet supported\n");
if ((lxf->channels = (disk_params >> 2) & 0xF)) {
- if (!(st = av_new_stream(s, 1)))
- return AVERROR_NOMEM;
+ if (!(st = avformat_new_stream(s, NULL)))
+ return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->sample_rate = LXF_SAMPLERATE;
st->codec->channels = lxf->channels;
- av_set_pts_info(st, 64, 1, st->codec->sample_rate);
+ avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
}
if (format == 1) {
//skip extended field data
- url_fskip(s->pb, (uint32_t)AV_RL32(&header[40]));
+ avio_skip(s->pb, (uint32_t)AV_RL32(&header[40]));
}
return 0;
static int lxf_read_packet(AVFormatContext *s, AVPacket *pkt)
{
LXFDemuxContext *lxf = s->priv_data;
- ByteIOContext *pb = s->pb;
+ AVIOContext *pb = s->pb;
uint8_t header[LXF_PACKET_HEADER_SIZE], *buf;
AVStream *ast = NULL;
uint32_t stream, format;
return ret2;
//read non-20-bit audio data into lxf->temp so we can deplanarize it
- buf = ast && ast->codec->codec_id != CODEC_ID_PCM_LXF ? lxf->temp : pkt->data;
+ buf = ast && ast->codec->codec_id != AV_CODEC_ID_PCM_LXF ? lxf->temp : pkt->data;
- if ((ret2 = get_buffer(pb, buf, ret)) != ret) {
+ if ((ret2 = avio_read(pb, buf, ret)) != ret) {
av_free_packet(pkt);
return ret2 < 0 ? ret2 : AVERROR_EOF;
}
pkt->stream_index = stream;
if (ast) {
- if(ast->codec->codec_id != CODEC_ID_PCM_LXF)
+ if(ast->codec->codec_id != AV_CODEC_ID_PCM_LXF)
deplanarize(lxf, ast, pkt->data, ret);
} else {
//picture type (0 = closed I, 1 = open I, 2 = P, 3 = B)
return ret;
}
-AVInputFormat lxf_demuxer = {
+AVInputFormat ff_lxf_demuxer = {
.name = "lxf",
- .long_name = NULL_IF_CONFIG_SMALL("VR native stream format (LXF)"),
+ .long_name = NULL_IF_CONFIG_SMALL("VR native stream (LXF)"),
.priv_data_size = sizeof(LXFDemuxContext),
.read_probe = lxf_probe,
.read_header = lxf_read_header,
.read_packet = lxf_read_packet,
.codec_tag = (const AVCodecTag* const []){lxf_tags, 0},
};
-