Revision bfaefd87

View differences:

libavformat/Makefile
110 110
OBJS-$(CONFIG_IV8_DEMUXER)               += iv8.o
111 111
OBJS-$(CONFIG_IVF_DEMUXER)               += ivfdec.o riff.o
112 112
OBJS-$(CONFIG_IVF_MUXER)                 += ivfenc.o
113
OBJS-$(CONFIG_JV_DEMUXER)                += jvdec.o
113 114
OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
114 115
OBJS-$(CONFIG_LXF_DEMUXER)               += lxfdec.o
115 116
OBJS-$(CONFIG_M4V_DEMUXER)               += m4vdec.o rawdec.o
libavformat/allformats.c
110 110
    REGISTER_DEMUXER  (ISS, iss);
111 111
    REGISTER_DEMUXER  (IV8, iv8);
112 112
    REGISTER_MUXDEMUX (IVF, ivf);
113
    REGISTER_DEMUXER  (JV, jv);
113 114
    REGISTER_DEMUXER  (LMLM4, lmlm4);
114 115
    REGISTER_DEMUXER  (LXF, lxf);
115 116
    REGISTER_MUXDEMUX (M4V, m4v);
libavformat/jvdec.c
1
/*
2
 * Bitmap Brothers JV demuxer
3
 * Copyright (c) 2005, 2011 Peter Ross <pross@xvid.org>
4
 *
5
 * This file is part of FFmpeg.
6
 *
7
 * FFmpeg is free software; you can redistribute it and/or
8
 * modify it under the terms of the GNU Lesser General Public
9
 * License as published by the Free Software Foundation; either
10
 * version 2.1 of the License, or (at your option) any later version.
11
 *
12
 * FFmpeg is distributed in the hope that it will be useful,
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
 * Lesser General Public License for more details.
16
 *
17
 * You should have received a copy of the GNU Lesser General Public
18
 * License along with FFmpeg; if not, write to the Free Software
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 */
21

  
22
/**
23
 * @file
24
 * Bitmap Brothers JV demuxer
25
 * @author Peter Ross <pross@xvid.org>
26
 */
27

  
28
#include "libavutil/intreadwrite.h"
29
#include "avformat.h"
30

  
31
typedef struct {
32
    int audio_size;    /** audio packet size (bytes) */
33
    int video_size;    /** video packet size (bytes) */
34
    int palette;       /** frame contains palette change */
35
    int video_type;    /** per-frame video compression type */
36
} JVFrame;
37

  
38
typedef struct {
39
    JVFrame *frames;
40
    enum {
41
        JV_AUDIO = 0,
42
        JV_VIDEO,
43
        JV_PADDING
44
    } state;
45
    int64_t pts;
46
} JVDemuxContext;
47

  
48
#define MAGIC " Compression by John M Phillips Copyright (C) 1995 The Bitmap Brothers Ltd."
49

  
50
static int read_probe(AVProbeData *pd)
51
{
52
    if (pd->buf[0] == 'J' && pd->buf[1] == 'V' &&
53
        !memcmp(pd->buf + 4, MAGIC, FFMIN(strlen(MAGIC), pd->buf_size - 4)))
54
        return AVPROBE_SCORE_MAX;
55
    return 0;
56
}
57

  
58
static int read_header(AVFormatContext *s,
59
                       AVFormatParameters *ap)
