*/
#include "avformat.h"
+#include "avio_internal.h"
#include "rtpdec_formats.h"
+#include "libavutil/attributes.h"
#include "libavutil/intreadwrite.h"
-#include "libavcodec/get_bits.h"
+
+#include "libavcodec/bitstream.h"
struct PayloadContext {
AVIOContext *buf;
uint8_t endbyte;
int endbyte_bits;
uint32_t timestamp;
+ int newformat;
};
-static PayloadContext *h263_new_context(void)
-{
- return av_mallocz(sizeof(PayloadContext));
-}
-
-static void h263_free_context(PayloadContext *data)
+static void h263_close_context(PayloadContext *data)
{
- if (!data)
- return;
- if (data->buf) {
- uint8_t *p;
- avio_close_dyn_buf(data->buf, &p);
- av_free(p);
- }
- av_free(data);
+ ffio_free_dyn_buf(&data->buf);
}
static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data,
AVStream *st, AVPacket *pkt, uint32_t *timestamp,
- const uint8_t *buf, int len, int flags)
+ const uint8_t *buf, int len, uint16_t seq,
+ int flags)
{
- int f, p, i, sbit, ebit; /* Corresponding to header fields in the RFC */
- int header_size;
+ /* Corresponding to header fields in the RFC */
+ int f, p, i, sbit, ebit, src, r;
+ int header_size, ret;
+
+ if (data->newformat)
+ return ff_h263_handle_packet(ctx, data, st, pkt, timestamp, buf, len,
+ seq, flags);
if (data->buf && data->timestamp != *timestamp) {
/* Dropping old buffered, unfinished data */
- uint8_t *p;
- avio_close_dyn_buf(data->buf, &p);
- av_free(p);
- data->buf = NULL;
+ ffio_free_dyn_buf(&data->buf);
+ data->endbyte_bits = 0;
}
if (len < 4) {
/* Mode A */
header_size = 4;
i = buf[1] & 0x10;
+ r = ((buf[1] & 0x01) << 3) | ((buf[2] & 0xe0) >> 5);
} else if (!p) {
/* Mode B */
header_size = 8;
len, header_size);
return AVERROR_INVALIDDATA;
}
+ r = buf[3] & 0x03;
i = buf[4] & 0x80;
} else {
/* Mode C */
len, header_size);
return AVERROR_INVALIDDATA;
}
+ r = buf[3] & 0x03;
i = buf[4] & 0x80;
}
sbit = (buf[0] >> 3) & 0x7;
ebit = buf[0] & 0x7;
+ src = (buf[1] & 0xe0) >> 5;
+ if (!(buf[0] & 0xf8)) { /* Reserved bits in RFC 2429/4629 are zero */
+ if ((src == 0 || src >= 6) && r) {
+ /* Invalid src for this format, and bits that should be zero
+ * according to RFC 2190 aren't zero. */
+ av_log(ctx, AV_LOG_WARNING,
+ "Interpreting H.263 RTP data as RFC 2429/4629 even though "
+ "signalled with a static payload type.\n");
+ data->newformat = 1;
+ return ff_h263_handle_packet(ctx, data, st, pkt, timestamp, buf,
+ len, seq, flags);
+ }
+ }
buf += header_size;
len -= header_size;
if (!data->buf) {
/* Check the picture start code, only start buffering a new frame
* if this is correct */
- if (!f && len > 4 && AV_RB32(buf) >> 10 == 0x20) {
- int ret = avio_open_dyn_buf(&data->buf);
+ if (len > 4 && AV_RB32(buf) >> 10 == 0x20) {
+ ret = avio_open_dyn_buf(&data->buf);
if (ret < 0)
return ret;
data->timestamp = *timestamp;
avio_w8(data->buf, data->endbyte);
} else {
/* Start/end skip bits not matching - missed packets? */
- GetBitContext gb;
- init_get_bits(&gb, buf, len*8 - ebit);
- skip_bits(&gb, sbit);
+ BitstreamContext bc;
+ bitstream_init(&bc, buf, len * 8 - ebit);
+ bitstream_skip(&bc, sbit);
if (data->endbyte_bits) {
- data->endbyte |= get_bits(&gb, 8 - data->endbyte_bits);
+ data->endbyte |= bitstream_read(&bc, 8 - data->endbyte_bits);
avio_w8(data->buf, data->endbyte);
}
- while (get_bits_left(&gb) >= 8)
- avio_w8(data->buf, get_bits(&gb, 8));
- data->endbyte_bits = get_bits_left(&gb);
+ while (bitstream_bits_left(&bc) >= 8)
+ avio_w8(data->buf, bitstream_read(&bc, 8));
+ data->endbyte_bits = bitstream_bits_left(&bc);
if (data->endbyte_bits)
- data->endbyte = get_bits(&gb, data->endbyte_bits) <<
+ data->endbyte = bitstream_read(&bc, data->endbyte_bits) <<
(8 - data->endbyte_bits);
ebit = 0;
len = 0;
avio_w8(data->buf, data->endbyte);
data->endbyte_bits = 0;
- av_init_packet(pkt);
- pkt->size = avio_close_dyn_buf(data->buf, &pkt->data);
- pkt->destruct = av_destruct_packet;
- pkt->stream_index = st->index;
+ ret = ff_rtp_finalize_packet(pkt, &data->buf, st->index);
+ if (ret < 0)
+ return ret;
if (!i)
pkt->flags |= AV_PKT_FLAG_KEY;
- data->buf = NULL;
return 0;
}
RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_VIDEO,
- .codec_id = CODEC_ID_H263,
+ .codec_id = AV_CODEC_ID_H263,
+ .need_parsing = AVSTREAM_PARSE_FULL,
.parse_packet = h263_handle_packet,
- .alloc = h263_new_context,
- .free = h263_free_context,
+ .priv_data_size = sizeof(PayloadContext),
+ .close = h263_close_context,
.static_payload_id = 34,
};