virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Full support for sending H.264 in RTP

Browse Source 
This implements support for the "MP4" syntax of H.264 bitstreams.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Luca Abeni 2011-06-15 17:59:03 +02:00 committed by Michael Niedermayer
parent 4f4d1358ae
commit e7c7b2d878
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/rtpenc_h264.c
View File

@ -29,6 +29,24 @@
#include "avc.h" #include "avc.h"
#include "rtpenc.h" #include "rtpenc.h"
static const uint8_t *avc_mp4_find_startcode(const uint8_t *start, const uint8_t *end, int nal_lenght_size)
{
int res = 0;
if (end - start < nal_lenght_size) {
return NULL;
}
while (nal_lenght_size--) {
res = (res << 8) | *start++;
}
if (res + start > end) {
return NULL;
}
return res + start;
}
static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last) static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last)
{ {
RTPMuxContext *s = s1->priv_data; RTPMuxContext *s = s1->priv_data;
@ -66,12 +84,20 @@ void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size)
RTPMuxContext *s = s1->priv_data; RTPMuxContext *s = s1->priv_data;
s->timestamp = s->cur_timestamp; s->timestamp = s->cur_timestamp;
r = ff_avc_find_startcode(buf1, buf1 + size); r = s->nal_length_size ? (avc_mp4_find_startcode(buf1, buf1 + size, s->nal_length_size) ? buf1 : buf1 + size) : ff_avc_find_startcode(buf1, buf1 + size);
while (r < buf1 + size) { while (r < buf1 + size) {
const uint8_t *r1; const uint8_t *r1;
if (s->nal_length_size) {
r1 = avc_mp4_find_startcode(r, buf1 + size, s->nal_length_size);
if (!r1) {
r1 = buf1 + size;
}
r += s->nal_length_size;
} else {
while(!*(r++)); while(!*(r++));
r1 = ff_avc_find_startcode(r, buf1 + size); r1 = ff_avc_find_startcode(r, buf1 + size);
}
nal_send(s1, r, r1 - r, (r1 == buf1 + size)); nal_send(s1, r, r1 - r, (r1 == buf1 + size));
r = r1; r = r1;
} }