* R3D REDCODE demuxer
* Copyright (c) 2008 Baptiste Coudurier <baptiste dot coudurier at gmail dot com>
*
- * 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
*/
-//#define DEBUG
-
#include "libavutil/intreadwrite.h"
+#include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
#include "avformat.h"
+#include "internal.h"
-typedef struct {
+typedef struct R3DContext {
unsigned video_offsets_count;
unsigned *video_offsets;
unsigned rdvo_offset;
+
+ int audio_channels;
} R3DContext;
-typedef struct {
+typedef struct Atom {
unsigned size;
uint32_t tag;
uint64_t offset;
static int read_atom(AVFormatContext *s, Atom *atom)
{
- atom->offset = url_ftell(s->pb);
- atom->size = get_be32(s->pb);
+ atom->offset = avio_tell(s->pb);
+ atom->size = avio_rb32(s->pb);
if (atom->size < 8)
return -1;
- atom->tag = get_le32(s->pb);
- dprintf(s, "atom %d %.4s offset %#llx\n",
+ atom->tag = avio_rl32(s->pb);
+ av_log(s, AV_LOG_TRACE, "atom %u %.4s offset %#"PRIx64"\n",
atom->size, (char*)&atom->tag, atom->offset);
return atom->size;
}
static int r3d_read_red1(AVFormatContext *s)
{
- AVStream *st = av_new_stream(s, 0);
+ AVStream *st = avformat_new_stream(s, NULL);
+ R3DContext *r3d = s->priv_data;
char filename[258];
- int tmp, tmp2;
+ int tmp;
+ int av_unused tmp2;
+ AVRational framerate;
if (!st)
- return -1;
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- st->codec->codec_id = CODEC_ID_JPEG2000;
-
- tmp = get_byte(s->pb); // major version
- tmp2 = get_byte(s->pb); // minor version
- dprintf(s, "version %d.%d\n", tmp, tmp2);
+ return AVERROR(ENOMEM);
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_JPEG2000;
- tmp = get_be16(s->pb); // unknown
- dprintf(s, "unknown1 %d\n", tmp);
+ tmp = avio_r8(s->pb); // major version
+ tmp2 = avio_r8(s->pb); // minor version
+ av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
- tmp = get_be32(s->pb);
- av_set_pts_info(st, 32, 1, tmp);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown1 %d\n", tmp);
- tmp = get_be32(s->pb); // filenum
- dprintf(s, "filenum %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ avpriv_set_pts_info(st, 32, 1, tmp);
- url_fskip(s->pb, 32); // unknown
+ tmp = avio_rb32(s->pb); // filenum
+ av_log(s, AV_LOG_TRACE, "filenum %d\n", tmp);
- st->codec->width = get_be32(s->pb);
- st->codec->height = get_be32(s->pb);
+ avio_skip(s->pb, 32); // unknown
- tmp = get_be16(s->pb); // unknown
- dprintf(s, "unknown2 %d\n", tmp);
+ st->codecpar->width = avio_rb32(s->pb);
+ st->codecpar->height = avio_rb32(s->pb);
- st->codec->time_base.den = get_be16(s->pb);
- st->codec->time_base.num = get_be16(s->pb);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown2 %d\n", tmp);
- tmp = get_byte(s->pb); // audio channels
- dprintf(s, "audio channels %d\n", tmp);
- if (tmp > 0) {
- AVStream *ast = av_new_stream(s, 1);
- if (!ast)
- return AVERROR(ENOMEM);
- ast->codec->codec_type = CODEC_TYPE_AUDIO;
- ast->codec->codec_id = CODEC_ID_PCM_S32BE;
- ast->codec->channels = tmp;
- av_set_pts_info(ast, 32, 1, st->time_base.den);
+ framerate.num = avio_rb16(s->pb);
+ framerate.den = avio_rb16(s->pb);
+ if (framerate.num > 0 && framerate.den > 0) {
+ st->avg_frame_rate = framerate;
}
- get_buffer(s->pb, filename, 257);
+ r3d->audio_channels = avio_r8(s->pb); // audio channels
+ av_log(s, AV_LOG_TRACE, "audio channels %d\n", tmp);
+
+ avio_read(s->pb, filename, 257);
filename[sizeof(filename)-1] = 0;
- av_metadata_set(&st->metadata, "filename", filename);
+ av_dict_set(&st->metadata, "filename", filename, 0);
- dprintf(s, "filename %s\n", filename);
- dprintf(s, "resolution %dx%d\n", st->codec->width, st->codec->height);
- dprintf(s, "timescale %d\n", st->time_base.den);
- dprintf(s, "frame rate %d/%d\n",
- st->codec->time_base.num, st->codec->time_base.den);
+ av_log(s, AV_LOG_TRACE, "filename %s\n", filename);
+ av_log(s, AV_LOG_TRACE, "resolution %dx%d\n", st->codecpar->width, st->codecpar->height);
+ av_log(s, AV_LOG_TRACE, "timescale %d\n", st->time_base.den);
+ av_log(s, AV_LOG_TRACE, "frame rate %d/%d\n",
+ framerate.num, framerate.den);
return 0;
}
return AVERROR(ENOMEM);
for (i = 0; i < r3d->video_offsets_count; i++) {
- r3d->video_offsets[i] = get_be32(s->pb);
+ r3d->video_offsets[i] = avio_rb32(s->pb);
if (!r3d->video_offsets[i]) {
r3d->video_offsets_count = i;
break;
}
- dprintf(s, "video offset %d: %#x\n", i, r3d->video_offsets[i]);
+ av_log(s, AV_LOG_TRACE, "video offset %d: %#x\n", i, r3d->video_offsets[i]);
}
- if (st->codec->time_base.den)
- st->duration = (uint64_t)r3d->video_offsets_count*
- st->time_base.den*st->codec->time_base.num/st->codec->time_base.den;
- dprintf(s, "duration %lld\n", st->duration);
+ if (st->avg_frame_rate.num)
+ st->duration = av_rescale_q(r3d->video_offsets_count,
+ (AVRational){st->avg_frame_rate.den,
+ st->avg_frame_rate.num},
+ st->time_base);
+ av_log(s, AV_LOG_TRACE, "duration %"PRId64"\n", st->duration);
return 0;
}
static void r3d_read_reos(AVFormatContext *s)
{
R3DContext *r3d = s->priv_data;
- int tmp;
+ int av_unused tmp;
- r3d->rdvo_offset = get_be32(s->pb);
- get_be32(s->pb); // rdvs offset
- get_be32(s->pb); // rdao offset
- get_be32(s->pb); // rdas offset
+ r3d->rdvo_offset = avio_rb32(s->pb);
+ avio_rb32(s->pb); // rdvs offset
+ avio_rb32(s->pb); // rdao offset
+ avio_rb32(s->pb); // rdas offset
- tmp = get_be32(s->pb);
- dprintf(s, "num video chunks %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "num video chunks %d\n", tmp);
- tmp = get_be32(s->pb);
- dprintf(s, "num audio chunks %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "num audio chunks %d\n", tmp);
- url_fskip(s->pb, 6*4);
+ avio_skip(s->pb, 6*4);
}
-static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int r3d_read_header(AVFormatContext *s)
{
R3DContext *r3d = s->priv_data;
Atom atom;
return -1;
}
- s->data_offset = url_ftell(s->pb);
- dprintf(s, "data offset %#llx\n", s->data_offset);
- if (url_is_streamed(s->pb))
+ /* we cannot create the audio stream now because we do not know the
+ * sample rate */
+ if (r3d->audio_channels)
+ s->ctx_flags |= AVFMTCTX_NOHEADER;
+
+ s->internal->data_offset = avio_tell(s->pb);
+ av_log(s, AV_LOG_TRACE, "data offset %#"PRIx64"\n", s->internal->data_offset);
+ if (!s->pb->seekable)
return 0;
// find REOB/REOF/REOS to load index
- url_fseek(s->pb, url_fsize(s->pb)-48-8, SEEK_SET);
+ avio_seek(s->pb, avio_size(s->pb)-48-8, SEEK_SET);
if (read_atom(s, &atom) < 0)
av_log(s, AV_LOG_ERROR, "error reading end atom\n");
r3d_read_reos(s);
if (r3d->rdvo_offset) {
- url_fseek(s->pb, r3d->rdvo_offset, SEEK_SET);
+ avio_seek(s->pb, r3d->rdvo_offset, SEEK_SET);
if (read_atom(s, &atom) < 0)
av_log(s, AV_LOG_ERROR, "error reading 'rdvo' atom\n");
if (atom.tag == MKTAG('R','D','V','O')) {
}
out:
- url_fseek(s->pb, s->data_offset, SEEK_SET);
+ avio_seek(s->pb, s->internal->data_offset, SEEK_SET);
return 0;
}
static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
{
AVStream *st = s->streams[0];
- int tmp, tmp2;
- uint64_t pos = url_ftell(s->pb);
+ int tmp;
+ int av_unused tmp2;
+ int64_t pos = avio_tell(s->pb);
unsigned dts;
+ int ret;
- dts = get_be32(s->pb);
+ dts = avio_rb32(s->pb);
- tmp = get_be32(s->pb);
- dprintf(s, "frame num %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "frame num %d\n", tmp);
- tmp = get_byte(s->pb); // major version
- tmp2 = get_byte(s->pb); // minor version
- dprintf(s, "version %d.%d\n", tmp, tmp2);
+ tmp = avio_r8(s->pb); // major version
+ tmp2 = avio_r8(s->pb); // minor version
+ av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
- tmp = get_be16(s->pb); // unknown
- dprintf(s, "unknown %d\n", tmp);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
if (tmp > 4) {
- tmp = get_be16(s->pb); // unknown
- dprintf(s, "unknown %d\n", tmp);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
- tmp = get_be16(s->pb); // unknown
- dprintf(s, "unknown %d\n", tmp);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
- tmp = get_be32(s->pb);
- dprintf(s, "width %d\n", tmp);
- tmp = get_be32(s->pb);
- dprintf(s, "height %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "width %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "height %d\n", tmp);
- tmp = get_be32(s->pb);
- dprintf(s, "metadata len %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "metadata len %d\n", tmp);
}
- tmp = atom->size - 8 - (url_ftell(s->pb) - pos);
+ tmp = atom->size - 8 - (avio_tell(s->pb) - pos);
if (tmp < 0)
return -1;
-
- if (av_get_packet(s->pb, pkt, tmp) != tmp) {
+ ret = av_get_packet(s->pb, pkt, tmp);
+ if (ret < 0) {
av_log(s, AV_LOG_ERROR, "error reading video packet\n");
return -1;
}
pkt->stream_index = 0;
pkt->dts = dts;
- if (st->codec->time_base.den)
+ if (st->avg_frame_rate.num)
pkt->duration = (uint64_t)st->time_base.den*
- st->codec->time_base.num/st->codec->time_base.den;
- dprintf(s, "pkt dts %lld duration %d\n", pkt->dts, pkt->duration);
+ st->avg_frame_rate.den/st->avg_frame_rate.num;
+ av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %"PRId64"\n", pkt->dts, pkt->duration);
return 0;
}
static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
{
- AVStream *st = s->streams[1];
- int tmp, tmp2, samples, size;
- uint64_t pos = url_ftell(s->pb);
+ R3DContext *r3d = s->priv_data;
+ AVStream *st;
+ int av_unused tmp, tmp2;
+ int samples, size;
+ int64_t pos = avio_tell(s->pb);
unsigned dts;
+ int ret;
+
+ if (s->nb_streams < 2) {
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+ st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
+ st->codecpar->codec_id = AV_CODEC_ID_PCM_S32BE;
+ st->codecpar->channels = r3d->audio_channels;
+ avpriv_set_pts_info(st, 32, 1, s->streams[0]->time_base.den);
+ } else {
+ st = s->streams[1];
+ }
- dts = get_be32(s->pb);
+ dts = avio_rb32(s->pb);
- st->codec->sample_rate = get_be32(s->pb);
+ st->codecpar->sample_rate = avio_rb32(s->pb);
+ if (st->codecpar->sample_rate <= 0) {
+ av_log(s, AV_LOG_ERROR, "Bad sample rate\n");
+ return AVERROR_INVALIDDATA;
+ }
- samples = get_be32(s->pb);
+ samples = avio_rb32(s->pb);
- tmp = get_be32(s->pb);
- dprintf(s, "packet num %d\n", tmp);
+ tmp = avio_rb32(s->pb);
+ av_log(s, AV_LOG_TRACE, "packet num %d\n", tmp);
- tmp = get_be16(s->pb); // unkown
- dprintf(s, "unknown %d\n", tmp);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
- tmp = get_byte(s->pb); // major version
- tmp2 = get_byte(s->pb); // minor version
- dprintf(s, "version %d.%d\n", tmp, tmp2);
+ tmp = avio_r8(s->pb); // major version
+ tmp2 = avio_r8(s->pb); // minor version
+ av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
- tmp = get_be32(s->pb); // unknown
- dprintf(s, "unknown %d\n", tmp);
+ tmp = avio_rb32(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
- size = atom->size - 8 - (url_ftell(s->pb) - pos);
+ size = atom->size - 8 - (avio_tell(s->pb) - pos);
if (size < 0)
return -1;
- if (av_get_packet(s->pb, pkt, size) != size) {
- av_log(s, AV_LOG_ERROR, "error reading video packet\n");
- return -1;
+ ret = av_get_packet(s->pb, pkt, size);
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "error reading audio packet\n");
+ return ret;
}
pkt->stream_index = 1;
pkt->dts = dts;
- pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate);
- dprintf(s, "pkt dts %lld duration %d samples %d sample rate %d\n",
- pkt->dts, pkt->duration, samples, st->codec->sample_rate);
+ pkt->duration = av_rescale(samples, st->time_base.den, st->codecpar->sample_rate);
+ av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %"PRId64" samples %d sample rate %d\n",
+ pkt->dts, pkt->duration, samples, st->codecpar->sample_rate);
return 0;
}
static int r3d_read_packet(AVFormatContext *s, AVPacket *pkt)
{
+ R3DContext *r3d = s->priv_data;
Atom atom;
int err = 0;
return 0;
break;
case MKTAG('R','E','D','A'):
- if (s->nb_streams < 2)
+ if (!r3d->audio_channels)
return -1;
- if (s->streams[1]->discard == AVDISCARD_ALL)
+ if (s->nb_streams >= 2 && s->streams[1]->discard == AVDISCARD_ALL)
goto skip;
if (!(err = r3d_read_reda(s, pkt, &atom)))
return 0;
break;
default:
skip:
- url_fskip(s->pb, atom.size-8);
+ avio_skip(s->pb, atom.size-8);
}
}
return err;
R3DContext *r3d = s->priv_data;
int frame_num;
- if (!st->codec->time_base.num || !st->time_base.den)
+ if (!st->avg_frame_rate.num)
return -1;
- frame_num = sample_time*st->codec->time_base.den/
- ((int64_t)st->codec->time_base.num*st->time_base.den);
- dprintf(s, "seek frame num %d timestamp %lld\n", frame_num, sample_time);
+ frame_num = av_rescale_q(sample_time, st->time_base,
+ (AVRational){st->avg_frame_rate.den, st->avg_frame_rate.num});
+ av_log(s, AV_LOG_TRACE, "seek frame num %d timestamp %"PRId64"\n",
+ frame_num, sample_time);
if (frame_num < r3d->video_offsets_count) {
- url_fseek(s->pb, r3d->video_offsets_count, SEEK_SET);
+ if (avio_seek(s->pb, r3d->video_offsets_count, SEEK_SET) < 0)
+ return -1;
} else {
av_log(s, AV_LOG_ERROR, "could not seek to frame %d\n", frame_num);
return -1;
return 0;
}
-AVInputFormat r3d_demuxer = {
- "r3d",
- NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
- sizeof(R3DContext),
- r3d_probe,
- r3d_read_header,
- r3d_read_packet,
- r3d_close,
- r3d_seek,
+AVInputFormat ff_r3d_demuxer = {
+ .name = "r3d",
+ .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D"),
+ .priv_data_size = sizeof(R3DContext),
+ .read_probe = r3d_probe,
+ .read_header = r3d_read_header,
+ .read_packet = r3d_read_packet,
+ .read_close = r3d_close,
+ .read_seek = r3d_seek,
};
projects / ffmpeg / blobdiff