From: Thomas Volkert <[email protected]>
---
Changelog | 1 +
libavcodec/h261.h | 1 +
libavcodec/h261enc.c | 4 +-
libavcodec/mpegvideo_enc.c | 10 +++
libavformat/Makefile | 2 +
libavformat/rtpdec.c | 1 +
libavformat/rtpdec_formats.h | 1 +
libavformat/rtpdec_h261.c | 202 +++++++++++++++++++++++++++++++++++++++++++
libavformat/rtpenc.c | 4 +
libavformat/rtpenc.h | 1 +
libavformat/rtpenc_h261.c | 85 ++++++++++++++++++
libavformat/sdp.c | 13 +++
libavformat/version.h | 4 +-
13 files changed, 325 insertions(+), 4 deletions(-)
create mode 100644 libavformat/rtpdec_h261.c
create mode 100644 libavformat/rtpenc_h261.c
diff --git a/Changelog b/Changelog
index 6af2e8a..cec72b6 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,7 @@ version <next>:
- avplay now exits by default at the end of playback
- XCB-based screen-grabber
- creating DASH compatible fragmented MP4, MPEG-DASH segmenting muxer
+- H.251 RTP payload format (rfc 4587) packetizer and depacketizer
version 11:
diff --git a/libavcodec/h261.h b/libavcodec/h261.h
index ad7e28b..6df91be 100644
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@@ -64,6 +64,7 @@ void ff_h261_loop_filter(MpegEncContext *s);
void ff_h261_common_init(void);
int ff_h261_get_picture_format(int width, int height);
+void ff_h261_encode_gob_header(MpegEncContext *s, int mb_line);
void ff_h261_reorder_mb_index(MpegEncContext *s);
void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
int motion_x, int motion_y);
diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c
index f24e590..d3afd84 100644
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@ -83,7 +83,7 @@ void ff_h261_encode_picture_header(MpegEncContext *s, int
picture_number)
/**
* Encode a group of blocks header.
*/
-static void h261_encode_gob_header(MpegEncContext *s, int mb_line)
+void ff_h261_encode_gob_header(MpegEncContext *s, int mb_line)
{
H261Context *h = (H261Context *)s;
if (ff_h261_get_picture_format(s->width, s->height) == 0) {
@@ -106,7 +106,7 @@ void ff_h261_reorder_mb_index(MpegEncContext *s)
int index = s->mb_x + s->mb_y * s->mb_width;
if (index % 33 == 0)
- h261_encode_gob_header(s, 0);
+ ff_h261_encode_gob_header(s, 0);
/* for CIF the GOB's are fragmented in the middle of a scanline
* that's why we need to adjust the x and y index of the macroblocks */
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8775eac..8d3849b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -2623,6 +2623,12 @@ static int encode_thread(AVCodecContext *c, void *arg){
if(s->start_mb_y == mb_y && mb_y > 0 && mb_x==0)
is_gob_start=1;
switch(s->codec_id){
+ case AV_CODEC_ID_H261:
+ //FIXME: hard-coded deactivation of extra GOB headers
within frames,
+ // it allows for a correct h261 video stream and
correct presentation at receiver side,
+ // but it does not support decoding restart of a
frame halfway through a packet
+ is_gob_start=0;
+ break;
case AV_CODEC_ID_H263:
case AV_CODEC_ID_H263P:
if(!s->h263_slice_structured)
@@ -2677,6 +2683,10 @@ static int encode_thread(AVCodecContext *c, void *arg){
ff_mpeg1_clean_buffers(s);
}
break;
+ case AV_CODEC_ID_H261:
+ if (CONFIG_H261_ENCODER)
+ ff_h261_encode_gob_header(s, mb_y);
+ break;
case AV_CODEC_ID_H263:
case AV_CODEC_ID_H263P:
if (CONFIG_H263_ENCODER)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 15f205a..cc93e5b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -32,6 +32,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o
\
rtpdec_amr.o \
rtpdec_asf.o \
rtpdec_g726.o \
+ rtpdec_h261.o \
rtpdec_h263.o \
rtpdec_h263_rfc2190.o \
rtpdec_h264.o \
@@ -290,6 +291,7 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \
rtpenc_aac.o \
rtpenc_latm.o \
rtpenc_amr.o \
+ rtpenc_h261.o \
rtpenc_h263.o \
rtpenc_h263_rfc2190.o \
rtpenc_hevc.o \
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index b5e5200..97f1428 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -66,6 +66,7 @@ void ff_register_rtp_dynamic_payload_handlers(void)
ff_register_dynamic_payload_handler(&ff_g726_24_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_g726_32_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_g726_40_dynamic_handler);
+ ff_register_dynamic_payload_handler(&ff_h261_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_h263_1998_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_h263_2000_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_h263_rfc2190_dynamic_handler);
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h
index 02335ed..0c9f49c 100644
--- a/libavformat/rtpdec_formats.h
+++ b/libavformat/rtpdec_formats.h
@@ -41,6 +41,7 @@ extern RTPDynamicProtocolHandler ff_g726_16_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_24_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_32_dynamic_handler;
extern RTPDynamicProtocolHandler ff_g726_40_dynamic_handler;
+extern RTPDynamicProtocolHandler ff_h261_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler;
extern RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler;
diff --git a/libavformat/rtpdec_h261.c b/libavformat/rtpdec_h261.c
new file mode 100644
index 0000000..0701b16
--- /dev/null
+++ b/libavformat/rtpdec_h261.c
@@ -0,0 +1,202 @@
+/*
+ * RTP parser for H.261 payload format (RFC 4587)
+ * Copyright (c) 2014 Thomas Volkert <[email protected]>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+#include "rtpdec_formats.h"
+#include "libavcodec/get_bits.h"
+
+#define RTP_H261_PAYLOAD_HEADER_SIZE 4
+
+struct PayloadContext {
+ AVIOContext *buf;
+ uint8_t endbyte;
+ int endbyte_bits;
+ uint32_t timestamp;
+};
+
+static av_cold PayloadContext *h261_new_context(void)
+{
+ return av_mallocz(sizeof(PayloadContext));
+}
+
+static void h261_free_dyn_buffer(AVIOContext **dyn_buf)
+{
+ uint8_t *ptr_dyn_buffer;
+ avio_close_dyn_buf(*dyn_buf, &ptr_dyn_buffer);
+ av_free(ptr_dyn_buffer);
+ *dyn_buf = NULL;
+}
+
+static av_cold void h261_free_context(PayloadContext *pl_ctx)
+{
+ /* return if context is invalid */
+ if (!pl_ctx)
+ return;
+
+ /* free buffer if it is valid */
+ if (pl_ctx->buf) {
+ h261_free_dyn_buffer(&pl_ctx->buf);
+ }
+
+ /* free context */
+ av_free(pl_ctx);
+}
+
+static av_cold int h261_init(AVFormatContext *ctx, int st_index,
+ PayloadContext *data)
+{
+ if (st_index < 0)
+ return 0;
+
+ ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL;
+
+ return 0;
+}
+
+static int h261_handle_packet(AVFormatContext *ctx, PayloadContext
*rtp_h261_ctx,
+ AVStream *st, AVPacket *pkt, uint32_t *timestamp,
+ const uint8_t *buf, int len, uint16_t seq,
+ int flags)
+{
+ int sbit, ebit, gobn, mbap, quant;
+ int res;
+
+ /* drop data of previous packets in case of non-continuous (loss) packet
stream */
+ if (rtp_h261_ctx->buf && rtp_h261_ctx->timestamp != *timestamp) {
+ h261_free_dyn_buffer(&rtp_h261_ctx->buf);
+ }
+
+ /* sanity check for size of input packet: 1 byte payload at least */
+ if (len < RTP_H261_PAYLOAD_HEADER_SIZE + 1) {
+ av_log(ctx, AV_LOG_ERROR, "Too short RTP/H.261 packet, got %d
bytes\n", len);
+ return AVERROR_INVALIDDATA;
+ }
+
+ /*
+ decode the H.261 payload header according to section 4.1 of RFC 4587:
+ (uses 4 bytes between RTP header and H.261 stream per packet)
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |SBIT |EBIT |I|V| GOBN | MBAP | QUANT | HMVD | VMVD |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+ Start bit position (SBIT): 3 bits
+ End bit position (EBIT): 3 bits
+ INTRA-frame encoded data (I): 1 bit
+ Motion Vector flag (V): 1 bit
+ GOB number (GOBN): 4 bits
+ Macroblock address predictor (MBAP): 5 bits
+ Quantizer (QUANT): 5 bits
+ Horizontal motion vector data (HMVD): 5 bits
+ Vertical motion vector data (VMVD): 5 bits
+
+ */
+ sbit = (buf[0] >> 5) & 0x07;
+ ebit = (buf[0] >> 2) & 0x07;
+ gobn = (buf[1] >> 4) & 0x0f;
+ mbap = ((buf[1] << 1) & 0x1e) | ((buf[2] >> 7) & 0x01);
+ quant = (buf[2] >> 2) & 0x1f;
+
+ /* pass the H.261 payload header and continue with the actual payload */
+ buf += RTP_H261_PAYLOAD_HEADER_SIZE;
+ len -= RTP_H261_PAYLOAD_HEADER_SIZE;
+
+ /* start frame buffering with new dynamic buffer */
+ if (!rtp_h261_ctx->buf) {
+ /* sanity check: a new frame starts with gobn=0, sbit=0, mbap=0,
uqnat=0 */
+ if (!gobn && !sbit && !mbap && !quant){
+ res = avio_open_dyn_buf(&rtp_h261_ctx->buf);
+ if (res < 0)
+ return res;
+ /* update the timestamp in the frame packet with the one from the
RTP packet */
+ rtp_h261_ctx->timestamp = *timestamp;
+ } else {
+ /* frame not started yet, need more packets */
+ return AVERROR(EAGAIN);
+ }
+ }
+
+ /* do the "byte merging" at the boundaries of two consecutive frame
fragments */
+ if (rtp_h261_ctx->endbyte_bits || sbit) {
+ if (rtp_h261_ctx->endbyte_bits == sbit) {
+ rtp_h261_ctx->endbyte |= buf[0] & (0xff >> sbit);
+ rtp_h261_ctx->endbyte_bits = 0;
+ buf++;
+ len--;
+ avio_w8(rtp_h261_ctx->buf, rtp_h261_ctx->endbyte);
+ } else {
+ /* ebit/sbit values inconsistent, assuming packet loss */
+ GetBitContext gb;
+ init_get_bits(&gb, buf, len*8 - ebit);
+ skip_bits(&gb, sbit);
+ if (rtp_h261_ctx->endbyte_bits) {
+ rtp_h261_ctx->endbyte |= get_bits(&gb, 8 -
rtp_h261_ctx->endbyte_bits);
+ avio_w8(rtp_h261_ctx->buf, rtp_h261_ctx->endbyte);
+ }
+ while (get_bits_left(&gb) >= 8)
+ avio_w8(rtp_h261_ctx->buf, get_bits(&gb, 8));
+ rtp_h261_ctx->endbyte_bits = get_bits_left(&gb);
+ if (rtp_h261_ctx->endbyte_bits)
+ rtp_h261_ctx->endbyte = get_bits(&gb,
rtp_h261_ctx->endbyte_bits) <<
+ (8 - rtp_h261_ctx->endbyte_bits);
+ ebit = 0;
+ len = 0;
+ }
+ }
+ if (ebit) {
+ if (len > 0)
+ avio_write(rtp_h261_ctx->buf, buf, len - 1);
+ rtp_h261_ctx->endbyte_bits = 8 - ebit;
+ rtp_h261_ctx->endbyte = buf[len - 1] & (0xff << ebit);
+ } else {
+ avio_write(rtp_h261_ctx->buf, buf, len);
+ }
+
+ /* RTP marker bit means: last fragment of current frame was received;
+ otherwise, an additional fragment is needed for the current frame */
+ if (!(flags & RTP_FLAG_MARKER))
+ return AVERROR(EAGAIN);
+
+ /* write the completed last byte from the "byte merging" */
+ if (rtp_h261_ctx->endbyte_bits)
+ avio_w8(rtp_h261_ctx->buf, rtp_h261_ctx->endbyte);
+ rtp_h261_ctx->endbyte_bits = 0;
+
+ /* close frame buffering and create resulting A/V packet */
+ res = ff_rtp_finalize_packet(pkt, &rtp_h261_ctx->buf, st->index);
+ if (res < 0)
+ return res;
+
+ return 0;
+}
+
+RTPDynamicProtocolHandler ff_h261_dynamic_handler = {
+ .enc_name = "H261",
+ .codec_type = AVMEDIA_TYPE_VIDEO,
+ .codec_id = AV_CODEC_ID_H261,
+ .init = h261_init,
+ .alloc = h261_new_context,
+ .free = h261_free_context,
+ .parse_packet = h261_handle_packet,
+ .static_payload_id = 31,
+};
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 647a807..4fa891c 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -49,6 +49,7 @@ static const AVClass rtp_muxer_class = {
static int is_supported(enum AVCodecID id)
{
switch(id) {
+ case AV_CODEC_ID_H261:
case AV_CODEC_ID_H263:
case AV_CODEC_ID_H263P:
case AV_CODEC_ID_H264:
@@ -563,6 +564,9 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket
*pkt)
case AV_CODEC_ID_H264:
ff_rtp_send_h264(s1, pkt->data, size);
break;
+ case AV_CODEC_ID_H261:
+ ff_rtp_send_h261(s1, pkt->data, size);
+ break;
case AV_CODEC_ID_H263:
if (s->flags & FF_RTP_FLAG_RFC2190) {
int mb_info_size = 0;
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h
index 4a72a49..f2ac0fa 100644
--- a/libavformat/rtpenc.h
+++ b/libavformat/rtpenc.h
@@ -81,6 +81,7 @@ typedef struct RTPMuxContext RTPMuxContext;
void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int
m);
void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
+void ff_rtp_send_h261(AVFormatContext *s1, const uint8_t *buf1, int size);
void ff_rtp_send_h263(AVFormatContext *s1, const uint8_t *buf1, int size);
void ff_rtp_send_h263_rfc2190(AVFormatContext *s1, const uint8_t *buf1, int
size,
const uint8_t *mb_info, int mb_info_size);
diff --git a/libavformat/rtpenc_h261.c b/libavformat/rtpenc_h261.c
new file mode 100644
index 0000000..f7cf5cc
--- /dev/null
+++ b/libavformat/rtpenc_h261.c
@@ -0,0 +1,85 @@
+/*
+ * RTP packetization for H.261 video (RFC 4587)
+ * Copyright (c) 2014 Thomas Volkert <[email protected]>
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+#include "rtpenc.h"
+
+#define RTP_H261_HEADER_SIZE 4
+
+void ff_rtp_send_h261(AVFormatContext *ctx, const uint8_t *frame_buf, int
frame_size)
+{
+ int cur_frame_size;
+ int last_packet_of_frame;
+ int max_packet_size;
+ RTPMuxContext *rtp_ctx = ctx->priv_data;
+
+ /* use the default 90 KHz time stamp */
+ rtp_ctx->timestamp = rtp_ctx->cur_timestamp;
+ max_packet_size = rtp_ctx->max_payload_size;
+
+ /* continue as long as not all frame data is processed */
+ while (frame_size > 0) {
+ /*
+ encode the H.261 payload header according to section 4.1 of RFC 4587:
+ (uses 4 bytes between RTP header and H.261 stream per packet)
+
+ 0 1 2 3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |SBIT |EBIT |I|V| GOBN | MBAP | QUANT | HMVD | VMVD |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+ Start bit position (SBIT): 3 bits
+ End bit position (EBIT): 3 bits
+ INTRA-frame encoded data (I): 1 bit
+ Motion Vector flag (V): 1 bit
+ GOB number (GOBN): 4 bits
+ Macroblock address predictor (MBAP): 5 bits
+ Quantizer (QUANT): 5 bits
+ Horizontal motion vector data (HMVD): 5 bits
+ Vertical motion vector data (VMVD): 5 bits
+
+ */
+ rtp_ctx->buf[0] = 1;
+ rtp_ctx->buf[1] = 0;
+ rtp_ctx->buf[2] = 0;
+ rtp_ctx->buf[3] = 0;
+
+ cur_frame_size = FFMIN(max_packet_size - RTP_H261_HEADER_SIZE,
frame_size);
+
+ /* look for a better place to split the frame into packets. */
+ if (cur_frame_size < frame_size) {
+ const uint8_t *packet_end =
ff_h263_find_resync_marker_reverse(frame_buf,
+
frame_buf + cur_frame_size);
+ cur_frame_size = packet_end - frame_buf;
+ }
+
+ /* calculate the "marker" bit for the RTP header */
+ last_packet_of_frame = (cur_frame_size == frame_size);
+
+ /* complete and send RTP packet */
+ memcpy(&rtp_ctx->buf[RTP_H261_HEADER_SIZE], frame_buf, cur_frame_size);
+ ff_rtp_send_data(ctx, rtp_ctx->buf, RTP_H261_HEADER_SIZE +
cur_frame_size, last_packet_of_frame);
+
+ frame_buf += cur_frame_size;
+ frame_size -= cur_frame_size;
+ }
+}
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index a14a239..6bf5e30 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -498,6 +498,19 @@ static char *sdp_write_media_attributes(char *buff, int
size, AVCodecContext *c,
payload_type, mode, config ? config : "");
break;
}
+ case AV_CODEC_ID_H261:
+ {
+ const char *pic_fmt = NULL;
+ /* only QCIF and CIF are specified as supported in RFC 4587 */
+ if (c->width == 176 && c->height == 144)
+ pic_fmt = "QCIF=1";
+ if (c->width == 352 && c->height == 288)
+ pic_fmt = "CIF=1";
+ av_strlcatf(buff, size, "a=rtpmap:%d H261/90000\r\n",
payload_type);
+ if (pic_fmt)
+ av_strlcatf(buff, size, "a=fmtp:%d %s\r\n", payload_type,
pic_fmt);
+ break;
+ }
case AV_CODEC_ID_H263:
case AV_CODEC_ID_H263P:
/* a=framesize is required by 3GPP TS 26.234 (PSS). It
diff --git a/libavformat/version.h b/libavformat/version.h
index b4d31dd..b2f5327 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,8 +30,8 @@
#include "libavutil/version.h"
#define LIBAVFORMAT_VERSION_MAJOR 56
-#define LIBAVFORMAT_VERSION_MINOR 7
-#define LIBAVFORMAT_VERSION_MICRO 1
+#define LIBAVFORMAT_VERSION_MINOR 8
+#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
--
1.9.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
