* 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;
} R3DContext;
-typedef struct {
+typedef struct Atom {
unsigned size;
uint32_t tag;
uint64_t offset;
if (atom->size < 8)
return -1;
atom->tag = avio_rl32(s->pb);
- av_dlog(s, "atom %u %.4s offset %#"PRIx64"\n",
+ av_log(s, AV_LOG_TRACE, "atom %u %.4s offset %#"PRIx64"\n",
atom->size, (char*)&atom->tag, atom->offset);
return atom->size;
}
char filename[258];
int tmp;
int av_unused tmp2;
+ AVRational framerate;
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = CODEC_ID_JPEG2000;
+ st->codec->codec_id = AV_CODEC_ID_JPEG2000;
tmp = avio_r8(s->pb); // major version
tmp2 = avio_r8(s->pb); // minor version
- av_dlog(s, "version %d.%d\n", tmp, tmp2);
+ av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
tmp = avio_rb16(s->pb); // unknown
- av_dlog(s, "unknown1 %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "unknown1 %d\n", tmp);
tmp = avio_rb32(s->pb);
avpriv_set_pts_info(st, 32, 1, tmp);
tmp = avio_rb32(s->pb); // filenum
- av_dlog(s, "filenum %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "filenum %d\n", tmp);
avio_skip(s->pb, 32); // unknown
st->codec->height = avio_rb32(s->pb);
tmp = avio_rb16(s->pb); // unknown
- av_dlog(s, "unknown2 %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "unknown2 %d\n", tmp);
- st->codec->time_base.den = avio_rb16(s->pb);
- st->codec->time_base.num = avio_rb16(s->pb);
+ framerate.num = avio_rb16(s->pb);
+ framerate.den = avio_rb16(s->pb);
+ if (framerate.num > 0 && framerate.den > 0) {
+ st->avg_frame_rate = framerate;
+ }
tmp = avio_r8(s->pb); // audio channels
- av_dlog(s, "audio channels %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "audio channels %d\n", tmp);
if (tmp > 0) {
AVStream *ast = avformat_new_stream(s, NULL);
if (!ast)
return AVERROR(ENOMEM);
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- ast->codec->codec_id = CODEC_ID_PCM_S32BE;
+ ast->codec->codec_id = AV_CODEC_ID_PCM_S32BE;
ast->codec->channels = tmp;
avpriv_set_pts_info(ast, 32, 1, st->time_base.den);
}
filename[sizeof(filename)-1] = 0;
av_dict_set(&st->metadata, "filename", filename, 0);
- av_dlog(s, "filename %s\n", filename);
- av_dlog(s, "resolution %dx%d\n", st->codec->width, st->codec->height);
- av_dlog(s, "timescale %d\n", st->time_base.den);
- av_dlog(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->codec->width, st->codec->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;
}
r3d->video_offsets_count = i;
break;
}
- av_dlog(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;
- av_dlog(s, "duration %"PRId64"\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;
}
avio_rb32(s->pb); // rdas offset
tmp = avio_rb32(s->pb);
- av_dlog(s, "num video chunks %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "num video chunks %d\n", tmp);
tmp = avio_rb32(s->pb);
- av_dlog(s, "num audio chunks %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "num audio chunks %d\n", tmp);
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 = avio_tell(s->pb);
- av_dlog(s, "data offset %#"PRIx64"\n", s->data_offset);
+ 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
}
out:
- avio_seek(s->pb, s->data_offset, SEEK_SET);
+ avio_seek(s->pb, s->internal->data_offset, SEEK_SET);
return 0;
}
AVStream *st = s->streams[0];
int tmp;
int av_unused tmp2;
- uint64_t pos = avio_tell(s->pb);
+ int64_t pos = avio_tell(s->pb);
unsigned dts;
int ret;
dts = avio_rb32(s->pb);
tmp = avio_rb32(s->pb);
- av_dlog(s, "frame num %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "frame num %d\n", tmp);
tmp = avio_r8(s->pb); // major version
tmp2 = avio_r8(s->pb); // minor version
- av_dlog(s, "version %d.%d\n", tmp, tmp2);
+ av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
tmp = avio_rb16(s->pb); // unknown
- av_dlog(s, "unknown %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
if (tmp > 4) {
tmp = avio_rb16(s->pb); // unknown
- av_dlog(s, "unknown %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
tmp = avio_rb16(s->pb); // unknown
- av_dlog(s, "unknown %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
tmp = avio_rb32(s->pb);
- av_dlog(s, "width %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "width %d\n", tmp);
tmp = avio_rb32(s->pb);
- av_dlog(s, "height %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "height %d\n", tmp);
tmp = avio_rb32(s->pb);
- av_dlog(s, "metadata len %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "metadata len %d\n", tmp);
}
tmp = atom->size - 8 - (avio_tell(s->pb) - pos);
if (tmp < 0)
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;
- av_dlog(s, "pkt dts %"PRId64" 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;
}
AVStream *st = s->streams[1];
int av_unused tmp, tmp2;
int samples, size;
- uint64_t pos = avio_tell(s->pb);
+ int64_t pos = avio_tell(s->pb);
unsigned dts;
int ret;
dts = avio_rb32(s->pb);
st->codec->sample_rate = avio_rb32(s->pb);
+ if (st->codec->sample_rate <= 0) {
+ av_log(s, AV_LOG_ERROR, "Bad sample rate\n");
+ return AVERROR_INVALIDDATA;
+ }
samples = avio_rb32(s->pb);
tmp = avio_rb32(s->pb);
- av_dlog(s, "packet num %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "packet num %d\n", tmp);
- tmp = avio_rb16(s->pb); // unkown
- av_dlog(s, "unknown %d\n", tmp);
+ tmp = avio_rb16(s->pb); // unknown
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
tmp = avio_r8(s->pb); // major version
tmp2 = avio_r8(s->pb); // minor version
- av_dlog(s, "version %d.%d\n", tmp, tmp2);
+ av_log(s, AV_LOG_TRACE, "version %d.%d\n", tmp, tmp2);
tmp = avio_rb32(s->pb); // unknown
- av_dlog(s, "unknown %d\n", tmp);
+ av_log(s, AV_LOG_TRACE, "unknown %d\n", tmp);
size = atom->size - 8 - (avio_tell(s->pb) - pos);
if (size < 0)
pkt->stream_index = 1;
pkt->dts = dts;
pkt->duration = av_rescale(samples, st->time_base.den, st->codec->sample_rate);
- av_dlog(s, "pkt dts %"PRId64" duration %d samples %d sample rate %d\n",
+ av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %"PRId64" samples %d sample rate %d\n",
pkt->dts, pkt->duration, samples, st->codec->sample_rate);
return 0;
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);
- av_dlog(s, "seek frame num %d timestamp %"PRId64"\n",
+ 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) {
- avio_seek(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;
AVInputFormat ff_r3d_demuxer = {
.name = "r3d",
- .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
+ .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D"),
.priv_data_size = sizeof(R3DContext),
.read_probe = r3d_probe,
.read_header = r3d_read_header,
projects / ffmpeg / blobdiff