aboutsummaryrefslogtreecommitdiff
path: root/encoder/ih264e_cavlc.c
diff options
context:
space:
mode:
Diffstat (limited to 'encoder/ih264e_cavlc.c')
-rw-r--r--encoder/ih264e_cavlc.c78
1 files changed, 41 insertions, 37 deletions
diff --git a/encoder/ih264e_cavlc.c b/encoder/ih264e_cavlc.c
index ed34a43..f142717 100644
--- a/encoder/ih264e_cavlc.c
+++ b/encoder/ih264e_cavlc.c
@@ -31,15 +31,16 @@
* ittiam
*
* @par List of Functions:
-* - ih264e_compute_zeroruns_and_trailingones()
-* - ih264e_write_coeff4x4_cavlc()
-* - ih264e_write_coeff8x8_cavlc()
-* - ih264e_encode_residue()
-* - ih264e_write_islice_mb_cavlc()
-* - ih264e_write_pslice_mb_cavlc()
+* - ih264e_compute_zeroruns_and_trailingones
+* - ih264e_write_coeff4x4_cavlc
+* - ih264e_write_coeff8x8_cavlc
+* - ih264e_encode_residue
+* - ih264e_write_islice_mb_cavlc
+* - ih264e_write_pslice_mb_cavlc
+* - ih264e_write_bslice_mb_cavlc
*
* @remarks
-* None
+* none
*
*******************************************************************************
*/
@@ -48,41 +49,44 @@
/* File Includes */
/*****************************************************************************/
-/* System include files */
+/* System Include Files */
#include <stdio.h>
#include <assert.h>
#include <limits.h>
-/* User include files */
+/* User Include Files */
#include "ih264e_config.h"
#include "ih264_typedefs.h"
#include "iv2.h"
#include "ive2.h"
+
#include "ih264_debug.h"
#include "ih264_macros.h"
-#include "ih264_defs.h"
-#include "ih264e_defs.h"
-#include "ih264e_error.h"
-#include "ih264e_bitstream.h"
-#include "ime_distortion_metrics.h"
-#include "ime_defs.h"
-#include "ime_structs.h"
#include "ih264_error.h"
+#include "ih264_defs.h"
+#include "ih264_mem_fns.h"
+#include "ih264_padding.h"
#include "ih264_structs.h"
#include "ih264_trans_quant_itrans_iquant.h"
#include "ih264_inter_pred_filters.h"
-#include "ih264_mem_fns.h"
-#include "ih264_padding.h"
#include "ih264_intra_pred_filters.h"
#include "ih264_deblk_edge_filters.h"
+#include "ih264_cavlc_tables.h"
#include "ih264_cabac_tables.h"
+
+#include "ime_defs.h"
+#include "ime_distortion_metrics.h"
+#include "ime_structs.h"
+
#include "irc_cntrl_param.h"
#include "irc_frame_info_collector.h"
-#include "ih264e_rate_control.h"
+
+#include "ih264e_error.h"
+#include "ih264e_defs.h"
+#include "ih264e_bitstream.h"
#include "ih264e_cabac_structs.h"
#include "ih264e_structs.h"
#include "ih264e_encode_header.h"
-#include "ih264_cavlc_tables.h"
#include "ih264e_cavlc.h"
#include "ih264e_statistics.h"
#include "ih264e_trace.h"
@@ -117,7 +121,7 @@
* Bits 16-24 contains total number of zeros.
*
* @remarks
-* None
+* none
*
*******************************************************************************
*/
@@ -421,44 +425,44 @@ static IH264E_ERROR_T ih264e_write_coeff4x4_cavlc(WORD16 *pi2_res_block,
while (1)
{
- UWORD32 u4_codesize;
- UWORD32 u4_codeword;
- UWORD32 u4_codeval;
+ WORD32 i4_codesize;
+ WORD32 i4_codeword;
+ WORD32 i4_codeval;
u4_remaining_coeff--;
GATHER_CAVLC_STATS1();
{
- u4_codeval = u4_abs_level << 1;
- u4_codeval = u4_codeval - 2 - i4_sign;
+ i4_codeval = u4_abs_level << 1;
+ i4_codeval = i4_codeval - 2 - i4_sign;
if ((!u4_suffix_length) && (u4_escape > 7) && (u4_abs_level < 16))
{
- u4_codeword = (1 << 4) + (u4_codeval - 14);
- u4_codesize = 19;
+ i4_codeword = (1 << 4) + (i4_codeval - 14);
+ i4_codesize = 19;
}
else if (u4_escape > 7)
{
- u4_codeword = (1 << 12) + (u4_codeval - (15 << u4_suffix_length));
- u4_codesize = 28;
+ i4_codeword = (1 << 12) + (i4_codeval - (15 << u4_suffix_length));
+ i4_codesize = 28;
if (!u4_suffix_length)
{
- u4_codeword -= 15;
+ i4_codeword -= 15;
}
}
else
{
- u4_codeword = (1 << u4_suffix_length) + (u4_codeval & ((1 << u4_suffix_length)-1));
- u4_codesize = (u4_codeval >> u4_suffix_length) + 1 + u4_suffix_length;
+ i4_codeword = (1 << u4_suffix_length) + (i4_codeval & ((1 << u4_suffix_length)-1));
+ i4_codesize = (i4_codeval >> u4_suffix_length) + 1 + u4_suffix_length;
}
}
/*put the level code in bitstream*/
- DEBUG("\nLEVEL: %d u4_codeword, %d u4_codesize",u4_codeword, u4_codesize);
- ENTROPY_TRACE("\tcodeword ",u4_codeword);
- ENTROPY_TRACE("\tcodesize ",u4_codesize);
- error_status = ih264e_put_bits(ps_bit_stream, u4_codeword, u4_codesize);
+ DEBUG("\nLEVEL: %d i4_codeword, %d i4_codesize",i4_codeword, i4_codesize);
+ ENTROPY_TRACE("\tcodeword ",i4_codeword);
+ ENTROPY_TRACE("\tcodesize ",i4_codesize);
+ error_status = ih264e_put_bits(ps_bit_stream, i4_codeword, i4_codesize);
if (u4_remaining_coeff == 0) break;