diff options
author | Alexander Strange <astrange@ithinksw.com> | 2011-06-02 21:15:58 +0400 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-06-02 21:16:20 +0400 |
commit | 6a9c85944427e3c4355bce67d7f677ec69527bff (patch) | |
tree | df4bb83f820a5c0295485ca8b7751c4063d5165f /libavcodec/error_resilience.c | |
parent | 53be7b23e9d7074d1aeee77407b008411d034e9e (diff) |
H264/MPEG frame-level multi-threading.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r-- | libavcodec/error_resilience.c | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index e7588a9867..aea0e15b34 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -32,6 +32,7 @@ #include "mpegvideo.h" #include "h264.h" #include "rectangle.h" +#include "thread.h" /* * H264 redefines mb_intra so it is not mistakely used (its uninitialized in h264) @@ -428,8 +429,7 @@ int score_sum=0; int best_score=256*256*256*64; int best_pred=0; const int mot_index= (mb_x + mb_y*mot_stride) * mot_step; - int prev_x= s->current_picture.motion_val[0][mot_index][0]; - int prev_y= s->current_picture.motion_val[0][mot_index][1]; + int prev_x, prev_y, prev_ref; if((mb_x^mb_y^pass)&1) continue; @@ -527,11 +527,26 @@ skip_mean_and_median: /* zero MV */ pred_count++; + if (!fixed[mb_xy]) { + if (s->avctx->codec_id == CODEC_ID_H264) { + // FIXME + } else { + ff_thread_await_progress((AVFrame *) s->last_picture_ptr, + mb_y, 0); + } + prev_x = s->last_picture.motion_val[0][mot_index][0]; + prev_y = s->last_picture.motion_val[0][mot_index][1]; + prev_ref = s->last_picture.ref_index[0][4*mb_xy]; + } else { + prev_x = s->current_picture.motion_val[0][mot_index][0]; + prev_y = s->current_picture.motion_val[0][mot_index][1]; + prev_ref = s->current_picture.ref_index[0][4*mb_xy]; + } + /* last MV */ - mv_predictor[pred_count][0]= s->current_picture.motion_val[0][mot_index][0]; - mv_predictor[pred_count][1]= s->current_picture.motion_val[0][mot_index][1]; - ref [pred_count] = s->current_picture.ref_index[0][4*mb_xy]; - pred_count++; + mv_predictor[pred_count][0]= prev_x; + mv_predictor[pred_count][1]= prev_y; + ref [pred_count] = prev_ref; s->mv_dir = MV_DIR_FORWARD; s->mb_intra=0; @@ -662,6 +677,12 @@ static int is_intra_more_likely(MpegEncContext *s){ uint8_t *mb_ptr = s->current_picture.data[0] + mb_x*16 + mb_y*16*s->linesize; uint8_t *last_mb_ptr= s->last_picture.data [0] + mb_x*16 + mb_y*16*s->linesize; + if (s->avctx->codec_id == CODEC_ID_H264) { + // FIXME + } else { + ff_thread_await_progress((AVFrame *) s->last_picture_ptr, + mb_y, 0); + } is_intra_likely += s->dsp.sad[0](NULL, last_mb_ptr, mb_ptr , s->linesize, 16); is_intra_likely -= s->dsp.sad[0](NULL, last_mb_ptr, last_mb_ptr+s->linesize*16, s->linesize, 16); }else{ @@ -681,6 +702,7 @@ void ff_er_frame_start(MpegEncContext *s){ memset(s->error_status_table, MV_ERROR|AC_ERROR|DC_ERROR|VP_START|AC_END|DC_END|MV_END, s->mb_stride*s->mb_height*sizeof(uint8_t)); s->error_count= 3*s->mb_num; + s->error_occurred = 0; } /** @@ -720,7 +742,10 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en s->error_count -= end_i - start_i + 1; } - if(status & (AC_ERROR|DC_ERROR|MV_ERROR)) s->error_count= INT_MAX; + if(status & (AC_ERROR|DC_ERROR|MV_ERROR)) { + s->error_occurred = 1; + s->error_count= INT_MAX; + } if(mask == ~0x7F){ memset(&s->error_status_table[start_xy], 0, (end_xy - start_xy) * sizeof(uint8_t)); @@ -995,6 +1020,12 @@ void ff_er_frame_end(MpegEncContext *s){ int time_pp= s->pp_time; int time_pb= s->pb_time; + if (s->avctx->codec_id == CODEC_ID_H264) { + //FIXME + } else { + ff_thread_await_progress((AVFrame *) s->next_picture_ptr, + mb_y, 0); + } s->mv[0][0][0] = s->next_picture.motion_val[0][xy][0]*time_pb/time_pp; s->mv[0][0][1] = s->next_picture.motion_val[0][xy][1]*time_pb/time_pp; s->mv[1][0][0] = s->next_picture.motion_val[0][xy][0]*(time_pb - time_pp)/time_pp; |