[FFmpeg-cvslog] sdp: add support for H.261

Thomas Volkert git at videolan.org
Sun Oct 5 00:32:28 CEST 2014


ffmpeg | branch: release/2.4 | Thomas Volkert <thomas at homer-conferencing.com> | Sat Oct  4 00:17:01 2014 +0200| [a16558e12204e5ae4597d5d384bbfca293fe74cb] | committer: Michael Niedermayer

sdp: add support for H.261

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 1c4c78ee4073b2387681d916a167b758369b9216)

Conflicts:

	libavformat/version.h

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a16558e12204e5ae4597d5d384bbfca293fe74cb
---

 libavformat/sdp.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 8c831f3..bc27eae 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -414,6 +414,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



More information about the ffmpeg-cvslog mailing list