X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frdt.c;h=303a2a814566646c727f2133c99cbc691942362d;hb=edd33cb6faa78bf1cc533ccd283719b2c9224756;hp=9d6e193449b8ba221655a8588da958bbc50d12a9;hpb=530bca94390adb946f21c767f5eafda522c826b1;p=ffmpeg diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 9d6e193449b..303a2a81456 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -20,20 +20,20 @@ */ /** - * @file rdt.c + * @file * @brief Realmedia RTSP protocol (RDT) support * @author Ronald S. Bultje */ #include "avformat.h" #include "libavutil/avstring.h" -#include "rtp_internal.h" +#include "rtpdec.h" #include "rdt.h" #include "libavutil/base64.h" #include "libavutil/md5.h" #include "rm.h" #include "internal.h" -#include +#include "libavcodec/get_bits.h" struct RDTDemuxContext { AVFormatContext *ic; /**< the containing (RTSP) demux context */ @@ -67,7 +67,7 @@ ff_rdt_parse_open(AVFormatContext *ic, int first_stream_of_set_idx, s->prev_set_id = -1; s->prev_stream_id = -1; s->prev_timestamp = -1; - s->parse_packet = handler->parse_packet; + s->parse_packet = handler ? handler->parse_packet : NULL; s->dynamic_protocol_context = priv_data; return s; @@ -86,7 +86,8 @@ ff_rdt_parse_close(RDTDemuxContext *s) struct PayloadContext { AVFormatContext *rmctx; - RMStream *rmst[MAX_STREAMS]; + int nb_rmst; + RMStream **rmst; uint8_t *mlti_data; unsigned int mlti_data_size; char buffer[RTP_MAX_PACKET_LENGTH + FF_INPUT_BUFFER_PADDING_SIZE]; @@ -120,8 +121,7 @@ ff_rdt_calc_response_and_checksum(char response[41], char chksum[9], buf[8 + i] ^= xor_table[i]; av_md5_sum(zres, buf, 64); - ff_data_to_hex(response, zres, 16); - for (i=0;i<32;i++) response[i] = tolower(response[i]); + ff_data_to_hex(response, zres, 16, 1); /* add tail */ strcpy (response + 32, "01d0a8e3"); @@ -141,14 +141,14 @@ rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr) /** * Layout of the MLTI chunk: - * 4:MLTI - * 2: + * 4: MLTI + * 2: number of streams * Then for each stream ([number_of_streams] times): - * 2: - * 2: + * 2: mdpr index + * 2: number of mdpr chunks * Then for each mdpr chunk ([number_of_mdpr_chunks] times): - * 4: - * [size]: + * 4: size + * [size]: data * we skip MDPR chunks until we reach the one of the stream * we're interested in, and forward that ([size]+[data]) to * the RM demuxer to parse the stream-specific header data. @@ -180,7 +180,7 @@ rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr) 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; @@ -295,7 +295,7 @@ ff_rdt_parse_header(const uint8_t *buf, int len, /**< return 0 on packet, no more left, 1 on packet, 1 on partial packet... */ static int -rdt_parse_packet (PayloadContext *rdt, AVStream *st, +rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len, int flags) { @@ -306,23 +306,25 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st, int pos; 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, - &seq, &flags, timestamp); + flags = (flags & RTP_FLAG_KEY) ? 2 : 0; + 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) return res; - rdt->audio_pkt_cnt = res; - if (rdt->audio_pkt_cnt > 0 && - st->codec->codec_id == CODEC_ID_AAC) { - memcpy (rdt->buffer, buf + pos, len - pos); - rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0, - NULL, NULL, NULL, NULL); + if (res > 0) { + if (st->codec->codec_id == CODEC_ID_AAC) { + memcpy (rdt->buffer, buf + pos, len - pos); + rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0, + NULL, NULL, NULL, NULL); + } + goto get_cache; } } else { +get_cache: 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); @@ -335,8 +337,9 @@ rdt_parse_packet (PayloadContext *rdt, AVStream *st, int ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, - const uint8_t *buf, int len) + uint8_t **bufptr, int len) { + uint8_t *buf = bufptr ? *bufptr : NULL; int seq_no, flags = 0, stream_id, set_id, is_keyframe; uint32_t timestamp; int rv= 0; @@ -347,7 +350,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, if (!buf && s->prev_stream_id != -1) { /* return the next packets, if any */ timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... - rv= s->parse_packet(s->dynamic_protocol_context, + rv= s->parse_packet(s->ic, s->dynamic_protocol_context, s->streams[s->prev_stream_id], pkt, ×tamp, NULL, 0, flags); return rv; @@ -361,7 +364,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, if (is_keyframe && (set_id != s->prev_set_id || timestamp != s->prev_timestamp || stream_id != s->prev_stream_id)) { - flags |= PKT_FLAG_KEY; + flags |= RTP_FLAG_KEY; s->prev_set_id = set_id; s->prev_timestamp = timestamp; } @@ -374,7 +377,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, return -1; } - rv = s->parse_packet(s->dynamic_protocol_context, + rv = s->parse_packet(s->ic, s->dynamic_protocol_context, s->streams[s->prev_stream_id], pkt, ×tamp, buf, len, flags); @@ -389,15 +392,6 @@ ff_rdt_subscribe_rule (char *cmd, int size, 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) { @@ -424,6 +418,29 @@ rdt_parse_sdp_line (AVFormatContext *s, int st_index, 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, first = -1; + + for (n = 0; n < s->nb_streams; n++) + if (s->streams[n]->priv_data == stream->priv_data) { + int count = s->streams[n]->index + 1; + if (first == -1) first = n; + if (rdt->nb_rmst < count) { + RMStream **rmst= av_realloc(rdt->rmst, count*sizeof(*rmst)); + if (!rmst) + return AVERROR(ENOMEM); + memset(rmst + rdt->nb_rmst, 0, + (count - rdt->nb_rmst) * sizeof(*rmst)); + rdt->rmst = rmst; + rdt->nb_rmst = count; + } + 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; } @@ -460,7 +477,7 @@ real_parse_asm_rulebook(AVFormatContext *s, AVStream *orig_st, const char *p) { const char *end; - int n_rules, odd = 0; + int n_rules = 0, odd = 0; AVStream *st; /** @@ -478,7 +495,7 @@ real_parse_asm_rulebook(AVFormatContext *s, AVStream *orig_st, * for multi-bitrate streams. */ if (*p == '\"') p++; - for (n_rules = 0; s->nb_streams < MAX_STREAMS;) { + while (1) { if (!(end = strchr(p, ';'))) break; if (!odd && end != p) { @@ -486,6 +503,8 @@ real_parse_asm_rulebook(AVFormatContext *s, AVStream *orig_st, st = add_dstream(s, orig_st); else st = orig_st; + if (!st) + break; real_parse_asm_rule(st, p, end); n_rules++; } @@ -505,42 +524,47 @@ ff_real_parse_sdp_a_line (AVFormatContext *s, int stream_index, } static PayloadContext * -rdt_new_extradata (void) +rdt_new_context (void) { 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) +rdt_free_context (PayloadContext *rdt) { - ff_rm_free_rmstream(rdt->rmst[0]); - av_free(rdt->rmst[0]); + int i; + + for (i = 0; i < rdt->nb_rmst; 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); + av_freep(&rdt->rmst); av_free(rdt); } #define RDT_HANDLER(n, s, t) \ static RTPDynamicProtocolHandler ff_rdt_ ## n ## _handler = { \ - s, \ - t, \ - CODEC_ID_NONE, \ - rdt_parse_sdp_line, \ - rdt_new_extradata, \ - rdt_free_extradata, \ - rdt_parse_packet \ + .enc_name = s, \ + .codec_type = t, \ + .codec_id = CODEC_ID_NONE, \ + .parse_sdp_a_line = rdt_parse_sdp_line, \ + .open = rdt_new_context, \ + .close = rdt_free_context, \ + .parse_packet = rdt_parse_packet \ }; -RDT_HANDLER(live_video, "x-pn-multirate-realvideo-live", CODEC_TYPE_VIDEO); -RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", CODEC_TYPE_AUDIO); -RDT_HANDLER(video, "x-pn-realvideo", CODEC_TYPE_VIDEO); -RDT_HANDLER(audio, "x-pn-realaudio", CODEC_TYPE_AUDIO); +RDT_HANDLER(live_video, "x-pn-multirate-realvideo-live", AVMEDIA_TYPE_VIDEO); +RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", AVMEDIA_TYPE_AUDIO); +RDT_HANDLER(video, "x-pn-realvideo", AVMEDIA_TYPE_VIDEO); +RDT_HANDLER(audio, "x-pn-realaudio", AVMEDIA_TYPE_AUDIO); void av_register_rdt_dynamic_payload_handlers(void) {