[FFmpeg-cvslog] lavc/g729dec: use ff_parity()

Clément Bœsch git at videolan.org
Thu Jan 7 22:52:19 CET 2016


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Jan  3 20:14:57 2016 +0100| [a1136ca973e3b216804d05bbf64fcc19ad0f14da] | committer: Clément Bœsch

lavc/g729dec: use ff_parity()

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1136ca973e3b216804d05bbf64fcc19ad0f14da
---

 libavcodec/g729dec.c |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 99053ad..7265883 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -181,14 +181,6 @@ static inline uint16_t g729_prng(uint16_t value)
 }
 
 /**
- * Get parity bit of bit 2..7
- */
-static inline int get_parity(uint8_t value)
-{
-   return (0x6996966996696996ULL >> (value >> 2)) & 1;
-}
-
-/**
  * Decodes LSF (Line Spectral Frequencies) from L0-L3 (3.2.4).
  * @param[out] lsfq (2.13) quantized LSF coefficients
  * @param[in,out] past_quantizer_outputs (2.13) quantizer outputs from previous frames
@@ -480,7 +472,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
 
         ac_index      = get_bits(&gb, format->ac_index_bits[i]);
         if(!i && format->parity_bit)
-            bad_pitch = get_parity(ac_index) == get_bits1(&gb);
+            bad_pitch = ff_parity(ac_index >> 2) == get_bits1(&gb);
         fc_indexes    = get_bits(&gb, format->fc_indexes_bits);
         pulses_signs  = get_bits(&gb, format->fc_signs_bits);
         gc_1st_index  = get_bits(&gb, format->gc_1st_index_bits);



More information about the ffmpeg-cvslog mailing list