diff options
| author | Kieran Kunhya <kierank@ob-encoder.com> | 2015-12-09 00:05:29 +0000 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2015-12-10 19:11:21 +0000 |
| commit | 3bb6ce1af9d95563786e0e29d087f68343defb89 (patch) | |
| tree | 29940c52a6b64bd7589df222219cb9c1d03e6051 | |
| parent | 3f07f12f65e56d1cf96e5ac2cefc0ad9c7bfb6af (diff) | |
| download | ffmpeg-3bb6ce1af9d95563786e0e29d087f68343defb89.tar.gz | |
diracdec: Rename lowdelay_subband to decode_subband because it is shared with HQ profile
| -rw-r--r-- | libavcodec/diracdec.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 1d4601ed46..03d257497a 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -719,11 +719,9 @@ static void decode_component(DiracContext *s, int comp) return; \ } \ -/* [DIRAC_STD] 13.5.5.2 Luma slice subband data. luma_slice_band(level,orient,sx,sy) --> if b2 == NULL */ -/* [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, - SubBand *b1, SubBand *b2) +static void decode_subband(DiracContext *s, GetBitContext *gb, int quant, + int slice_x, int slice_y, int bits_end, + SubBand *b1, SubBand *b2) { int left = b1->width * slice_x / s->lowdelay.num_x; int right = b1->width *(slice_x+1) / s->lowdelay.num_x; @@ -792,8 +790,8 @@ static int decode_lowdelay_slice(AVCodecContext *avctx, void *arg) for (level = 0; level < s->wavelet_depth; level++) for (orientation = !!level; orientation < 4; orientation++) { quant = FFMAX(quant_base - s->lowdelay.quant[level][orientation], 0); - lowdelay_subband(s, gb, quant, slice->slice_x, slice->slice_y, luma_end, - &s->plane[0].band[level][orientation], NULL); + decode_subband(s, gb, quant, slice->slice_x, slice->slice_y, luma_end, + &s->plane[0].band[level][orientation], NULL); } /* consume any unused bits from luma */ @@ -805,9 +803,9 @@ static int decode_lowdelay_slice(AVCodecContext *avctx, void *arg) for (level = 0; level < s->wavelet_depth; level++) for (orientation = !!level; orientation < 4; orientation++) { quant = FFMAX(quant_base - s->lowdelay.quant[level][orientation], 0); - lowdelay_subband(s, gb, quant, slice->slice_x, slice->slice_y, chroma_end, - &s->plane[1].band[level][orientation], - &s->plane[2].band[level][orientation]); + decode_subband(s, gb, quant, slice->slice_x, slice->slice_y, chroma_end, + &s->plane[1].band[level][orientation], + &s->plane[2].band[level][orientation]); } return 0; |