virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

diracdec: Rename lowdelay_subband to decode_subband because it is shared with HQ profile

Browse Source
This commit is contained in:
Kieran Kunhya
2015-12-09 00:05:29 +00:00
committed by Rostislav Pehlivanov
parent 3f07f12f65
commit 3bb6ce1af9
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/diracdec.c
View File

@@ -719,9 +719,7 @@ static void decode_component(DiracContext *s, int comp)
return; \ return; \
} \ } \
/* [DIRAC_STD] 13.5.5.2 Luma slice subband data. luma_slice_band(level,orient,sx,sy) --> if b2 == NULL */ static void decode_subband(DiracContext *s, GetBitContext *gb, int quant,
/* [DIRAC_STD] 13.5.5.3 Chroma slice subband data. chroma_slice_band(level,orient,sx,sy) --> if b2 != NULL */
static void lowdelay_subband(DiracContext *s, GetBitContext *gb, int quant,
int slice_x, int slice_y, int bits_end, int slice_x, int slice_y, int bits_end,
SubBand *b1, SubBand *b2) SubBand *b1, SubBand *b2)
{ {
@@ -792,7 +790,7 @@ static int decode_lowdelay_slice(AVCodecContext *avctx, void *arg)
for (level = 0; level < s->wavelet_depth; level++) for (level = 0; level < s->wavelet_depth; level++)
for (orientation = !!level; orientation < 4; orientation++) { for (orientation = !!level; orientation < 4; orientation++) {
quant = FFMAX(quant_base - s->lowdelay.quant[level][orientation], 0); quant = FFMAX(quant_base - s->lowdelay.quant[level][orientation], 0);
lowdelay_subband(s, gb, quant, slice->slice_x, slice->slice_y, luma_end, decode_subband(s, gb, quant, slice->slice_x, slice->slice_y, luma_end,
&s->plane[0].band[level][orientation], NULL); &s->plane[0].band[level][orientation], NULL);
} }
@@ -805,7 +803,7 @@ static int decode_lowdelay_slice(AVCodecContext *avctx, void *arg)
for (level = 0; level < s->wavelet_depth; level++) for (level = 0; level < s->wavelet_depth; level++)
for (orientation = !!level; orientation < 4; orientation++) { for (orientation = !!level; orientation < 4; orientation++) {
quant = FFMAX(quant_base - s->lowdelay.quant[level][orientation], 0); quant = FFMAX(quant_base - s->lowdelay.quant[level][orientation], 0);
lowdelay_subband(s, gb, quant, slice->slice_x, slice->slice_y, chroma_end, decode_subband(s, gb, quant, slice->slice_x, slice->slice_y, chroma_end,
&s->plane[1].band[level][orientation], &s->plane[1].band[level][orientation],
&s->plane[2].band[level][orientation]); &s->plane[2].band[level][orientation]);
} }