Revision e8723e24

View differences:

Changelog
22 22
- native GSM / GSM MS decoder
23 23
- RTP depacketization of QDM2
24 24
- ANSI/ASCII art playback system
25
- Lego Mindstorms RSO de/muxer
25 26

  
26 27

  
27 28

  
doc/general.texi
209 209
@item RL2                       @tab   @tab X
210 210
    @tab Audio and video format used in some games by Entertainment Software Partners.
211 211
@item RPL/ARMovie               @tab   @tab X
212
@item Lego Mindstorms RSO       @tab X @tab X
212 213
@item RTMP                      @tab X @tab X
213 214
    @tab Output is performed by publishing stream to RTMP server
214 215
@item RTP                       @tab   @tab X
libavformat/Makefile
209 209
OBJS-$(CONFIG_RM_MUXER)                  += rmenc.o rm.o
210 210
OBJS-$(CONFIG_ROQ_DEMUXER)               += idroq.o
211 211
OBJS-$(CONFIG_ROQ_MUXER)                 += raw.o
212
OBJS-$(CONFIG_RSO_DEMUXER)               += rsodec.o rso.o raw.o
213
OBJS-$(CONFIG_RSO_MUXER)                 += rsoenc.o rso.o
212 214
OBJS-$(CONFIG_RPL_DEMUXER)               += rpl.o
213 215
OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o         \
214 216
                                            rtpenc_aac.o     \
libavformat/allformats.c
174 174
    REGISTER_MUXDEMUX (RM, rm);
175 175
    REGISTER_MUXDEMUX (ROQ, roq);
176 176
    REGISTER_DEMUXER  (RPL, rpl);
177
    REGISTER_MUXDEMUX (RSO, rso);
177 178
    REGISTER_MUXER    (RTP, rtp);
178 179
    REGISTER_MUXDEMUX (RTSP, rtsp);
179 180
    REGISTER_DEMUXER  (SDP, sdp);
libavformat/avformat.h
22 22
#define AVFORMAT_AVFORMAT_H
23 23

  
24 24
#define LIBAVFORMAT_VERSION_MAJOR 52
25
#define LIBAVFORMAT_VERSION_MINOR 75
25
#define LIBAVFORMAT_VERSION_MINOR 76
26 26
#define LIBAVFORMAT_VERSION_MICRO  0
27 27

  
28 28
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
libavformat/rso.c
1
/*
2
 * RSO format common data
3
 * Copyright (c) 2010 Rafael Carre
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
#include "avformat.h"
23
#include "internal.h"
24
#include "rso.h"
25

  
26
const AVCodecTag ff_codec_rso_tags[] = {
27
    { CODEC_ID_PCM_U8,          0x0100 },
28
    { CODEC_ID_ADPCM_IMA_WAV,   0x0101 },
29
    { CODEC_ID_NONE, 0 },
30
};
libavformat/rso.h
1
/*
2
 * RSO format common data
3
 * Copyright (c) 2010 Rafael Carre
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
#ifndef AVFORMAT_RSO_H
23
#define AVFORMAT_RSO_H
24

  
25
#include "internal.h"
26

  
27
#define RSO_HEADER_SIZE 8
28

  
29
/* The ffmpeg codecs we support, and the IDs they have in the file */
30
extern const AVCodecTag ff_codec_rso_tags[];
31

  
32
#endif /* AVFORMAT_RSO_H */
libavformat/rsodec.c
1
/*
2
 * RSO demuxer
3
 * Copyright (c) 2001 Fabrice Bellard (original AU code)
4
 * Copyright (c) 2010 Rafael Carre
5
 *
6
 * This file is part of FFmpeg.
7
 *
8
 * FFmpeg is free software; you can redistribute it and/or
9
 * modify it under the terms of the GNU Lesser General Public
10
 * License as published by the Free Software Foundation; either
11
 * version 2.1 of the License, or (at your option) any later version.
12
 *
13
 * FFmpeg is distributed in the hope that it will be useful,
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16
 * Lesser General Public License for more details.
17
 *
18
 * You should have received a copy of the GNU Lesser General Public
19
 * License along with FFmpeg; if not, write to the Free Software
20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
 */
