virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

hevc: better mt implementation

Browse Source 
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
(cherry picked from commit 93afb8c519deca85b3c97804927de5b016dd32d1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2013-10-27 16:50:20 +01:00 committed by Michael Niedermayer
parent c1882e801d
commit 2f77894ccc
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/hevc.c
View File

@ -1066,13 +1066,12 @@ static void chroma_mc(HEVCContext *s, int16_t *dst1, int16_t *dst2, ptrdiff_t ds
} }
static void hevc_await_progress(HEVCContext *s, HEVCFrame *ref, static void hevc_await_progress(HEVCContext *s, HEVCFrame *ref,
const Mv *mv, int y0) const Mv *mv, int y0, int height)
{ {
int y = (mv->y >> 2) + y0; int y = (mv->y >> 2) + y0 + height + 9;
//ff_thread_await_progress(&ref->tf, FFMIN(s->height, y), 0);
if (s->threads_type == FF_THREAD_FRAME ) if (s->threads_type == FF_THREAD_FRAME )
ff_thread_await_progress(&ref->tf, INT_MAX, 0); ff_thread_await_progress(&ref->tf, y, 0);
} }
static void hls_prediction_unit(HEVCContext *s, int x0, int y0, static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
@ -1190,13 +1189,13 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
ref0 = refPicList[0].ref[current_mv.ref_idx[0]]; ref0 = refPicList[0].ref[current_mv.ref_idx[0]];
if (!ref0) if (!ref0)
return; return;
hevc_await_progress(s, ref0, &current_mv.mv[0], y0); hevc_await_progress(s, ref0, &current_mv.mv[0], y0, nPbH);
} }
if (current_mv.pred_flag[1]) { if (current_mv.pred_flag[1]) {
ref1 = refPicList[1].ref[current_mv.ref_idx[1]]; ref1 = refPicList[1].ref[current_mv.ref_idx[1]];
if (!ref1) if (!ref1)
return; return;
hevc_await_progress(s, ref1, &current_mv.mv[1], y0); hevc_await_progress(s, ref1, &current_mv.mv[1], y0, nPbH);
} }
if (current_mv.pred_flag[0] && !current_mv.pred_flag[1]) { if (current_mv.pred_flag[0] && !current_mv.pred_flag[1]) {

5
libavcodec/hevc_filter.c
View File

@ -683,8 +683,11 @@ void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size)
{ {
if (y_ctb && x_ctb) if (y_ctb && x_ctb)
ff_hevc_hls_filter(s, x_ctb - ctb_size, y_ctb - ctb_size); ff_hevc_hls_filter(s, x_ctb - ctb_size, y_ctb - ctb_size);
if (y_ctb && x_ctb >= s->sps->width - ctb_size) if (y_ctb && x_ctb >= s->sps->width - ctb_size) {
ff_hevc_hls_filter(s, x_ctb, y_ctb - ctb_size); ff_hevc_hls_filter(s, x_ctb, y_ctb - ctb_size);
if (s->threads_type == FF_THREAD_FRAME )
ff_thread_report_progress(&s->ref->tf, y_ctb - ctb_size, 0);
}
if (x_ctb && y_ctb >= s->sps->height - ctb_size) if (x_ctb && y_ctb >= s->sps->height - ctb_size)
ff_hevc_hls_filter(s, x_ctb - ctb_size, y_ctb); ff_hevc_hls_filter(s, x_ctb - ctb_size, y_ctb);
} }

2
libavcodec/hevc_mvs.c
View File

@ -268,7 +268,7 @@ static int temporal_luma_motion_vector(HEVCContext *s, int x0, int y0,
y = y0 + nPbH; y = y0 + nPbH;
if (s->threads_type == FF_THREAD_FRAME ) if (s->threads_type == FF_THREAD_FRAME )
ff_thread_await_progress(&ref->tf, INT_MAX, 0); ff_thread_await_progress(&ref->tf, y, 0);
if (tab_mvf && if (tab_mvf &&
(y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) && (y0 >> s->sps->log2_ctb_size) == (y >> s->sps->log2_ctb_size) &&
y < s->sps->height && y < s->sps->height &&