diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:27:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-12 16:27:39 +0200 |
| commit | 5195512addc1f6bced2e33b8faf77abb5b8703b6 (patch) | |
| tree | 41bb7964bb08f6bfc56ee98584d34ded7a2152dd /libavcodec/hevc_mvs.c | |
| parent | cde2de4a05dc5959f1ae10a92879a2244f25b4fd (diff) | |
| parent | ed53cc217f6a6e4ddb35e3f01a79496091dc82dc (diff) | |
| download | ffmpeg-5195512addc1f6bced2e33b8faf77abb5b8703b6.tar.gz | |
Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'
* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
hevc: derive partial merge list
Conflicts:
libavcodec/hevc_mvs.c
See: 4576eff05d94a5e0b853a7a595d31351cc539e7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 4bec9f981d..8df4915ca4 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -338,7 +338,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, is_available_a1 = AVAILABLE(cand_left, A1); if (is_available_a1) { mergecandlist[nb_merge_cand] = TAB_MVF_PU(A1); - if (merge_idx == 0) return; + if (merge_idx == 0) + return; nb_merge_cand++; } } @@ -354,7 +355,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, if (is_available_b1 && !(is_available_a1 && COMPARE_MV_REFIDX(B1, A1))) { mergecandlist[nb_merge_cand] = TAB_MVF_PU(B1); - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; } } @@ -368,7 +370,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, if (is_available_b0 && !(is_available_b1 && COMPARE_MV_REFIDX(B0, B1))) { mergecandlist[nb_merge_cand] = TAB_MVF_PU(B0); - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; } @@ -381,7 +384,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, if (is_available_a0 && !(is_available_a1 && COMPARE_MV_REFIDX(A0, A1))) { mergecandlist[nb_merge_cand] = TAB_MVF_PU(A0); - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; } @@ -394,7 +398,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, !(is_available_b1 && COMPARE_MV_REFIDX(B2, B1)) && nb_merge_cand != 4) { mergecandlist[nb_merge_cand] = TAB_MVF_PU(B2); - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; } @@ -418,7 +423,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, mergecandlist[nb_merge_cand].mv[1] = mv_l1_col; mergecandlist[nb_merge_cand].ref_idx[1] = 0; } - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; } } @@ -446,7 +452,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, mergecandlist[nb_merge_cand].pred_flag = PF_BI; AV_COPY32(&mergecandlist[nb_merge_cand].mv[0], &l0_cand.mv[0]); AV_COPY32(&mergecandlist[nb_merge_cand].mv[1], &l1_cand.mv[1]); - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; } } @@ -460,7 +467,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, mergecandlist[nb_merge_cand].ref_idx[0] = zero_idx < nb_refs ? zero_idx : 0; mergecandlist[nb_merge_cand].ref_idx[1] = zero_idx < nb_refs ? zero_idx : 0; - if (merge_idx == nb_merge_cand) return; + if (merge_idx == nb_merge_cand) + return; nb_merge_cand++; zero_idx++; } |