diff options
author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-20 10:42:14 +0300 |
---|---|---|
committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-01-20 10:42:14 +0300 |
commit | 7eb68edba73839225fc20f2a3b76317034750ed7 (patch) | |
tree | 9f93b256ebd81d0832c5ff665c35099df5b1be5b | |
parent | c5125e399472c1f4b7c9082258035240e7a9ec3e (diff) |
R3D REDCODE demuxer
Originally committed as revision 16692 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | Changelog | 1 | ||||
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | doc/general.texi | 2 | ||||
-rw-r--r-- | libavformat/allformats.c | 1 | ||||
-rw-r--r-- | libavformat/avformat.h | 4 | ||||
-rw-r--r-- | libavformat/r3d.c | 384 |
6 files changed, 391 insertions, 2 deletions
@@ -144,6 +144,7 @@ version <next> - RV30 and RV40 decoder - QCELP / PureVoice decoder - hybrid WavPack support +- R3D REDCODE demuxer version 0.4.9-pre1: diff --git a/MAINTAINERS b/MAINTAINERS index ad7fa282fc..89c165a5e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -272,6 +272,7 @@ Muxers/Demuxers: oggparseogm.c Mans Rullgard psxstr.c Mike Melanson pva.c Ivo van Poorten + r3d.c Baptiste Coudurier raw.c Michael Niedermayer rl2.c Sascha Sommer rm.c Roberto Togni diff --git a/doc/general.texi b/doc/general.texi index 17d2cd5cb9..fae638944d 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -123,6 +123,8 @@ library: @item raw MPEG-4 video @tab X @tab X @item raw PCM 8/16/32 bits, 32/64-bit floating point, mu-law/A-law @tab X @tab X @item raw Shorten audio @tab @tab X +@item R3D REDCODE @tab @tab X + @tab File format used by RED Digital cameras, contains JPEG 2000 frames and PCM audio. @item RealMedia @tab X @tab X @item RL2 @tab @tab X @tab Audio and video format used in some games by Entertainment Software Partners. diff --git a/libavformat/allformats.c b/libavformat/allformats.c index c7c0cc83e0..a8b2725ac7 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -160,6 +160,7 @@ void av_register_all(void) REGISTER_MUXDEMUX (PCM_U8, pcm_u8); REGISTER_MUXER (PSP, psp); REGISTER_DEMUXER (PVA, pva); + REGISTER_DEMUXER (R3D, r3d); REGISTER_MUXDEMUX (RAWVIDEO, rawvideo); REGISTER_DEMUXER (REDIR, redir); REGISTER_DEMUXER (RL2, rl2); diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 1bd67b6bdf..3c327b0357 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,8 +22,8 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 24 -#define LIBAVFORMAT_VERSION_MICRO 1 +#define LIBAVFORMAT_VERSION_MINOR 25 +#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/libavformat/r3d.c b/libavformat/r3d.c new file mode 100644 index 0000000000..20f41f5944 --- /dev/null +++ b/libavformat/r3d.c @@ -0,0 +1,384 @@ +/* + * R3D REDCODE demuxer + * Copyright (c) 2008 Baptiste Coudurier <baptiste dot coudurier at gmail dot com> + * + * 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 + */ + +//#define DEBUG + +#include "libavutil/intreadwrite.h" +#include "avformat.h" + +typedef struct { + unsigned video_offsets_count; + unsigned *video_offsets; + unsigned rdvo_offset; +} R3DContext; + +typedef struct { + unsigned size; + uint32_t tag; + uint64_t offset; +} Atom; + +static int read_atom(AVFormatContext *s, Atom *atom) +{ + atom->offset = url_ftell(s->pb); + atom->size = get_be32(s->pb); + if (atom->size < 8) + return -1; + atom->tag = get_le32(s->pb); + dprintf(s, "atom %d %.4s offset %#llx\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); + int tmp, tmp2; + + 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); + + tmp = get_be16(s->pb); // unknown + dprintf(s, "unknown1 %d\n", tmp); + + tmp = get_be32(s->pb); + av_set_pts_info(st, 32, 1, tmp); + + tmp = get_be32(s->pb); // filenum + dprintf(s, "filenum %d\n", tmp); + + url_fskip(s->pb, 32); // unknown + + st->codec->width = get_be32(s->pb); + st->codec->height = get_be32(s->pb); + + tmp = get_be16(s->pb); // unknown + dprintf(s, "unknown2 %d\n", tmp); + + st->codec->time_base.den = get_be16(s->pb); + st->codec->time_base.num = get_be16(s->pb); + + tmp = get_byte(s->pb); // audio channels + dprintf(s, "audio channels %d\n", tmp); + if (tmp > 0) { + AVStream *ast = av_new_stream(s, 1); + 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); + } + + st->filename = av_mallocz(258); + if (!st->filename) + return AVERROR(ENOMEM); + get_buffer(s->pb, st->filename, 257); + + dprintf(s, "filename %s\n", st->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); + + return 0; +} + +static int r3d_read_rdvo(AVFormatContext *s, Atom *atom) +{ + R3DContext *r3d = s->priv_data; + AVStream *st = s->streams[0]; + int i; + + r3d->video_offsets_count = (atom->size - 8) / 4; + r3d->video_offsets = av_malloc(atom->size); + if (!r3d->video_offsets) + return AVERROR(ENOMEM); + + for (i = 0; i < r3d->video_offsets_count; i++) { + r3d->video_offsets[i] = get_be32(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]); + } + + 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); + + return 0; +} + +static void r3d_read_reos(AVFormatContext *s) +{ + R3DContext *r3d = s->priv_data; + int 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 + + tmp = get_be32(s->pb); + dprintf(s, "num video chunks %d\n", tmp); + + tmp = get_be32(s->pb); + dprintf(s, "num audio chunks %d\n", tmp); + + url_fskip(s->pb, 6*4); +} + +static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap) +{ + R3DContext *r3d = s->priv_data; + Atom atom; + int ret; + + if (read_atom(s, &atom) < 0) { + av_log(s, AV_LOG_ERROR, "error reading atom\n"); + return -1; + } + if (atom.tag == MKTAG('R','E','D','1')) { + if ((ret = r3d_read_red1(s)) < 0) { + av_log(s, AV_LOG_ERROR, "error parsing 'red1' atom\n"); + return ret; + } + } else { + av_log(s, AV_LOG_ERROR, "could not find 'red1' atom\n"); + return -1; + } + + s->data_offset = url_ftell(s->pb); + dprintf(s, "data offset %#llx\n", s->data_offset); + if (url_is_streamed(s->pb)) + return 0; + // find REOB/REOF/REOS to load index + url_fseek(s->pb, url_fsize(s->pb)-48-8, SEEK_SET); + if (read_atom(s, &atom) < 0) + av_log(s, AV_LOG_ERROR, "error reading end atom\n"); + + if (atom.tag != MKTAG('R','E','O','B') && + atom.tag != MKTAG('R','E','O','F') && + atom.tag != MKTAG('R','E','O','S')) + goto out; + + r3d_read_reos(s); + + if (r3d->rdvo_offset) { + url_fseek(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')) { + if (r3d_read_rdvo(s, &atom) < 0) + av_log(s, AV_LOG_ERROR, "error parsing 'rdvo' atom\n"); + } + } + + out: + url_fseek(s->pb, s->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); + unsigned dts; + + dts = get_be32(s->pb); + + tmp = get_be32(s->pb); + dprintf(s, "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 = get_be16(s->pb); // unknown + dprintf(s, "unknown %d\n", tmp); + + if (tmp > 4) { + tmp = get_be16(s->pb); // unknown + dprintf(s, "unknown %d\n", tmp); + + tmp = get_be16(s->pb); // unknown + dprintf(s, "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 = get_be32(s->pb); + dprintf(s, "metadata len %d\n", tmp); + } + tmp = atom->size - 8 - (url_ftell(s->pb) - pos); + if (tmp < 0) + return -1; + + if (av_get_packet(s->pb, pkt, tmp) != tmp) { + 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) + 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); + + 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); + unsigned dts; + + dts = get_be32(s->pb); + + st->codec->sample_rate = get_be32(s->pb); + + samples = get_be32(s->pb); + + tmp = get_be32(s->pb); + dprintf(s, "packet num %d\n", tmp); + + tmp = get_be16(s->pb); // unkown + dprintf(s, "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 = get_be32(s->pb); // unknown + dprintf(s, "unknown %d\n", tmp); + + size = atom->size - 8 - (url_ftell(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; + } + + 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); + + return 0; +} + +static int r3d_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + Atom atom; + int err = 0; + + while (!err) { + if (read_atom(s, &atom) < 0) { + err = -1; + break; + } + switch (atom.tag) { + case MKTAG('R','E','D','V'): + if (s->streams[0]->discard == AVDISCARD_ALL) + goto skip; + if (!(err = r3d_read_redv(s, pkt, &atom))) + return 0; + break; + case MKTAG('R','E','D','A'): + if (s->nb_streams < 2) + return -1; + if (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); + } + } + return err; +} + +static int r3d_probe(AVProbeData *p) +{ + if (AV_RL32(p->buf + 4) == MKTAG('R','E','D','1')) + return AVPROBE_SCORE_MAX; + return 0; +} + +static int r3d_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags) +{ + AVStream *st = s->streams[0]; // video stream + R3DContext *r3d = s->priv_data; + int frame_num; + + if (!st->codec->time_base.num || !st->time_base.den) + 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); + + if (frame_num < r3d->video_offsets_count) { + url_fseek(s->pb, r3d->video_offsets_count, SEEK_SET); + } else { + av_log(s, AV_LOG_ERROR, "could not seek to frame %d\n", frame_num); + return -1; + } + + return 0; +} + +static int r3d_close(AVFormatContext *s) +{ + R3DContext *r3d = s->priv_data; + + av_freep(&r3d->video_offsets); + + 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, +}; |