patches/to_upstream/23_thread_index.patch - Issue 6597005: Properly account the thread index on all exit paths from the function. Preven...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/to_upstream/23_thread_index.patch

Issue 6597005: Properly account the thread index on all exit paths from the function. Preven... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/ffmpeg/

Patch Set: Created 9 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
(Empty)
	1 diff -wurp -N orig/libavcodec/pthread.c ffmpeg-mt/libavcodec/pthread.c

	2 --- orig/libavcodec/pthread.c 2011-02-25 04:09:50.973123996 -0800

	3 +++ ffmpeg-mt/libavcodec/pthread.c 2011-02-25 04:10:23.563063084 -0800

	4 @@ -448,9 +448,11 @@ int ff_thread_decode_frame(AVCodecContex

	5 if (err) return err;

	6

	7 fctx->next_decoding++;

	8 + int decoding_save = fctx->next_decoding;

	9 + if (fctx->next_decoding >= thread_count) fctx->next_decoding = 0;

	10

	11 if (fctx->delaying && avpkt->size) {

	12 - if (fctx->next_decoding >= (thread_count-1)) fctx->delaying = 0;

	13 + if (decoding_save >= (thread_count-1)) fctx->delaying = 0;

	14

	15 *got_picture_ptr=0;

	16 return 0;

	17 @@ -479,7 +481,6 @@ int ff_thread_decode_frame(AVCodecContex

	18

	19 update_thread_context_from_copy(avctx, p->avctx, 1);

	20

	21 - if (fctx->next_decoding >= thread_count) fctx->next_decoding = 0;

	22 fctx->next_finished = returning_thread;

	23

	24 return p->result;

OLD	NEW

« no previous file with comments | « README.chromium ('k') | source/patched-ffmpeg-mt/libavcodec/pthread.c » ('j') | no next file with comments »