hevc: Add DC IDCT

Integrated to Libav by Josh de Kock <josh@itanimul.li>.

Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>

diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index d5d3f59859b481c90f57bbaaa4b9806b54085c17..d8c707b3c6ec07c4a0190aac1c37f1ad14789b87 100644 (file)
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -1214,8 +1214,13 @@ static void hls_residual_coding(HEVCContext *s, int x0, int y0,
         else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 &&
                  log2_trafo_size == 2)
             s->hevcdsp.transform_4x4_luma(coeffs);
-        else
-            s->hevcdsp.idct[log2_trafo_size - 2](coeffs);
+        else {
+            int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y);
+            if (max_xy == 0)
+                s->hevcdsp.idct_dc[log2_trafo_size - 2](coeffs);
+            else
+                s->hevcdsp.idct[log2_trafo_size - 2](coeffs);
+        }
     }
     s->hevcdsp.add_residual[log2_trafo_size - 2](dst, coeffs, stride);
 }

diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c
index 4bd3d972993092a65524a48b92342486340448f0..7c191986a013bfad3d5e7e01c6efee0f775e05ea 100644 (file)
--- a/libavcodec/hevcdsp.c
+++ b/libavcodec/hevcdsp.c
@@ -175,6 +175,10 @@ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth)
     hevcdsp->idct[2]                = FUNC(idct_16x16, depth);              \
     hevcdsp->idct[3]                = FUNC(idct_32x32, depth);              \
                                                                             \
+    hevcdsp->idct_dc[0]             = FUNC(idct_4x4_dc, depth);             \
+    hevcdsp->idct_dc[1]             = FUNC(idct_8x8_dc, depth);             \
+    hevcdsp->idct_dc[2]             = FUNC(idct_16x16_dc, depth);           \
+    hevcdsp->idct_dc[3]             = FUNC(idct_32x32_dc, depth);           \
     hevcdsp->sao_band_filter[0] = FUNC(sao_band_filter_0, depth);           \
     hevcdsp->sao_band_filter[1] = FUNC(sao_band_filter_1, depth);           \
     hevcdsp->sao_band_filter[2] = FUNC(sao_band_filter_2, depth);           \

diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h
index decd1c9376bd668b61a03ccc801c577bfebea4a4..bbc4cb27ceed7c701a3b64f545d7aec13462e87f 100644 (file)
--- a/libavcodec/hevcdsp.h
+++ b/libavcodec/hevcdsp.h
@@ -47,6 +47,7 @@ typedef struct HEVCDSPContext {
     void (*dequant)(int16_t *coeffs);
     void (*transform_4x4_luma)(int16_t *coeffs);
     void (*idct[4])(int16_t *coeffs);
+    void (*idct_dc[4])(int16_t *coeffs);
 
     void (*sao_band_filter[4])(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
                                struct SAOParams *sao, int *borders,

diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c
index 2cde5a8132fa77d3647a2f0013d027a3b2765423..81e3ea5d59101220ba03275b39346b93375fd7b3 100644 (file)
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevcdsp_template.c
@@ -223,10 +223,29 @@ static void FUNC(idct_ ## H ## x ## H )(int16_t *coeffs)          \
     }                                                             \
 }
 
+#define IDCT_DC(H)                                                \
+static void FUNC(idct_ ## H ## x ## H ## _dc)(int16_t *coeffs)    \
+{                                                                 \
+    int i, j;                                                     \
+    int shift = 14 - BIT_DEPTH;                                   \
+    int add   = 1 << (shift - 1);                                 \
+    int coeff = (((coeffs[0] + 1) >> 1) + add) >> shift;          \
+                                                                  \
+    for (j = 0; j < H; j++) {                                     \
+        for (i = 0; i < H; i++) {                                 \
+            coeffs[i + j * H] = coeff;                            \
+        }                                                         \
+    }                                                             \
+}
+
 IDCT( 4)
 IDCT( 8)
 IDCT(16)
 IDCT(32)
+IDCT_DC( 4)
+IDCT_DC( 8)
+IDCT_DC(16)
+IDCT_DC(32)
 #undef TR_4
 #undef TR_8
 #undef TR_16