Revision 08e696c0

View differences:

Changelog
7 7
- Alpha channel scaler
8 8
- PCX encoder
9 9
- RTP packetization of H.263
10
- RTP packetization of AMR
10 11

  
11 12

  
12 13

  
libavformat/Makefile
188 188
OBJS-$(CONFIG_RPL_DEMUXER)               += rpl.o
189 189
OBJS-$(CONFIG_RTP_MUXER)                 += rtp.o         \
190 190
                                            rtp_aac.o     \
191
                                            rtp_amr.o     \
191 192
                                            rtp_asf.o     \
192 193
                                            rtp_h263.o    \
193 194
                                            rtp_mpv.o     \
libavformat/rtp_amr.c
1
/*
2
 * RTP packetization for AMR audio
3
 * Copyright (c) 2007 Luca Abeni
4
 * Copyright (c) 2009 Martin Storsjo
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 "rtpenc.h"
25

  
26
/**
27
 * Packetize AMR frames into RTP packets according to RFC 3267,
28
 * in octet-aligned mode.
29
 */
30
void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size)
31
{
32
    RTPMuxContext *s          = s1->priv_data;
33
    int max_header_toc_size   = 1 + s->max_frames_per_packet;
34
    uint8_t *p;
35
    int len;
36

  
37
    /* Test if the packet must be sent. */
38
    len = s->buf_ptr - s->buf;
39
    if (s->num_frames == s->max_frames_per_packet || (len && len + size - 1 > s->max_payload_size)) {
40
        int header_size = s->num_frames + 1;
41
        p = s->buf + max_header_toc_size - header_size;
42
        if (p != s->buf)
43
            memmove(p, s->buf, header_size);
44

  
45
        ff_rtp_send_data(s1, p, s->buf_ptr - p, 1);
46

  
47
        s->num_frames = 0;
48
    }
49

  
50
    if (!s->num_frames) {
51
        s->buf[0]    = 0xf0;
52
        s->buf_ptr   = s->buf + max_header_toc_size;
53
        s->timestamp = s->cur_timestamp;
54
    } else {
55
        /* Mark the previous TOC entry as having more entries following. */
56
        s->buf[1 + s->num_frames - 1] |= 0x80;
57
    }
58

  
59
    /* Copy the frame type and quality bits. */
60
    s->buf[1 + s->num_frames++] = buff[0] & 0x7C;
61
    buff++;
62
    size--;
63
    memcpy(s->buf_ptr, buff, size);
64
    s->buf_ptr += size;
65
}
66

  
libavformat/rtpenc.c
60 60
    case CODEC_ID_PCM_U16LE:
61 61
    case CODEC_ID_PCM_U8:
62 62
    case CODEC_ID_MPEG2TS:
63
    case CODEC_ID_AMR_NB:
64
    case CODEC_ID_AMR_WB:
63 65
        return 1;
64 66
    default:
65 67
        return 0;
......
134 136
        s->max_payload_size = n * TS_PACKET_SIZE;
135 137
        s->buf_ptr = s->buf;
136 138
        break;
139
    case CODEC_ID_AMR_NB:
140
    case CODEC_ID_AMR_WB:
141
        if (!s->max_frames_per_packet)
142
            s->max_frames_per_packet = 12;
143
        if (st->codec->codec_id == CODEC_ID_AMR_NB)
144
            n = 31;
145
        else
146
            n = 61;
147
        /* max_header_toc_size + the largest AMR payload must fit */
148
        if (1 + s->max_frames_per_packet + n > s->max_payload_size) {
149
            av_log(s1, AV_LOG_ERROR, "RTP max payload size too small for AMR\n");
150
            return -1;
151
        }
152
        if (st->codec->channels != 1) {
153
            av_log(s1, AV_LOG_ERROR, "Only mono is supported\n");
154
            return -1;
155
        }
137 156
    case CODEC_ID_AAC:
138 157
        s->num_frames = 0;
139 158
    default:
......
366 385
    case CODEC_ID_AAC:
367 386
        ff_rtp_send_aac(s1, buf1, size);
368 387
        break;
388
    case CODEC_ID_AMR_NB:
389
    case CODEC_ID_AMR_WB:
390
        ff_rtp_send_amr(s1, buf1, size);
391
        break;
369 392
    case CODEC_ID_MPEG2TS:
370 393
        rtp_send_mpegts_raw(s1, buf1, size);
371 394
        break;
libavformat/rtpenc.h
59 59
void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
60 60
void ff_rtp_send_h263(AVFormatContext *s1, const uint8_t *buf1, int size);
61 61
void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
62
void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size);
62 63
void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
63 64

  
64 65
#endif /* AVFORMAT_RTPENC_H */
libavformat/sdp.c
228 228
                                         payload_type,
229 229
                                         c->sample_rate, c->channels);
230 230
            break;
231
        case CODEC_ID_AMR_NB:
232
            av_strlcatf(buff, size, "a=rtpmap:%d AMR/%d/%d\r\n"
233
                                    "a=fmtp:%d octet-align=1\r\n",
234
                                     payload_type, c->sample_rate, c->channels,
235
                                     payload_type);
236
            break;
237
        case CODEC_ID_AMR_WB:
238
            av_strlcatf(buff, size, "a=rtpmap:%d AMR-WB/%d/%d\r\n"
239
                                    "a=fmtp:%d octet-align=1\r\n",
240
                                     payload_type, c->sample_rate, c->channels,
241
                                     payload_type);
242
            break;
231 243
        default:
232 244
            /* Nothing special to do here... */
233 245
            break;

Also available in: Unified diff