60
{
61
    JVDemuxContext *jv = s->priv_data;
62
    AVIOContext *pb = s->pb;
63
    AVStream *vst, *ast;
64
    int64_t audio_pts = 0;
65
    int64_t offset;
66
    int i;
67

  
68
    avio_skip(pb, 80);
69

  
70
    ast = av_new_stream(s, 0);
71
    vst = av_new_stream(s, 1);
72
    if (!ast || !vst)
73
        return AVERROR(ENOMEM);
74

  
75
    vst->codec->codec_type  = CODEC_TYPE_VIDEO;
76
    vst->codec->codec_id    = CODEC_ID_JV;
77
    vst->codec->codec_tag   = 0; /* no fourcc */
78
    vst->codec->width       = avio_rl16(pb);
79
    vst->codec->height      = avio_rl16(pb);
80
    vst->nb_frames          =
81
    ast->nb_index_entries   = avio_rl16(pb);
82
    av_set_pts_info(vst, 64, avio_rl16(pb), 1000);
83

  
84
    avio_skip(pb, 4);
85

  
86
    ast->codec->codec_type  = CODEC_TYPE_AUDIO;
87
    ast->codec->codec_id    = CODEC_ID_PCM_U8;
88
    ast->codec->codec_tag   = 0; /* no fourcc */
89
    ast->codec->sample_rate = avio_rl16(pb);
90
    ast->codec->channels    = 1;
91
    av_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
92

  
93
    avio_skip(pb, 10);
94

  
95
    ast->index_entries = av_malloc(ast->nb_index_entries * sizeof(*ast->index_entries));
96
    if (!ast->index_entries)
97
        return AVERROR(ENOMEM);
98

  
99
    jv->frames = av_malloc(ast->nb_index_entries * sizeof(JVFrame));
100
    if (!jv->frames)
101
        return AVERROR(ENOMEM);
102

  
103
    offset = 0x68 + ast->nb_index_entries * 16;
104
    for(i = 0; i < ast->nb_index_entries; i++) {
105
        AVIndexEntry *e   = ast->index_entries + i;
106
        JVFrame      *jvf = jv->frames + i;
107

  
108
        /* total frame size including audio, video, palette data and padding */
109
        e->size         = avio_rl32(pb);
110
        e->timestamp    = i;
111
        e->pos          = offset;
112
        offset         += e->size;
113

  
114
        jvf->audio_size = avio_rl32(pb);
115
        jvf->video_size = avio_rl32(pb);
116
        jvf->palette    = avio_r8(pb);
117
        if (avio_r8(pb))
118
             av_log(s, AV_LOG_WARNING, "unsupported audio codec\n");
119
        jvf->video_type = avio_r8(pb);
120
        avio_skip(pb, 1);
121

  
122
        e->timestamp = jvf->audio_size ? audio_pts : AV_NOPTS_VALUE;
123
        audio_pts += jvf->audio_size;
124

  
125
        e->flags = jvf->video_type != 1 ? AVINDEX_KEYFRAME : 0;
126
    }
127

  
128
    jv->state = JV_AUDIO;
129
    return 0;
130
}
131

  
132
static int read_packet(AVFormatContext *s, AVPacket *pkt)
133
{
134
    JVDemuxContext *jv = s->priv_data;
135
    AVIOContext *pb = s->pb;
136
    AVStream *ast = s->streams[0];
137

  
138
    while (!url_feof(s->pb) && jv->pts < ast->nb_index_entries) {
139
        const AVIndexEntry *e   = ast->index_entries + jv->pts;
140
        const JVFrame      *jvf = jv->frames + jv->pts;
141

  
142
        switch(jv->state) {
143
        case JV_AUDIO:
144
            jv->state++;
145
            if (jvf->audio_size ) {
146
                if (av_get_packet(s->pb, pkt, jvf->audio_size) < 0)
147
                    return AVERROR(ENOMEM);
148
                pkt->stream_index = 0;
149
                pkt->pts          = e->timestamp;
150
                pkt->flags       |= PKT_FLAG_KEY;
151
                return 0;
152
            }
153
        case JV_VIDEO:
154
            jv->state++;
155
            if (jvf->video_size || jvf->palette) {
156
                int size = jvf->video_size + (jvf->palette ? 768 : 0);
157
                if (av_new_packet(pkt, size + 5))
158
                    return AVERROR(ENOMEM);
159

  
160
                AV_WL32(pkt->data, jvf->video_size);
161
                pkt->data[4]      = jvf->video_type;
162
                if (avio_read(pb, pkt->data + 5, size) < 0)
163
                    return AVERROR(EIO);
164

  
165
                pkt->size         = size + 5;
166
                pkt->stream_index = 1;
167
                pkt->pts          = jv->pts;
168
                if (jvf->video_type != 1)
169
                    pkt->flags |= PKT_FLAG_KEY;
170
                return 0;
171
            }
172
        case JV_PADDING:
173
            avio_skip(pb, FFMAX(e->size - jvf->audio_size - jvf->video_size
174
                                        - (jvf->palette ? 768 : 0), 0));
175
            jv->state = JV_AUDIO;
176
            jv->pts++;
177
        }
178
    }
179

  
180
    return AVERROR(EIO);
181
}
182

  
183
static int read_seek(AVFormatContext *s, int stream_index,
184
                     int64_t ts, int flags)
185
{
186
    JVDemuxContext *jv = s->priv_data;
187
    AVStream *ast = s->streams[0];
188
    int i;
189

  
190
    if (flags & (AVSEEK_FLAG_BYTE|AVSEEK_FLAG_FRAME))
191
        return AVERROR_NOTSUPP;
192

  
193
    switch(stream_index) {
194
    case 0:
195
        i = av_index_search_timestamp(ast, ts, flags);
196
        break;
197
    case 1:
198
        i = ts;
199
        break;
200
    default:
201
        return 0;
202
    }
203

  
204
    if (i < 0 || i >= ast->nb_index_entries)
205
        return 0;
206

  
207
    jv->state = JV_AUDIO;
208
    jv->pts   = i;
209
    avio_seek(s->pb, ast->index_entries[i].pos, SEEK_SET);
210
    return 0;
211
}
212

  
213
AVInputFormat ff_jv_demuxer = {
214
    .name           = "jv",
215
    .long_name      = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV"),
216
    .priv_data_size = sizeof(JVDemuxContext),
217
    .read_probe     = read_probe,
218
    .read_header    = read_header,
219
    .read_packet    = read_packet,
220
    .read_seek      = read_seek,
221
};
libavformat/version.h
24 24
#include "libavutil/avutil.h"
25 25

  
26 26
#define LIBAVFORMAT_VERSION_MAJOR 52
27
#define LIBAVFORMAT_VERSION_MINOR 102
27
#define LIBAVFORMAT_VERSION_MINOR 103
28 28
#define LIBAVFORMAT_VERSION_MICRO  0
29 29

  
30 30
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

Also available in: Unified diff