mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 19:18:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegcodecmap.c: Add some debug that revealed that the escape code was disabled...

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (nal_escape), (copy_config),
(gst_ffmpeg_caps_with_codecid):
Add some debug that revealed that the escape code was disabled...
This commit is contained in:
Wim Taymans 2008-09-04 15:50:03 +00:00
parent d16e6f1ecc
commit 5211c2072a
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-09-04 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegcodecmap.c: (nal_escape), (copy_config),
(gst_ffmpeg_caps_with_codecid):
Add some debug that revealed that the escape code was disabled...
2008-09-04 Wim Taymans <wim.taymans@collabora.co.uk> 2008-09-04 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame), * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame),

14
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -1625,6 +1625,7 @@ nal_escape (guint8 *dst, guint8 *src, guint size, guint *destsize)
while (srcp < end) { while (srcp < end) {
if (count == 2 && *srcp <= 0x03 ) { if (count == 2 && *srcp <= 0x03 ) {
GST_DEBUG ("added escape code");
*dstp++ = 0x03; *dstp++ = 0x03;
count = 0; count = 0;
} }
@ -1633,6 +1634,7 @@ nal_escape (guint8 *dst, guint8 *src, guint size, guint *destsize)
else else
count = 0; count = 0;
GST_DEBUG ("copy %02x, count %d", *srcp, count);
*dstp++ = *srcp++; *dstp++ = *srcp++;
} }
*destsize = dstp - dst; *destsize = dstp - dst;
@ -1648,8 +1650,6 @@ copy_config (guint8 *dst, guint8 *src, guint size, guint *destsize)
gint cnt, i; gint cnt, i;
guint nalsize, esize; guint nalsize, esize;
goto full_copy;
/* check size */ /* check size */
if (size < 7) if (size < 7)
goto full_copy; goto full_copy;
@ -1660,11 +1660,14 @@ copy_config (guint8 *dst, guint8 *src, guint size, guint *destsize)
cnt = *(srcp + 5) & 0x1f; /* Number of sps */ cnt = *(srcp + 5) & 0x1f; /* Number of sps */
GST_DEBUG ("num SPS %d", cnt);
memcpy (dstp, srcp, 6); memcpy (dstp, srcp, 6);
srcp += 6; srcp += 6;
dstp += 6; dstp += 6;
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
GST_DEBUG ("copy SPS %d", i);
nalsize = (srcp[0] << 8) | srcp[1]; nalsize = (srcp[0] << 8) | srcp[1];
nal_escape (dstp + 2, srcp + 2, nalsize, &esize); nal_escape (dstp + 2, srcp + 2, nalsize, &esize);
dstp[0] = esize >> 8; dstp[0] = esize >> 8;
@ -1675,7 +1678,10 @@ copy_config (guint8 *dst, guint8 *src, guint size, guint *destsize)
cnt = *(dstp++) = *(srcp++); /* Number of pps */ cnt = *(dstp++) = *(srcp++); /* Number of pps */
GST_DEBUG ("num PPS %d", cnt);
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
GST_DEBUG ("copy PPS %d", i);
nalsize = (srcp[0] << 8) | srcp[1]; nalsize = (srcp[0] << 8) | srcp[1];
nal_escape (dstp + 2, srcp + 2, nalsize, &esize); nal_escape (dstp + 2, srcp + 2, nalsize, &esize);
dstp[0] = esize >> 8; dstp[0] = esize >> 8;
@ -1689,6 +1695,7 @@ copy_config (guint8 *dst, guint8 *src, guint size, guint *destsize)
full_copy: full_copy:
{ {
GST_DEBUG ("something unexpected, doing full copy");
memcpy (dst, src, size); memcpy (dst, src, size);
*destsize = size; *destsize = size;
return; return;
@ -1731,16 +1738,19 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
if (codec_id == CODEC_ID_H264) { if (codec_id == CODEC_ID_H264) {
guint extrasize; guint extrasize;
GST_DEBUG ("copy, escaping codec_data %d", size);
/* ffmpeg h264 expects the codec_data to be escaped, there is no real /* ffmpeg h264 expects the codec_data to be escaped, there is no real
* reason for this but let's just escape it for now. Start by allocating * reason for this but let's just escape it for now. Start by allocating
* enough space, x2 is more than enough. */ * enough space, x2 is more than enough. */
context->extradata = context->extradata =
av_mallocz (GST_ROUND_UP_16 (size * 2 + FF_INPUT_BUFFER_PADDING_SIZE)); av_mallocz (GST_ROUND_UP_16 (size * 2 + FF_INPUT_BUFFER_PADDING_SIZE));
copy_config (context->extradata, data, size, &extrasize); copy_config (context->extradata, data, size, &extrasize);
GST_DEBUG ("escaped size: %d", extrasize);
context->extradata_size = extrasize; context->extradata_size = extrasize;
} }
else { else {
/* allocate with enough padding */ /* allocate with enough padding */
GST_DEBUG ("copy codec_data");
context->extradata = context->extradata =
av_mallocz (GST_ROUND_UP_16 (size + FF_INPUT_BUFFER_PADDING_SIZE)); av_mallocz (GST_ROUND_UP_16 (size + FF_INPUT_BUFFER_PADDING_SIZE));
memcpy (context->extradata, data, size); memcpy (context->extradata, data, size);