virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

libavcodec/hevc: reduce whitespace differences to 064698d381e1e7790f21b0199a8930ea04e2e942

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-02 11:59:02 +01:00
parent 1a6948fa70
commit b23692b3a8
7 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/hevc.c
View File

@ -29,7 +29,6 @@
#include "libavutil/internal.h"
#include "libavutil/md5.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "bytestream.h"
@ -1705,6 +1704,7 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0,
const int cb_size_split = cb_size >> 1;
const int x1 = x0 + cb_size_split;
const int y1 = y0 + cb_size_split;
int more_data = 0;
more_data = hls_coding_quadtree(s, x0, y0, log2_cb_size - 1, cb_depth + 1);
@ -2209,7 +2209,6 @@ static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length)
ctb_addr_ts = hls_slice_data_wpp(s, nal, length);
else
ctb_addr_ts = hls_slice_data(s);
if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) {
s->is_decoded = 1;
if ((s->pps->transquant_bypass_enable_flag ||

3
libavcodec/hevc.h
View File

@ -33,7 +33,6 @@
#include "hevcpred.h"
#include "hevcdsp.h"
#include "internal.h"
#include "thread.h"
#include "videodsp.h"
@ -780,6 +779,7 @@ typedef struct HEVCContext {
AVFrame *sao_frame;
AVFrame *tmp_frame;
AVFrame *output_frame;
HEVCVPS *vps;
const HEVCSPS *sps;
HEVCPPS *pps;
@ -952,6 +952,7 @@ int ff_hevc_transform_skip_flag_decode(HEVCContext *s, int c_idx);
* Get the number of candidate references for the current frame.
*/
int ff_hevc_frame_nb_refs(HEVCContext *s);
int ff_hevc_set_new_ref(HEVCContext *s, AVFrame **frame, int poc);
/**

3
libavcodec/hevc_ps.c
View File

@ -822,8 +822,7 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
sps->nb_st_rps = get_ue_golomb_long(gb);
if (sps->nb_st_rps > MAX_SHORT_TERM_RPS_COUNT) {
av_log(s->avctx, AV_LOG_ERROR,
"Too many short term RPS: %d.\n",
av_log(s->avctx, AV_LOG_ERROR, "Too many short term RPS: %d.\n",
sps->nb_st_rps);
ret = AVERROR_INVALIDDATA;
goto err;

34
libavcodec/hevcdsp_template.c
View File

@ -35,6 +35,7 @@ static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int size,
{
int x, y;
pixel *dst = (pixel *)_dst;
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < size; y++) {
@ -44,10 +45,12 @@ static void FUNC(put_pcm)(uint8_t *_dst, ptrdiff_t _stride, int size,
}
}
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;
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 4; y++) {
@ -57,13 +60,14 @@ static void FUNC(transquant_bypass4x4)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t
}
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;
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 8; y++) {
@ -75,10 +79,12 @@ static void FUNC(transquant_bypass8x8)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t
}
}
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;
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 16; y++) {
@ -88,13 +94,14 @@ static void FUNC(transquant_bypass16x16)(uint8_t *_dst, int16_t *coeffs, ptrdiff
}
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;
ptrdiff_t stride = _stride / sizeof(pixel);
for (y = 0; y < 32; y++) {
@ -106,7 +113,8 @@ static void FUNC(transquant_bypass32x32)(uint8_t *_dst, int16_t *coeffs, ptrdiff
}
}
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;
ptrdiff_t stride = _stride / sizeof(pixel);
@ -285,7 +293,8 @@ static void FUNC(transform_8x8_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t _s
}
}
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;
@ -308,7 +317,8 @@ static void FUNC(transform_16x16_add)(uint8_t *_dst, int16_t *coeffs, ptrdiff_t
}
}
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] )
@ -423,7 +433,8 @@ static void FUNC(sao_band_filter_2)(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, 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,
@ -431,7 +442,8 @@ 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,