* RTP AMR Depacketizer, RFC 3267
* Copyright (c) 2010 Martin Storsjo
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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,
+ * Libav 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
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/channel_layout.h"
#include "avformat.h"
-#include "rtpdec_amr.h"
+#include "rtpdec_formats.h"
#include "libavutil/avstring.h"
static const uint8_t frame_sizes_nb[16] = {
int channels;
};
-static PayloadContext *amr_new_context(void)
+static av_cold int amr_init(AVFormatContext *s, int st_index, PayloadContext *data)
{
- PayloadContext *data = av_mallocz(sizeof(PayloadContext));
- if(!data) return data;
data->channels = 1;
- return data;
-}
-
-static void amr_free_context(PayloadContext *data)
-{
- av_free(data);
+ return 0;
}
-static int amr_handle_packet(AVFormatContext *ctx,
- PayloadContext *data,
- AVStream *st,
- AVPacket * pkt,
- uint32_t * timestamp,
- const uint8_t * buf,
- int len, int flags)
+static int amr_handle_packet(AVFormatContext *ctx, PayloadContext *data,
+ AVStream *st, AVPacket *pkt, uint32_t *timestamp,
+ const uint8_t *buf, int len, uint16_t seq,
+ int flags)
{
const uint8_t *frame_sizes = NULL;
int frames;
const uint8_t *speech_data;
uint8_t *ptr;
- if (st->codec->codec_id == CODEC_ID_AMR_NB) {
+ if (st->codecpar->codec_id == AV_CODEC_ID_AMR_NB) {
frame_sizes = frame_sizes_nb;
- } else if (st->codec->codec_id == CODEC_ID_AMR_WB) {
+ } else if (st->codecpar->codec_id == AV_CODEC_ID_AMR_WB) {
frame_sizes = frame_sizes_wb;
} else {
av_log(ctx, AV_LOG_ERROR, "Bad codec ID\n");
return AVERROR_INVALIDDATA;
}
- if (st->codec->channels != 1) {
+ if (st->codecpar->channels != 1) {
av_log(ctx, AV_LOG_ERROR, "Only mono AMR is supported\n");
return AVERROR_INVALIDDATA;
}
+ st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
/* The AMR RTP packet consists of one header byte, followed
* by one TOC byte for each AMR frame in the packet, followed
return 0;
}
-static int amr_parse_fmtp(AVStream *stream, PayloadContext *data,
- char *attr, char *value)
+static int amr_parse_fmtp(AVFormatContext *s,
+ AVStream *stream, PayloadContext *data,
+ const char *attr, const char *value)
{
/* Some AMR SDP configurations contain "octet-align", without
* the trailing =1. Therefore, if the value is empty,
* interpret it as "1".
*/
if (!strcmp(value, "")) {
- av_log(NULL, AV_LOG_WARNING, "AMR fmtp attribute %s had "
- "nonstandard empty value\n", attr);
- strcpy(value, "1");
+ av_log(s, AV_LOG_WARNING, "AMR fmtp attribute %s had "
+ "nonstandard empty value\n", attr);
+ value = "1";
}
if (!strcmp(attr, "octet-align"))
data->octet_align = atoi(value);
const char *p;
int ret;
+ if (st_index < 0)
+ return 0;
+
/* Parse an fmtp line this one:
* a=fmtp:97 octet-align=1; interleaving=0
* That is, a normal fmtp: line followed by semicolon & space
* separated key/value pairs.
*/
if (av_strstart(line, "fmtp:", &p)) {
- ret = ff_parse_fmtp(s->streams[st_index], data, p, amr_parse_fmtp);
+ ret = ff_parse_fmtp(s, s->streams[st_index], data, p, amr_parse_fmtp);
if (!data->octet_align || data->crc ||
data->interleaving || data->channels != 1) {
av_log(s, AV_LOG_ERROR, "Unsupported RTP/AMR configuration!\n");
RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler = {
.enc_name = "AMR",
.codec_type = AVMEDIA_TYPE_AUDIO,
- .codec_id = CODEC_ID_AMR_NB,
+ .codec_id = AV_CODEC_ID_AMR_NB,
+ .priv_data_size = sizeof(PayloadContext),
+ .init = amr_init,
.parse_sdp_a_line = amr_parse_sdp_line,
- .open = amr_new_context,
- .close = amr_free_context,
.parse_packet = amr_handle_packet,
};
RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler = {
.enc_name = "AMR-WB",
.codec_type = AVMEDIA_TYPE_AUDIO,
- .codec_id = CODEC_ID_AMR_WB,
+ .codec_id = AV_CODEC_ID_AMR_WB,
+ .priv_data_size = sizeof(PayloadContext),
+ .init = amr_init,
.parse_sdp_a_line = amr_parse_sdp_line,
- .open = amr_new_context,
- .close = amr_free_context,
.parse_packet = amr_handle_packet,
};
-
projects / ffmpeg / blobdiff