* @author Ronald S. Bultje <rbultje@ronald.bitfreak.net>
*/
+#include "libavcodec/bitstream.h"
+
#include "avformat.h"
#include "libavutil/avstring.h"
#include "rtpdec.h"
#include "rm.h"
#include "internal.h"
#include "avio_internal.h"
-#include "libavcodec/get_bits.h"
struct RDTDemuxContext {
AVFormatContext *ic; /**< the containing (RTSP) demux context */
* in the AVFormatContext, and this variable points to the offset in
* that array such that the first is the first stream of this set. */
AVStream **streams;
- int n_streams; /**< streams with identifical content in this set */
+ int n_streams; /**< streams with identical content in this set */
void *dynamic_protocol_context;
DynamicPayloadPacketHandlerProc parse_packet;
uint32_t prev_timestamp;
RMStream **rmst;
uint8_t *mlti_data;
unsigned int mlti_data_size;
- char buffer[RTP_MAX_PACKET_LENGTH + FF_INPUT_BUFFER_PADDING_SIZE];
+ char buffer[RTP_MAX_PACKET_LENGTH + AV_INPUT_BUFFER_PADDING_SIZE];
int audio_pkt_cnt; /**< remaining audio packets in rmdec */
};
unsigned char zres[16],
buf[64] = { 0xa1, 0xe9, 0x14, 0x9d, 0x0e, 0x6b, 0x3b, 0x59 };
#define XOR_TABLE_SIZE 37
- const unsigned char xor_table[XOR_TABLE_SIZE] = {
+ static const unsigned char xor_table[XOR_TABLE_SIZE] = {
0x05, 0x18, 0x74, 0xd0, 0x0d, 0x09, 0x02, 0x53,
0xc0, 0x01, 0x05, 0x05, 0x67, 0x03, 0x19, 0x70,
0x08, 0x27, 0x66, 0x10, 0x10, 0x72, 0x08, 0x09,
rdt_load_mdpr (PayloadContext *rdt, AVStream *st, int rule_nr)
{
AVIOContext pb;
- int size;
+ unsigned int size;
uint32_t tag;
/**
int *pset_id, int *pseq_no, int *pstream_id,
int *pis_keyframe, uint32_t *ptimestamp)
{
- GetBitContext gb;
+ BitstreamContext bc;
int consumed = 0, set_id, seq_no, stream_id, is_keyframe,
len_included, need_reliable;
uint32_t timestamp;
* [2] http://www.wireshark.org/docs/dfref/r/rdt.html and
* http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-rdt.c
*/
- init_get_bits(&gb, buf, len << 3);
- len_included = get_bits1(&gb);
- need_reliable = get_bits1(&gb);
- set_id = get_bits(&gb, 5);
- skip_bits(&gb, 1);
- seq_no = get_bits(&gb, 16);
+ bitstream_init(&bc, buf, len << 3);
+ len_included = bitstream_read_bit(&bc);
+ need_reliable = bitstream_read_bit(&bc);
+ set_id = bitstream_read(&bc, 5);
+ bitstream_skip(&bc, 1);
+ seq_no = bitstream_read(&bc, 16);
if (len_included)
- skip_bits(&gb, 16);
- skip_bits(&gb, 2);
- stream_id = get_bits(&gb, 5);
- is_keyframe = !get_bits1(&gb);
- timestamp = get_bits_long(&gb, 32);
+ bitstream_skip(&bc, 16);
+ bitstream_skip(&bc, 2);
+ stream_id = bitstream_read(&bc, 5);
+ is_keyframe = !bitstream_read_bit(&bc);
+ timestamp = bitstream_read(&bc, 32);
if (set_id == 0x1f)
- set_id = get_bits(&gb, 16);
+ set_id = bitstream_read(&bc, 16);
if (need_reliable)
- skip_bits(&gb, 16);
+ bitstream_skip(&bc, 16);
if (stream_id == 0x1f)
- stream_id = get_bits(&gb, 16);
+ stream_id = bitstream_read(&bc, 16);
if (pset_id) *pset_id = set_id;
if (pseq_no) *pseq_no = seq_no;
if (pis_keyframe) *pis_keyframe = is_keyframe;
if (ptimestamp) *ptimestamp = timestamp;
- return consumed + (get_bits_count(&gb) >> 3);
+ return consumed + (bitstream_tell(&bc) >> 3);
}
/**< return 0 on packet, no more left, 1 on packet, 1 on partial packet... */
static int
rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
AVPacket *pkt, uint32_t *timestamp,
- const uint8_t *buf, int len, int flags)
+ const uint8_t *buf, int len, uint16_t rtp_seq, int flags)
{
int seq = 1, res;
AVIOContext pb;
if (rdt->audio_pkt_cnt == 0) {
- int pos;
+ int pos, rmflags;
ffio_init_context(&pb, buf, len, 0, NULL, NULL, NULL, NULL);
- flags = (flags & RTP_FLAG_KEY) ? 2 : 0;
+ rmflags = (flags & RTP_FLAG_KEY) ? 2 : 0;
res = ff_rm_parse_packet (rdt->rmctx, &pb, st, rdt->rmst[st->index], len, pkt,
- &seq, flags, *timestamp);
+ &seq, rmflags, *timestamp);
pos = avio_tell(&pb);
if (res < 0)
return res;
if (res > 0) {
- if (st->codec->codec_id == CODEC_ID_AAC) {
+ if (st->codecpar->codec_id == AV_CODEC_ID_AAC) {
memcpy (rdt->buffer, buf + pos, len - pos);
rdt->rmctx->pb = avio_alloc_context (rdt->buffer, len - pos, 0,
NULL, NULL, NULL, NULL);
ff_rm_retrieve_cache (rdt->rmctx, rdt->rmctx->pb,
st, rdt->rmst[st->index], pkt);
if (rdt->audio_pkt_cnt == 0 &&
- st->codec->codec_id == CODEC_ID_AAC)
+ st->codecpar->codec_id == AV_CODEC_ID_AAC)
av_freep(&rdt->rmctx->pb);
}
pkt->stream_index = st->index;
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->ic, s->dynamic_protocol_context,
s->streams[s->prev_stream_id],
- pkt, ×tamp, NULL, 0, flags);
+ pkt, ×tamp, NULL, 0, 0, flags);
return rv;
}
rv = s->parse_packet(s->ic, s->dynamic_protocol_context,
s->streams[s->prev_stream_id],
- pkt, ×tamp, buf, len, flags);
+ pkt, ×tamp, buf, len, 0, flags);
return rv;
}
len -= 2; /* skip embracing " at start/end */
}
*target_len = len * 3 / 4;
- target = av_mallocz(*target_len + FF_INPUT_BUFFER_PADDING_SIZE);
+ target = av_mallocz(*target_len + AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!target)
+ return NULL;
av_base64_decode(target, p, *target_len);
return target;
}
for (n = 0; n < s->nb_streams; n++)
if (s->streams[n]->id == stream->id) {
- int count = s->streams[n]->index + 1;
+ int count = s->streams[n]->index + 1, err;
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;
+ if ((err = av_reallocp(&rdt->rmst,
+ count * sizeof(*rdt->rmst))) < 0) {
+ rdt->nb_rmst = 0;
+ return err;
+ }
+ memset(rdt->rmst + rdt->nb_rmst, 0,
+ (count - rdt->nb_rmst) * sizeof(*rdt->rmst));
rdt->nb_rmst = count;
}
rdt->rmst[s->streams[n]->index] = ff_rm_alloc_rmstream();
+ if (!rdt->rmst[s->streams[n]->index])
+ return AVERROR(ENOMEM);
rdt_load_mdpr(rdt, s->streams[n], (n - first) * 2);
}
}
{
do {
/* can be either averagebandwidth= or AverageBandwidth= */
- if (sscanf(p, " %*1[Aa]verage%*1[Bb]andwidth=%d", &st->codec->bit_rate) == 1)
+ if (sscanf(p, " %*1[Aa]verage%*1[Bb]andwidth=%d", &st->codecpar->bit_rate) == 1)
break;
if (!(p = strchr(p, ',')) || p > end)
p = end;
if (!(st = avformat_new_stream(s, NULL)))
return NULL;
st->id = orig_st->id;
- st->codec->codec_type = orig_st->codec->codec_type;
+ st->codecpar->codec_type = orig_st->codecpar->codec_type;
st->first_dts = orig_st->first_dts;
return st;
real_parse_asm_rulebook(s, s->streams[stream_index], p);
}
-static PayloadContext *
-rdt_new_context (void)
+static av_cold int rdt_init(AVFormatContext *s, int st_index, PayloadContext *rdt)
{
- PayloadContext *rdt = av_mallocz(sizeof(PayloadContext));
-
- int ret = avformat_open_input(&rdt->rmctx, "", &ff_rdt_demuxer, NULL);
- if (ret < 0) {
- av_free(rdt);
- return NULL;
- }
-
- return rdt;
+ return avformat_open_input(&rdt->rmctx, "", &ff_rdt_demuxer, NULL);
}
static void
-rdt_free_context (PayloadContext *rdt)
+rdt_close_context (PayloadContext *rdt)
{
int i;
avformat_close_input(&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 = { \
+static RTPDynamicProtocolHandler rdt_ ## n ## _handler = { \
.enc_name = s, \
.codec_type = t, \
- .codec_id = CODEC_ID_NONE, \
+ .codec_id = AV_CODEC_ID_NONE, \
+ .priv_data_size = sizeof(PayloadContext), \
+ .init = rdt_init, \
.parse_sdp_a_line = rdt_parse_sdp_line, \
- .alloc = rdt_new_context, \
- .free = rdt_free_context, \
+ .close = rdt_close_context, \
.parse_packet = rdt_parse_packet \
}
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)
+void ff_register_rdt_dynamic_payload_handlers(void)
{
- ff_register_dynamic_payload_handler(&ff_rdt_video_handler);
- ff_register_dynamic_payload_handler(&ff_rdt_audio_handler);
- ff_register_dynamic_payload_handler(&ff_rdt_live_video_handler);
- ff_register_dynamic_payload_handler(&ff_rdt_live_audio_handler);
+ ff_register_dynamic_payload_handler(&rdt_video_handler);
+ ff_register_dynamic_payload_handler(&rdt_audio_handler);
+ ff_register_dynamic_payload_handler(&rdt_live_video_handler);
+ ff_register_dynamic_payload_handler(&rdt_live_audio_handler);
}
projects / ffmpeg / blobdiff