generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support broken avc nal encapsulation.

Browse Source 
Fixes issue987.

Originally committed as revision 18533 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2009-04-16 04:46:44 +00:00
parent 0bc08ed941
commit 74b14aacfa
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264.c
View File

@@ -7461,6 +7461,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
int buf_index=0; int buf_index=0;
H264Context *hx; ///< thread context H264Context *hx; ///< thread context
int context_count = 0; int context_count = 0;
int next_avc= h->is_avc ? 0 : buf_size;
h->max_contexts = avctx->thread_count; h->max_contexts = avctx->thread_count;
#if 0 #if 0
@@ -7484,7 +7485,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
int i, nalsize = 0; int i, nalsize = 0;
int err; int err;
if(h->is_avc) { if(buf_index >= next_avc) {
if(buf_index >= buf_size) break; if(buf_index >= buf_size) break;
nalsize = 0; nalsize = 0;
for(i = 0; i < h->nal_length_size; i++) for(i = 0; i < h->nal_length_size; i++)
@@ -7498,6 +7499,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
break; break;
} }
} }
next_avc= buf_index + nalsize;
} else { } else {
// start code prefix search // start code prefix search
for(; buf_index + 3 < buf_size; buf_index++){ for(; buf_index + 3 < buf_size; buf_index++){
@@ -7513,7 +7515,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
hx = h->thread_context[context_count]; hx = h->thread_context[context_count];
ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index);
if (ptr==NULL || dst_length < 0){ if (ptr==NULL || dst_length < 0){
return -1; return -1;
} }
@@ -7525,13 +7527,12 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length);
} }
if (h->is_avc && (nalsize != consumed)){ if (h->is_avc && (nalsize != consumed) && nalsize){
int i, debug_level = AV_LOG_DEBUG; int i, debug_level = AV_LOG_DEBUG;
for (i = consumed; i < nalsize; i++) for (i = consumed; i < nalsize; i++)
if (buf[buf_index+i]) if (buf[buf_index+i])
debug_level = AV_LOG_ERROR; debug_level = AV_LOG_ERROR;
av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize);
consumed= nalsize;
} }
buf_index += consumed; buf_index += consumed;