GetBitContext *gb = &s->HEVClc->gb;
int cancel, type, quincunx;
- get_ue_golomb(gb); // frame_packing_arrangement_id
- cancel = get_bits1(gb); // frame_packing_cancel_flag
- if ( cancel == 0 )
+ get_ue_golomb(gb); // frame_packing_arrangement_id
+ cancel = get_bits1(gb); // frame_packing_cancel_flag
+ if (cancel == 0 )
{
type = get_bits(gb, 7); // frame_packing_arrangement_type
quincunx = get_bits1(gb); // quincunx_sampling_flag
// frame0_self_contained_flag frame1_self_contained_flag
skip_bits(gb, 6);
- if ( quincunx == 0 && type != 5 )
- skip_bits(gb, 16); // frame[01]_grid_position_[xy]
- skip_bits(gb, 8); // frame_packing_arrangement_reserved_byte
- skip_bits1(gb); // frame_packing_arrangement_persistance_flag
+ if (quincunx == 0 && type != 5)
+ skip_bits(gb, 16); // frame[01]_grid_position_[xy]
+ skip_bits(gb, 8); // frame_packing_arrangement_reserved_byte
+ skip_bits1(gb); // frame_packing_arrangement_persistance_flag
}
- skip_bits1(gb); // upsampled_aspect_ratio_flag
+ skip_bits1(gb); // upsampled_aspect_ratio_flag
}
static int decode_pic_timing(HEVCContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "Decoding SEI\n");
while (byte == 0xFF) {
- byte = get_bits(gb, 8);
+ byte = get_bits(gb, 8);
payload_type += byte;
}
byte = 0xFF;
while (byte == 0xFF) {
- byte = get_bits(gb, 8);
+ byte = get_bits(gb, 8);
payload_size += byte;
}
if (s->nal_unit_type == NAL_SEI_PREFIX) {
} else if (payload_type == 1){
int ret = decode_pic_timing(s);
av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
- skip_bits(gb, 8*payload_size);
+ skip_bits(gb, 8 * payload_size);
return ret;
} else if (payload_type == 129){
active_parameter_sets(s);
decode_nal_sei_decoded_picture_hash(s, payload_size);
else {
av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type);
- skip_bits(gb, 8*payload_size);
+ skip_bits(gb, 8 * payload_size);
}
return 1;
}
GetBitContext *gb, int pcm_bit_depth)
{
int x, y;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
+
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < size; y++) {
}
}
-static void FUNC(transquant_bypass4x4)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass4x4)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
int x, y;
- pixel *dst = (pixel *)_dst;
+ pixel *dst = (pixel *)_dst;
+
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 4; y++) {
}
dst += stride;
}
-
}
-static void FUNC(transquant_bypass8x8)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass8x8)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
int x, y;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
+
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 8; y++) {
}
}
-static void FUNC(transquant_bypass16x16)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass16x16)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
int x, y;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
+
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 16; y++) {
}
dst += stride;
}
-
}
-static void FUNC(transquant_bypass32x32)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transquant_bypass32x32)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
int x, y;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
+
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 32; y++) {
}
}
-static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_skip)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
- int shift = 13 - BIT_DEPTH;
+ int shift = 13 - BIT_DEPTH;
#if BIT_DEPTH <= 13
int offset = 1 << (shift - 1);
#else
} while (0)
int i;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
int shift = 7;
- int add = 1 << (shift - 1);
+ int add = 1 << (shift - 1);
int16_t *src = coeffs;
for (i = 0; i < 4; i++) {
}
shift = 20 - BIT_DEPTH;
- add = 1 << (shift - 1);
+ add = 1 << (shift - 1);
for (i = 0; i < 4; i++) {
TR_4x4_LUMA(dst, coeffs, 1, ADD_AND_SCALE);
coeffs += 4;
- dst += stride;
+ dst += stride;
}
#undef TR_4x4_LUMA
static void FUNC(transform_4x4_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
{
int i;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
int shift = 7;
- int add = 1 << (shift - 1);
+ int add = 1 << (shift - 1);
int16_t *src = coeffs;
for (i = 0; i < 4; i++) {
}
shift = 20 - BIT_DEPTH;
- add = 1 << (shift - 1);
+ add = 1 << (shift - 1);
for (i = 0; i < 4; i++) {
TR_4_2(dst, coeffs);
coeffs += 4;
- dst += stride;
+ dst += stride;
}
}
-#define TR_8(dst, src, dstep, sstep, assign) \
- do { \
+#define TR_8(dst, src, dstep, sstep, assign) \
+ do { \
int i, j; \
int e_8[4]; \
int o_8[4] = { 0 }; \
static void FUNC(transform_8x8_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
{
int i;
- pixel *dst = (pixel *)_dst;
+ pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
int shift = 7;
- int add = 1 << (shift - 1);
+ int add = 1 << (shift - 1);
int16_t *src = coeffs;
for (i = 0; i < 8; i++) {
}
shift = 20 - BIT_DEPTH;
- add = 1 << (shift - 1);
+ add = 1 << (shift - 1);
for (i = 0; i < 8; i++) {
TR_8_2(dst, coeffs);
coeffs += 8;
- dst += stride;
+ dst += stride;
}
}
-static void FUNC(transform_16x16_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_16x16_add)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
int i;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
int shift = 7;
- int add = 1 << (shift - 1);
+ int add = 1 << (shift - 1);
int16_t *src = coeffs;
for (i = 0; i < 16; i++) {
}
shift = 20 - BIT_DEPTH;
- add = 1 << (shift - 1);
+ add = 1 << (shift - 1);
for (i = 0; i < 16; i++) {
TR_16_2(dst, coeffs);
coeffs += 16;
- dst += stride;
+ dst += stride;
}
}
-static void FUNC(transform_32x32_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _stride)
+static void FUNC(transform_32x32_add)(uint8_t *_dst, int16_t *coeffs,
+ ptrdiff_t _stride)
{
#define IT32x32_even(i,w) ( src[ 0*w] * transform[ 0][i] ) + ( src[16*w] * transform[16][i] )
#define IT32x32_odd(i,w) ( src[ 8*w] * transform[ 8][i] ) + ( src[24*w] * transform[24][i] )
( src[17*w] * transform[17][i] ) + ( src[19*w] * transform[19][i] ) + ( src[21*w] * transform[21][i] ) + ( src[23*w] * transform[23][i] ) + \
( src[25*w] * transform[25][i] ) + ( src[27*w] * transform[27][i] ) + ( src[29*w] * transform[29][i] ) + ( src[31*w] * transform[31][i] )
int i;
- pixel *dst = (pixel*)_dst;
+ pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
int shift = 7;
- int add = 1 << (shift - 1);
+ int add = 1 << (shift - 1);
int16_t *src = coeffs;
for (i = 0; i < 32; i++) {
for (i = 0; i < 32; i++) {
TR_32_2(dst, coeffs);
coeffs += 32;
- dst += stride;
+ dst += stride;
}
#undef IT32x32_even
#undef IT32x32_odd
static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t *_src,
ptrdiff_t _stride, SAOParams *sao,
- int *borders, int width, int height,
+ int *borders, int width, int height,
int c_idx, int class)
{
- pixel *dst = (pixel*)_dst;
- pixel *src = (pixel*)_src;
+ pixel *dst = (pixel *)_dst;
+ pixel *src = (pixel *)_src;
ptrdiff_t stride = _stride / sizeof(pixel);
int offset_table[32] = { 0 };
int k, y, x;
int chroma = !!c_idx;
- int shift = BIT_DEPTH - 5;
+ int shift = BIT_DEPTH - 5;
int *sao_offset_val = sao->offset_val[c_idx];
int sao_left_class = sao->band_position[c_idx];
int init_y = 0, init_x = 0;
int *borders, int width, int height,
int c_idx)
{
- FUNC(sao_band_filter)(dst, src, stride, sao, borders, width, height, c_idx, 2);
+ FUNC(sao_band_filter)(dst, src, stride, sao, borders,
+ width, height, c_idx, 2);
}
static void FUNC(sao_band_filter_3)(uint8_t *_dst, uint8_t *_src,
int *borders, int width, int height,
int c_idx)
{
- FUNC(sao_band_filter)(_dst, _src, _stride, sao, borders, width, height, c_idx, 3);
+ FUNC(sao_band_filter)(_dst, _src, _stride, sao, borders,
+ width, height, c_idx, 3);
}
static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src,
uint8_t vert_edge, uint8_t horiz_edge, uint8_t diag_edge)
{
int x, y;
- pixel *dst = (pixel*)_dst;
- pixel *src = (pixel*)_src;
+ pixel *dst = (pixel *)_dst;
+ pixel *src = (pixel *)_src;
ptrdiff_t stride = _stride / sizeof(pixel);
int chroma = !!c_idx;
int *sao_offset_val = sao->offset_val[c_idx];
- int sao_eo_class = sao->eo_class[c_idx];
+ int sao_eo_class = sao->eo_class[c_idx];
static const int8_t pos[4][2][2] = {
{ { -1, 0 }, { 1, 0 } }, // horizontal
int log2Wd;
int wx;
int ox;
- int x , y;
+ int x, y;
int offset;
pixel *dst = (pixel *)_dst;
ptrdiff_t dststride = _dststride / sizeof(pixel);
int w1;
int o0;
int o1;
- int x , y;
+ int x, y;
pixel *dst = (pixel *)_dst;
ptrdiff_t dststride = _dststride / sizeof(pixel);
#define TP3 pix[-4 * xstride + 3 * ystride]
#define TP2 pix[-3 * xstride + 3 * ystride]
#define TP1 pix[-2 * xstride + 3 * ystride]
-#define TP0 pix[-xstride+3 * ystride]
+#define TP0 pix[-xstride + 3 * ystride]
#define TQ0 pix[3 * ystride]
-#define TQ1 pix[xstride+3 * ystride]
+#define TQ1 pix[xstride + 3 * ystride]
#define TQ2 pix[2 * xstride + 3 * ystride]
#define TQ3 pix[3 * xstride + 3 * ystride]
const int dq3 = abs(TQ2 - 2 * TQ1 + TQ0);
const int d0 = dp0 + dq0;
const int d3 = dp3 + dq3;
- int beta = _beta[j] << (BIT_DEPTH - 8);
+ int beta = _beta[j] << (BIT_DEPTH - 8);
const int tc = _tc[j] << (BIT_DEPTH - 8);
const int no_p = _no_p[j];
const int no_q = _no_q[j];