xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-28 14:01:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hevc: support luma bit depth != chroma bit depth for PCM coding units

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Mickaël Raulet 2013-12-14 15:50:32 +01:00 committed by Anton Khirnov
parent 78d0b7f36e
commit 5c3fa74b94
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/hevc.c
View File

@ -1420,7 +1420,7 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size)
int stride2 = s->frame->linesize[2];
uint8_t *dst2 = &s->frame->data[2][(y0 >> s->sps->vshift[2]) * stride2 + ((x0 >> s->sps->hshift[2]) << s->sps->pixel_shift)];
int length = cb_size * cb_size * s->sps->pcm.bit_depth + ((cb_size * cb_size) >> 1) * s->sps->pcm.bit_depth;
int length = cb_size * cb_size * s->sps->pcm.bit_depth + ((cb_size * cb_size) >> 1) * s->sps->pcm.bit_depth_chroma;
const uint8_t *pcm = skip_bytes(&s->HEVClc.cc, (length + 7) >> 3);
int ret;
@ -1433,8 +1433,8 @@ static int hls_pcm_sample(HEVCContext *s, int x0, int y0, int log2_cb_size)
return ret;
s->hevcdsp.put_pcm(dst0, stride0, cb_size, &gb, s->sps->pcm.bit_depth);
s->hevcdsp.put_pcm(dst1, stride1, cb_size / 2, &gb, s->sps->pcm.bit_depth);
s->hevcdsp.put_pcm(dst2, stride2, cb_size / 2, &gb, s->sps->pcm.bit_depth);
s->hevcdsp.put_pcm(dst1, stride1, cb_size / 2, &gb, s->sps->pcm.bit_depth_chroma);
s->hevcdsp.put_pcm(dst2, stride2, cb_size / 2, &gb, s->sps->pcm.bit_depth_chroma);
return 0;
}

1
libavcodec/hevc.h
View File

@ -419,6 +419,7 @@ typedef struct HEVCSPS {
struct {
uint8_t bit_depth;
uint8_t bit_depth_chroma;
unsigned int log2_min_pcm_cb_size;
unsigned int log2_max_pcm_cb_size;
uint8_t loop_filter_disable_flag;

12
libavcodec/hevc_ps.c
View File

@ -799,18 +799,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
sps->pcm_enabled_flag = get_bits1(gb);
if (sps->pcm_enabled_flag) {
int pcm_bit_depth_chroma;
sps->pcm.bit_depth = get_bits(gb, 4) + 1;
pcm_bit_depth_chroma = get_bits(gb, 4) + 1;
if (pcm_bit_depth_chroma != sps->pcm.bit_depth) {
av_log(s->avctx, AV_LOG_ERROR,
"PCM Luma bit depth (%d) is different from PCM chroma"
"bit depth (%d), this is unsupported.\n",
sps->pcm.bit_depth, pcm_bit_depth_chroma);
ret = AVERROR_INVALIDDATA;
goto err;
}
sps->pcm.bit_depth_chroma = get_bits(gb, 4) + 1;
sps->pcm.log2_min_pcm_cb_size = get_ue_golomb_long(gb) + 3;
sps->pcm.log2_max_pcm_cb_size = sps->pcm.log2_min_pcm_cb_size +
get_ue_golomb_long(gb);