Commit ce7f1c76 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/hevc: more whitespaces to reduce difference to 064698d3

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 641358ad
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/md5.h" #include "libavutil/md5.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "bytestream.h" #include "bytestream.h"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include "hevcpred.h" #include "hevcpred.h"
#include "hevcdsp.h" #include "hevcdsp.h"
#include "internal.h" #include "internal.h"
#include "thread.h" #include "thread.h"
#include "videodsp.h" #include "videodsp.h"
...@@ -951,7 +952,6 @@ int ff_hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx); ...@@ -951,7 +952,6 @@ int ff_hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx);
* Get the number of candidate references for the current frame. * Get the number of candidate references for the current frame.
*/ */
int ff_hevc_frame_nb_refs(HEVCContext *s); int ff_hevc_frame_nb_refs(HEVCContext *s);
int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc); int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc);
/** /**
...@@ -981,6 +981,7 @@ int ff_hevc_cu_qp_delta_sign_flag(HEVCContext *s); ...@@ -981,6 +981,7 @@ int ff_hevc_cu_qp_delta_sign_flag(HEVCContext *s);
int ff_hevc_cu_qp_delta_abs(HEVCContext *s); int ff_hevc_cu_qp_delta_abs(HEVCContext *s);
void ff_hevc_hls_filter(HEVCContext *s, int x, int y); void ff_hevc_hls_filter(HEVCContext *s, int x, int y);
void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size); void ff_hevc_hls_filters(HEVCContext *s, int x_ctb, int y_ctb, int ctb_size);
void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0,
int log2_trafo_size, enum ScanType scan_idx, int log2_trafo_size, enum ScanType scan_idx,
int c_idx); int c_idx);
......
...@@ -320,8 +320,7 @@ static const uint8_t init_values[3][HEVC_CONTEXTS] = { ...@@ -320,8 +320,7 @@ static const uint8_t init_values[3][HEVC_CONTEXTS] = {
154, 196, 167, 167, 154, 152, 167, 182, 182, 134, 149, 136, 153, 121, 154, 196, 167, 167, 154, 152, 167, 182, 182, 134, 149, 136, 153, 121,
136, 122, 169, 208, 166, 167, 154, 152, 167, 182, 136, 122, 169, 208, 166, 167, 154, 152, 167, 182,
// coeff_abs_level_greater2_flag // coeff_abs_level_greater2_flag
107, 167, 91, 107, 107, 167, 107, 167, 91, 107, 107, 167, },
},
}; };
static const uint8_t scan_1x1[1] = { static const uint8_t scan_1x1[1] = {
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "cabac_functions.h" #include "cabac_functions.h"
#include "golomb.h" #include "golomb.h"
#include "hevc.h" #include "hevc.h"
#include "bit_depth_template.c" #include "bit_depth_template.c"
#define LUMA 0 #define LUMA 0
......
...@@ -875,7 +875,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s) ...@@ -875,7 +875,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto err; goto err;
} }
av_log(s->avctx, AV_LOG_WARNING, "Displaying the whole video surface.\n"); av_log(s->avctx, AV_LOG_WARNING,
"Displaying the whole video surface.\n");
sps->pic_conf_win.left_offset = sps->pic_conf_win.left_offset =
sps->pic_conf_win.right_offset = sps->pic_conf_win.right_offset =
sps->pic_conf_win.top_offset = sps->pic_conf_win.top_offset =
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "hevc.h" #include "hevc.h"
#include "hevcpred.h" #include "hevcpred.h"
#define BIT_DEPTH 8 #define BIT_DEPTH 8
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "bit_depth_template.c" #include "bit_depth_template.c"
#include "hevcpred.h" #include "hevcpred.h"
...@@ -557,4 +558,5 @@ static void FUNC(pred_angular_3)(uint8_t *src, const uint8_t *top, ...@@ -557,4 +558,5 @@ 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); FUNC(pred_angular)(src, top, left, stride, c_idx, mode, 1 << 5);
} }
#undef POS #undef POS
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment