[FFmpeg-cvslog] libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942
Michael Niedermayer
git at videolan.org
Sat Nov 2 18:31:03 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 2 11:59:02 2013 +0100| [35594c48caf00ef96c45b50be4767f3e7f08a77f] | committer: Michael Niedermayer
libavcodec/hevc: random cosmetics to reduce diff to 064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35594c48caf00ef96c45b50be4767f3e7f08a77f
---
libavcodec/hevc.c | 4 ++--
libavcodec/hevc_filter.c | 2 +-
libavcodec/hevc_sei.c | 2 +-
libavcodec/hevcdsp_template.c | 6 +++---
libavcodec/hevcpred_template.c | 29 ++++++++++++++---------------
5 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 0176afb..ffade94 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2424,8 +2424,8 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
goto fail;
hls_nal_unit(s);
- if (s->nal_unit_type == NAL_EOS_NUT ||
- s->nal_unit_type == NAL_EOB_NUT)
+ if (s->nal_unit_type == NAL_EOB_NUT ||
+ s->nal_unit_type == NAL_EOS_NUT)
s->eos = 1;
buf += consumed;
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index 1335bb4..ae72fbb 100644
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -89,7 +89,7 @@ static int get_qPy_pred(HEVCContext *s, int xC, int yC,
(xQgBase & ctb_size_mask);
int availableB = (yBase & ctb_size_mask) &&
(yQgBase & ctb_size_mask);
- int qPy_pred, qPy_a ,qPy_b;
+ int qPy_pred, qPy_a, qPy_b;
// qPy_pred
if (lc->first_qp_group) {
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 5b43474..ecccc69 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -57,7 +57,7 @@ static void decode_nal_sei_frame_packing_arrangement(HEVCContext *s)
get_ue_golomb(gb); // frame_packing_arrangement_id
cancel = get_bits1(gb); // frame_packing_cancel_flag
- if (cancel == 0 ){
+ if (cancel == 0) {
type = get_bits(gb, 7); // frame_packing_arrangement_type
quincunx = get_bits1(gb); // quincunx_sampling_flag
skip_bits(gb, 6); // content_interpretation_type
diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c
index c1bb4d2..c9386e0 100644
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevcdsp_template.c
@@ -481,8 +481,8 @@ static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src,
};
static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
-
#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
+
stride /= sizeof(pixel);
if (!borders[2])
@@ -588,8 +588,8 @@ static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t *_src,
};
static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
-
#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
+
stride /= sizeof(pixel);
init_y = -(4 >> chroma) - 2;
@@ -766,8 +766,8 @@ static void FUNC(sao_edge_filter_3)(uint8_t *_dst, uint8_t *_src,
};
static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
-
#define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1))
+
stride /= sizeof(pixel);
init_y = -(4 >> chroma) - 2;
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c
index 81fa97e..5ba9591 100644
--- a/libavcodec/hevcpred_template.c
+++ b/libavcodec/hevcpred_template.c
@@ -1,5 +1,5 @@
/*
- * HEVC video Decoder
+ * HEVC video decoder
*
* Copyright (C) 2012 - 2013 Guillaume Martres
*
@@ -292,20 +292,6 @@ static void FUNC(intra_pred)(HEVCContext *s, int x0, int y0, int log2_size, int
top[-1] = left[-1];
-#undef EXTEND_LEFT_CIP
-#undef EXTEND_RIGHT_CIP
-#undef EXTEND_UP_CIP
-#undef EXTEND_DOWN_CIP
-#undef IS_INTRA
-#undef MVF_PU
-#undef MVF
-#undef PU
-#undef EXTEND_LEFT
-#undef EXTEND_RIGHT
-#undef EXTEND_UP
-#undef EXTEND_DOWN
-#undef MIN_TB_ADDR_ZS
-
// Filtering process
if (c_idx == 0 && mode != INTRA_DC && size != 4) {
int intra_hor_ver_dist_thresh[] = { 7, 1, 0 };
@@ -557,4 +543,17 @@ static void FUNC(pred_angular_3)(uint8_t *src, const uint8_t *top,
FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 5);
}
+#undef EXTEND_LEFT_CIP
+#undef EXTEND_RIGHT_CIP
+#undef EXTEND_UP_CIP
+#undef EXTEND_DOWN_CIP
+#undef IS_INTRA
+#undef MVF_PU
+#undef MVF
+#undef PU
+#undef EXTEND_LEFT
+#undef EXTEND_RIGHT
+#undef EXTEND_UP
+#undef EXTEND_DOWN
+#undef MIN_TB_ADDR_ZS
#undef POS
More information about the ffmpeg-cvslog
mailing list