RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

frame-mt: return consumed packet size in ff_thread_decode_frame 

This is required to fulfill avcodec_decode_video2() promise to return
the number of consumed bytes on success.
This commit is contained in:
Janne Grunau 2011-11-24 01:50:05 +01:00
parent d14d4d982c
commit 117e2a30f2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pthread.c
View File

@ -522,7 +522,7 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
if (fctx->next_decoding >= (avctx->thread_count-1)) fctx->delaying = 0; if (fctx->next_decoding >= (avctx->thread_count-1)) fctx->delaying = 0;
*got_picture_ptr=0; *got_picture_ptr=0;
return 0; return avpkt->size;
} }
/* /*
@ -563,7 +563,8 @@ int ff_thread_decode_frame(AVCodecContext *avctx,
fctx->next_finished = finished; fctx->next_finished = finished;
return p->result; /* return the size of the consumed packet if no error occurred */
return (p->result >= 0) ? avpkt->size : p->result;
} }
void ff_thread_report_progress(AVFrame *f, int n, int field) void ff_thread_report_progress(AVFrame *f, int n, int field)

3
libavcodec/thread.h
View File

@ -42,6 +42,9 @@ void ff_thread_flush(AVCodecContext *avctx);
* Submits a new frame to a decoding thread. * Submits a new frame to a decoding thread.
* Returns the next available frame in picture. *got_picture_ptr * Returns the next available frame in picture. *got_picture_ptr
* will be 0 if none is available. * will be 0 if none is available.
* The return value on success is the size of the consumed packet for
* compatiblity with avcodec_decode_video2(). This means the decoder
* has to consume the full packet.
* *
* Parameters are the same as avcodec_decode_video2(). * Parameters are the same as avcodec_decode_video2().
*/ */