size = rdt->mlti_data_size;
url_fseek(&pb, 0, SEEK_SET);
}
- if (ff_rm_read_mdpr_codecdata(rdt->rmctx, &pb, st, rdt->rmst[0], size) < 0)
+ if (ff_rm_read_mdpr_codecdata(rdt->rmctx, &pb, st, rdt->rmst[st->index], size) < 0)
return -1;
return 0;
init_put_byte(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
flags = (flags & PKT_FLAG_KEY) ? 2 : 0;
- res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[0], len, pkt,
+ res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt,
&seq, &flags, timestamp);
pos = url_ftell(&pb);
if (res < 0)
} else {
rdt->audio_pkt_cnt =
ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb,
- st, rdt->rmst[0], pkt);
+ st, rdt->rmst[st->index], pkt);
if (rdt->audio_pkt_cnt == 0 &&
st->codec->codec_id == CODEC_ID_AAC)
av_freep(&rdt->rmctx->pb);
stream_nr, rule_nr * 2, stream_nr, rule_nr * 2 + 1);
}
-void
-ff_rdt_subscribe_rule2 (RDTDemuxContext *s, char *cmd, int size,
- int stream_nr, int rule_nr)
-{
- PayloadContext *rdt = s->dynamic_protocol_context;
-
- rdt_load_mdpr(rdt, s->streams[0], rule_nr * 2);
-}
-
static unsigned char *
rdt_parse_b64buf (unsigned int *target_len, const char *p)
{
rdt->mlti_data = rdt_parse_b64buf(&rdt->mlti_data_size, p);
} else if (av_strstart(p, "StartTime:integer;", &p))
stream->first_dts = atoi(p);
+ else if (av_strstart(p, "ASMRuleBook:string;", &p)) {
+ int n = st_index, first = -1;
+
+ for (n = 0; n < s->nb_streams; n++)
+ if (s->streams[n]->priv_data == stream->priv_data) {
+ if (first == -1) first = n;
+ rdt->rmst[s->streams[n]->index] = ff_rm_alloc_rmstream();
+ rdt_load_mdpr(rdt, s->streams[n], (n - first) * 2);
+
+ if (s->streams[n]->codec->codec_id == CODEC_ID_AAC)
+ s->streams[n]->codec->frame_size = 1; // FIXME
+ }
+ }
return 0;
}
PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));
av_open_input_stream(&rdt->rmctx, NULL, "", &rdt_demuxer, NULL);
- rdt->rmst[0] = ff_rm_alloc_rmstream();
return rdt;
}
static void
rdt_free_extradata (PayloadContext *rdt)
{
- ff_rm_free_rmstream(rdt->rmst[0]);
- av_free(rdt->rmst[0]);
+ int i;
+
+ for (i = 0; i < MAX_STREAMS; i++)
+ if (rdt->rmst[i]) {
+ ff_rm_free_rmstream(rdt->rmst[i]);
+ av_freep(&rdt->rmst[i]);
+ }
if (rdt->rmctx)
av_close_input_stream(rdt->rmctx);
av_freep(&rdt->mlti_data);
for (i = 0; i < rt->nb_rtsp_streams; i++) {
if (i != 0) av_strlcat(cmd, ",", sizeof(cmd));
ff_rdt_subscribe_rule(cmd, sizeof(cmd), i, 0);
- if (rt->transport == RTSP_TRANSPORT_RDT)
- ff_rdt_subscribe_rule2(
- rt->rtsp_streams[i]->tx_ctx,
- cmd, sizeof(cmd), i, 0);
}
av_strlcat(cmd, "\r\n", sizeof(cmd));
rtsp_send_cmd(s, cmd, reply, NULL);