summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2015-06-13 00:09:20 +0300
committerMarco Nelissen <marcone@google.com>2015-06-25 08:25:44 -0700
commit796c0d475a8863695d750417dcb7df720139455f (patch)
treea1977ec661141079db95e14cf78241c715314e82
parent9f0dcba9b4f792aedf37b6ecdceae46d36b93068 (diff)
downloadandroid_external_libavc-796c0d475a8863695d750417dcb7df720139455f.tar.gz
android_external_libavc-796c0d475a8863695d750417dcb7df720139455f.tar.bz2
android_external_libavc-796c0d475a8863695d750417dcb7df720139455f.zip
Remove unnecessary calls to ithread_exit
The ithread_exit wrapper function behaves inconsistently across platforms; on windows, the argument is a thread handle, denoting the thread that will be exited. On pthreads, ithread_exit only terminates the current thread, not any other thread. These both calls are at the end of each thread function (and the one with a non-null parameter refers to the handle of the thread itself), so the thread will exit immediately anyway. Change-Id: I21e43c56874729452bd80b28ff351e3c5d3f087e
-rw-r--r--decoder/ih264d_thread_parse_decode.c2
-rw-r--r--test/decoder/main.c3
2 files changed, 0 insertions, 5 deletions
diff --git a/decoder/ih264d_thread_parse_decode.c b/decoder/ih264d_thread_parse_decode.c
index 910183c..f3da270 100644
--- a/decoder/ih264d_thread_parse_decode.c
+++ b/decoder/ih264d_thread_parse_decode.c
@@ -633,8 +633,6 @@ void ih264d_decode_picture_thread(dec_struct_t *ps_dec )
ps_dec->u4_fmt_conv_num_rows);
ps_dec->u4_fmt_conv_cur_row += ps_dec->u4_fmt_conv_num_rows;
}
-
- ithread_exit(0);
}
void ih264d_signal_decode_thread(dec_struct_t *ps_dec)
diff --git a/test/decoder/main.c b/test/decoder/main.c
index 937515e..8c9e885 100644
--- a/test/decoder/main.c
+++ b/test/decoder/main.c
@@ -1612,9 +1612,6 @@ WORD32 display_thread(void *pv_ctx)
}
ps_app_ctx->disp_deinit(ps_app_ctx->pv_disp_ctx);
- /* destroy the display thread */
- ithread_exit(ps_app_ctx->display_thread_handle);
-
return 0;
}