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;
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);
* 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");
.enc_name = "AMR",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_AMR_NB,
+ .priv_data_size = sizeof(PayloadContext),
+ .init = amr_init,
.parse_sdp_a_line = amr_parse_sdp_line,
- .alloc = amr_new_context,
- .free = amr_free_context,
.parse_packet = amr_handle_packet,
};
.enc_name = "AMR-WB",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_AMR_WB,
+ .priv_data_size = sizeof(PayloadContext),
+ .init = amr_init,
.parse_sdp_a_line = amr_parse_sdp_line,
- .alloc = amr_new_context,
- .free = amr_free_context,
.parse_packet = amr_handle_packet,
};