virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

hevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d)

Browse Source 
Conflicts:

	libavcodec/hevc.h
	libavcodec/hevc_filter.c
	libavcodec/hevc_refs.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Mickaël Raulet 2013-10-20 21:19:15 +02:00 committed by Michael Niedermayer
parent a8fafa8978
commit 1c8de4dd94
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/hevc.c
View File

@ -1472,7 +1472,6 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
} else } else
lc->cu.cu_transquant_bypass_flag = 0; lc->cu.cu_transquant_bypass_flag = 0;
if (s->sh.slice_type != I_SLICE) { if (s->sh.slice_type != I_SLICE) {
uint8_t skip_flag = ff_hevc_skip_flag_decode(s, x0, y0, x_cb, y_cb); uint8_t skip_flag = ff_hevc_skip_flag_decode(s, x0, y0, x_cb, y_cb);
@ -2263,8 +2262,6 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
int ret; int ret;
HEVCContext *s = avctx->priv_data; HEVCContext *s = avctx->priv_data;
//av_log(avctx, AV_LOG_WARNING, "decode size %d\n", avpkt->size);
if (!avpkt->size) { if (!avpkt->size) {
ret = ff_hevc_output_frame(s, data, 1); ret = ff_hevc_output_frame(s, data, 1);
if (ret < 0) if (ret < 0)

6
libavcodec/hevc.h
View File

@ -706,9 +706,9 @@ typedef struct HEVCFrame {
} HEVCFrame; } HEVCFrame;
typedef struct FilterData { typedef struct FilterData {
int x; int x;
int y; int y;
int size; int size;
int slice_or_tiles_left_boundary; int slice_or_tiles_left_boundary;
int slice_or_tiles_up_boundary; int slice_or_tiles_up_boundary;
} FilterData; } FilterData;

4
libavcodec/hevc_filter.c
View File

@ -334,8 +334,8 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0)
int pcmf = (s->sps->pcm_enabled_flag && s->sps->pcm.loop_filter_disable_flag) || int pcmf = (s->sps->pcm_enabled_flag && s->sps->pcm.loop_filter_disable_flag) ||
s->pps->transquant_bypass_enable_flag; s->pps->transquant_bypass_enable_flag;
if(x0) { if (x0) {
left_tc_offset = s->deblock[ctb-1].tc_offset; left_tc_offset = s->deblock[ctb-1].tc_offset;
left_beta_offset = s->deblock[ctb-1].beta_offset; left_beta_offset = s->deblock[ctb-1].beta_offset;
} }

2
libavcodec/hevc_refs.c
View File

@ -225,7 +225,7 @@ int ff_hevc_slice_rpl(HEVCContext *s)
{ {
SliceHeader *sh = &s->sh; SliceHeader *sh = &s->sh;
uint8_t nb_list = sh->slice_type == B_SLICE ? 2 : 1; uint8_t nb_list = sh->slice_type == B_SLICE ? 2 : 1;
uint8_t list_idx; uint8_t list_idx;
int i, j, ret; int i, j, ret;