22

  
23
#include "libavutil/intreadwrite.h"
24
#include "avformat.h"
25
#include "internal.h"
26
#include "raw.h"
27
#include "riff.h"
28
#include "rso.h"
29

  
30
static int rso_read_header(AVFormatContext *s, AVFormatParameters *ap)
31
{
32
    ByteIOContext *pb = s->pb;
33
    int id, rate, bps;
34
    unsigned int size;
35
    enum CodecID codec;
36
    AVStream *st;
37

  
38
    id   = get_be16(pb);
39
    size = get_be16(pb);
40
    rate = get_be16(pb);
41
    get_be16(pb);   /* play mode ? (0x0000 = don't loop) */
42

  
43
    codec = ff_codec_get_id(ff_codec_rso_tags, id);
44

  
45
    if (codec == CODEC_ID_ADPCM_IMA_WAV) {
46
        av_log(s, AV_LOG_ERROR, "ADPCM in RSO not implemented\n");
47
        return AVERROR_PATCHWELCOME;
48
    }
49

  
50
    bps = av_get_bits_per_sample(codec);
51
    if (!bps) {
52
        av_log_ask_for_sample(s, "could not determine bits per sample\n");
53
        return AVERROR_INVALIDDATA;
54
    }
55

  
56
    /* now we are ready: build format streams */
57
    st = av_new_stream(s, 0);
58
    if (!st)
59
        return AVERROR(ENOMEM);
60

  
61
    st->duration            = (size * 8) / bps;
62
    st->codec->codec_type   = AVMEDIA_TYPE_AUDIO;
63
    st->codec->codec_tag    = id;
64
    st->codec->codec_id     = codec;
65
    st->codec->channels     = 1;
66
    st->codec->sample_rate  = rate;
67

  
68
    av_set_pts_info(st, 64, 1, rate);
69

  
70
    return 0;
71
}
72

  
73
#define BLOCK_SIZE 1024 /* in samples */
74

  
75
static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
76
{
77
    int bps = av_get_bits_per_sample(s->streams[0]->codec->codec_id);
78
    int ret = av_get_packet(s->pb, pkt, BLOCK_SIZE * bps >> 3);
79

  
80
    if (ret < 0)
81
        return ret;
82

  
83
    pkt->stream_index = 0;
84

  
85
    /* note: we need to modify the packet size here to handle the last packet */
86
    pkt->size = ret;
87

  
88
    return 0;
89
}
90

  
91
AVInputFormat rso_demuxer = {
92
    .name           =   "rso",
93
    .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
94
    .extensions     =   "rso",
95
    .priv_data_size =   0,
96
    .read_probe     =   NULL, /* no magic value in this format */
97
    .read_header    =   rso_read_header,
98
    .read_packet    =   rso_read_packet,
99
    .read_close     =   NULL,
100
    .read_seek      =   pcm_read_seek,
101
    .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
102
};
libavformat/rsoenc.c
1
/*
2
 * RSO muxer
3
 * Copyright (c) 2001 Fabrice Bellard (original AU code)
4
 * Copyright (c) 2010 Rafael Carre
5
 *
6
 * This file is part of FFmpeg.
7
 *
8
 * FFmpeg is free software; you can redistribute it and/or
9
 * modify it under the terms of the GNU Lesser General Public
10
 * License as published by the Free Software Foundation; either
11
 * version 2.1 of the License, or (at your option) any later version.
12
 *
13
 * FFmpeg is distributed in the hope that it will be useful,
14
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
16
 * Lesser General Public License for more details.
17
 *
18
 * You should have received a copy of the GNU Lesser General Public
19
 * License along with FFmpeg; if not, write to the Free Software
20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21
 */
