include rice parameters and escape codes in --a-rtext output

diff --git a/src/flac/analyze.c b/src/flac/analyze.c
index ec13b52c398a709e51e60d048d93e90da6f3ff66..fe7c97de55781dc605be4bd8a94f297215a9ea3a 100644 (file)
--- a/src/flac/analyze.c
+++ b/src/flac/analyze.c
@@ -74,6 +74,14 @@ void flac__analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analys
                                for(i = 0; i < subframe->data.fixed.order; i++)
                                        fprintf(fout, "\t\twarmup[%u]=%d\n", i, subframe->data.fixed.warmup[i]);
                                if(aopts.do_residual_text) {
+                                       const unsigned partitions = (1u << subframe->data.fixed.entropy_coding_method.data.partitioned_rice.order);
+                                       for(i = 0; i < partitions; i++) {
+                                               unsigned parameter = subframe->data.fixed.entropy_coding_method.data.partitioned_rice.parameters[i];
+                                               if(parameter == FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER)
+                                                       fprintf(fout, "\t\tparameter[%u]=ESCAPE, raw_bits=%u\n", i, subframe->data.fixed.entropy_coding_method.data.partitioned_rice.raw_bits[i]);
+                                               else
+                                                       fprintf(fout, "\t\tparameter[%u]=%u\n", i, parameter);
+                                       }
                                        for(i = 0; i < frame->header.blocksize-subframe->data.fixed.order; i++)
                                                fprintf(fout, "\t\tresidual[%u]=%d\n", i, subframe->data.fixed.residual[i]);
                                }
@@ -83,6 +91,14 @@ void flac__analyze_frame(const FLAC__Frame *frame, unsigned frame_number, analys
                                for(i = 0; i < subframe->data.lpc.order; i++)
                                        fprintf(fout, "\t\twarmup[%u]=%d\n", i, subframe->data.lpc.warmup[i]);
                                if(aopts.do_residual_text) {
+                                       const unsigned partitions = (1u << subframe->data.lpc.entropy_coding_method.data.partitioned_rice.order);
+                                       for(i = 0; i < partitions; i++) {
+                                               unsigned parameter = subframe->data.lpc.entropy_coding_method.data.partitioned_rice.parameters[i];
+                                               if(parameter == FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_ESCAPE_PARAMETER)
+                                                       fprintf(fout, "\t\tparameter[%u]=ESCAPE, raw_bits=%u\n", i, subframe->data.lpc.entropy_coding_method.data.partitioned_rice.raw_bits[i]);
+                                               else
+                                                       fprintf(fout, "\t\tparameter[%u]=%u\n", i, parameter);
+                                       }
                                        for(i = 0; i < frame->header.blocksize-subframe->data.lpc.order; i++)
                                                fprintf(fout, "\t\tresidual[%u]=%d\n", i, subframe->data.lpc.residual[i]);
                                }