hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
authorAnton Khirnov <anton@khirnov.net>
Sun, 27 Jul 2014 17:01:53 +0000 (17:01 +0000)
committerAnton Khirnov <anton@khirnov.net>
Sat, 9 Aug 2014 16:13:11 +0000 (16:13 +0000)
libavcodec/hevc.c

index 20d2878..3bd26eb 100644 (file)
@@ -1448,9 +1448,11 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size)
     const uint8_t *pcm = skip_bytes(&lc->cc, (length + 7) >> 3);
     int ret;
 
     const uint8_t *pcm = skip_bytes(&lc->cc, (length + 7) >> 3);
     int ret;
 
-    ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
-                                          lc->slice_or_tiles_up_boundary,
-                                          lc->slice_or_tiles_left_boundary);
+    if (!s->sh.disable_deblocking_filter_flag) {
+        ff_hevc_deblocking_boundary_strengths(s, x0, y0, log2_cb_size,
+                                              lc->slice_or_tiles_up_boundary,
+                                              lc->slice_or_tiles_left_boundary);
+    }
 
     ret = init_get_bits(&gb, pcm, length);
     if (ret < 0)
 
     ret = init_get_bits(&gb, pcm, length);
     if (ret < 0)