22

  
23
#include "avformat.h"
24
#include "internal.h"
25
#include "riff.h"
26
#include "rso.h"
27

  
28
static int rso_write_header(AVFormatContext *s)
29
{
30
    ByteIOContext  *pb  = s->pb;
31
    AVCodecContext *enc = s->streams[0]->codec;
32

  
33
    if (!enc->codec_tag)
34
        return AVERROR_INVALIDDATA;
35

  
36
    if (enc->channels != 1) {
37
        av_log(s, AV_LOG_ERROR, "RSO only supports mono\n");
38
        return AVERROR_INVALIDDATA;
39
    }
40

  
41
    if (url_is_streamed(s->pb)) {
42
        av_log(s, AV_LOG_ERROR, "muxer does not support non seekable output\n");
43
        return AVERROR_INVALIDDATA;
44
    }
45

  
46
    /* XXX: find legal sample rates (if any) */
47
    if (enc->sample_rate >= 1u<<16) {
48
        av_log(s, AV_LOG_ERROR, "Sample rate must be < 65536\n");
49
        return AVERROR_INVALIDDATA;
50
    }
51

  
52
    if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) {
53
        av_log(s, AV_LOG_ERROR, "ADPCM in RSO not implemented\n");
54
        return AVERROR_PATCHWELCOME;
55
    }
56

  
57
    /* format header */
58
    put_be16(pb, enc->codec_tag);   /* codec ID */
59
    put_be16(pb, 0);                /* data size, will be written at EOF */
60
    put_be16(pb, enc->sample_rate);
61
    put_be16(pb, 0x0000);           /* play mode ? (0x0000 = don't loop) */
62

  
63
    put_flush_packet(pb);
64

  
65
    return 0;
66
}
67

  
68
static int rso_write_packet(AVFormatContext *s, AVPacket *pkt)
69
{
70
    put_buffer(s->pb, pkt->data, pkt->size);
71
    return 0;
72
}
73

  
74
static int rso_write_trailer(AVFormatContext *s)
75
{
76
    ByteIOContext *pb = s->pb;
77
    int64_t file_size;
78
    uint16_t coded_file_size;
79

  
80
    file_size = url_ftell(pb);
81

  
82
    if (file_size < 0)
83
        return file_size;
84

  
85
    if (file_size > 0xffff + RSO_HEADER_SIZE) {
86
        av_log(s, AV_LOG_WARNING,
87
               "Output file is too big (%"PRId64" bytes >= 64kB)\n", file_size);
88
        coded_file_size = 0xffff;
89
    } else {
90
        coded_file_size = file_size - RSO_HEADER_SIZE;
91
    }
92

  
93
    /* update file size */
94
    url_fseek(pb, 2, SEEK_SET);
95
    put_be16(pb, coded_file_size);
96
    url_fseek(pb, file_size, SEEK_SET);
97

  
98
    put_flush_packet(pb);
99

  
100
    return 0;
101
}
102

  
103
AVOutputFormat rso_muxer = {
104
    .name           =   "rso",
105
    .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
106
    .extensions     =   "rso",
107
    .priv_data_size =   0,
108
    .audio_codec    =   CODEC_ID_PCM_U8,
109
    .video_codec    =   CODEC_ID_NONE,
110
    .write_header   =   rso_write_header,
111
    .write_packet   =   rso_write_packet,
112
    .write_trailer  =   rso_write_trailer,
113
    .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
114
};
tests/lavf-regression.sh
206 206
do_audio_only ogg
207 207
fi
208 208

  
209
if [ -n "$do_rso" ] ; then
210
do_audio_only rso
211
fi
212

  
209 213
# pix_fmt conversions
210 214

  
211 215
if [ -n "$do_pixfmt" ] ; then

Also available in: Unified diff