Index: /libmpc/trunk/libmpcdec/mpc_bits_reader.h =================================================================== --- /libmpc/trunk/libmpcdec/mpc_bits_reader.h (revision 412) +++ /libmpc/trunk/libmpcdec/mpc_bits_reader.h (revision 413) @@ -37,5 +37,5 @@ MPC_API int mpc_bits_get_block(mpc_bits_reader * r, mpc_block * p_block); mpc_int32_t mpc_bits_golomb_dec(mpc_bits_reader * r, const mpc_uint_t k); -unsigned int mpc_bits_get_size(mpc_bits_reader * r, mpc_uint64_t * p_size); +MPC_API unsigned int mpc_bits_get_size(mpc_bits_reader * r, mpc_uint64_t * p_size); mpc_uint32_t mpc_bits_log_dec(mpc_bits_reader * r, mpc_uint_t max); Index: /libmpc/trunk/mpcgain/mpcgain.c =================================================================== --- /libmpc/trunk/mpcgain/mpcgain.c (revision 412) +++ /libmpc/trunk/mpcgain/mpcgain.c (revision 413) @@ -50,5 +50,7 @@ #define MPCGAIN_VERSION cat(MPCGAIN_MAJOR,MPCGAIN_MINOR,MPCGAIN_BUILD) -const char About [] = "mpcgain - Musepack (MPC) ReplayGain calculator v" MPCGAIN_VERSION " (C) 2006-2007 MDT\nBuilt " __DATE__ " " __TIME__ "\n"; +#define MAX_HEAD_SIZE 20 // maximum size of the packet header before chapter gain (2 + 9 + 9) + +const char About [] = "mpcgain - Musepack (MPC) ReplayGain calculator v" MPCGAIN_VERSION " (C) 2006-2008 MDT\nBuilt " __DATE__ " " __TIME__ "\n"; @@ -56,4 +58,85 @@ { printf("Usage: %s [ ... ]\n", exename); +} + +static mpc_inline MPC_SAMPLE_FORMAT _max(MPC_SAMPLE_FORMAT a, MPC_SAMPLE_FORMAT b) +{ + if (a > b) + return a; + return b; +} + +static mpc_inline MPC_SAMPLE_FORMAT max_abs(MPC_SAMPLE_FORMAT a, MPC_SAMPLE_FORMAT b) +{ + if (b < 0) + b = -b; + if (b > a) + return b; + return a; +} + +static MPC_SAMPLE_FORMAT analyze_get_max(MPC_SAMPLE_FORMAT * sample_buffer, int sample_nb) +{ + Float_t left_samples[MPC_FRAME_LENGTH * sizeof(Float_t)]; + Float_t right_samples[MPC_FRAME_LENGTH * sizeof(Float_t)]; + MPC_SAMPLE_FORMAT max = 0; + int i; + + for (i = 0; i < sample_nb; i++){ + left_samples[i] = sample_buffer[2 * i] * (1 << 15); + right_samples[i] = sample_buffer[2 * i + 1] * (1 << 15); + max = max_abs(max, sample_buffer[2 * i]); + max = max_abs(max, sample_buffer[2 * i + 1]); + } + gain_analyze_samples(left_samples, right_samples, sample_nb, 2); + + return max; +} + + + +static void write_chaps_gain(mpc_demux * demux, const char * file_name, + mpc_uint16_t * chap_gain, mpc_uint16_t * chap_peak) +{ + unsigned char buffer[MAX_HEAD_SIZE]; + mpc_bits_reader r; + mpc_block b; + mpc_uint64_t size, dummy; + FILE * file; + int chap = 0; + long next_chap_pos = demux->chap_pos >> 3; + + + file = fopen( file_name, "r+"); + if (file == 0) { + fprintf(stderr, "Can't open file \"%s\" for writing\n", file_name); + return; + } + + while (1) { + fseek(file, next_chap_pos, SEEK_SET); + fread(buffer, 1, MAX_HEAD_SIZE, file); + r.buff = buffer; + r.count = 8; + size = mpc_bits_get_block(&r, &b); + + if (memcmp(b.key, "CT", 2) != 0) + break; + + b.size += size; + size += mpc_bits_get_size(&r, &dummy); + + fseek(file, next_chap_pos + size, SEEK_SET); + buffer[0] = chap_gain[chap] >> 8; + buffer[1] = chap_gain[chap] & 0xFF; + buffer[2] = chap_peak[chap] >> 8; + buffer[3] = chap_peak[chap] & 0xFF; + fwrite(buffer, 1, 4, file); // writing chapter gain / peak + + chap++; + next_chap_pos += b.size; + } + + fclose(file); } @@ -70,5 +153,5 @@ printf(About); - if(argc < 2) { + if (argc < 2) { usage(argv[0]); return 0; @@ -79,40 +162,76 @@ header_pos = (mpc_uint32_t *) (title_peak + (argc - 1)); - for( j = 1; j < argc; j++){ + for (j = 1; j < argc; j++) { MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH]; - Float_t left_samples[MPC_FRAME_LENGTH * sizeof(Float_t)]; - Float_t right_samples[MPC_FRAME_LENGTH * sizeof(Float_t)]; - MPC_SAMPLE_FORMAT title_max = 0; + MPC_SAMPLE_FORMAT title_max = 0, chap_max; + mpc_uint16_t * chap_gain, * chap_peak; mpc_reader reader; mpc_demux* demux; mpc_streaminfo si; mpc_status err; + int chap_nb, chap = 0; + mpc_uint64_t cur_sample = 1, next_chap_sample = mpc_int64_max; err = mpc_reader_init_stdio(&reader, argv[j]); - if(err < 0) return !MPC_STATUS_OK; + if (err < 0) return !MPC_STATUS_OK; demux = mpc_demux_init(&reader); - if(!demux) return !MPC_STATUS_OK; + if (!demux) return !MPC_STATUS_OK; mpc_demux_get_info(demux, &si); + chap_nb = mpc_demux_chap_nb(demux); + mpc_demux_seek_sample(demux, 0); + if (chap_nb > 0) { + mpc_chap_info * chap_info = mpc_demux_chap(demux, chap); + next_chap_sample = chap_info->sample; + chap_gain = malloc(sizeof(mpc_uint16_t) * 2 * chap_nb); + chap_peak = chap_gain + chap_nb; + } + if (j == 1) gain_init_analysis ( si.sample_freq ); - while(1) { + while (1) { mpc_frame_info frame; - int i; + int i = 0; frame.buffer = sample_buffer; mpc_demux_decode(demux, &frame); - if(frame.bits == -1) break; - - for( i = 0; i < frame.samples; i++){ - left_samples[i] = sample_buffer[2 * i] * (1 << 15); - right_samples[i] = sample_buffer[2 * i + 1] * (1 << 15); - title_max = maxf(title_max, sample_buffer[2 * i]); - title_max = maxf(title_max, sample_buffer[2 * i + 1]); + if (frame.bits == -1) break; + + while (next_chap_sample < cur_sample + frame.samples) { + int sample_nb = (int)(next_chap_sample - cur_sample); + + chap_max = _max(chap_max, analyze_get_max(sample_buffer + 2 * i, sample_nb)); + + if (chap == 0) // first samples are not in a chapter + gain_get_chapter(); + else { + chap_gain[chap - 1] = (mpc_uint16_t) (gain_get_chapter() * 256); + chap_peak[chap - 1] = (mpc_uint16_t) (log10(chap_max * (1 << 15)) * 20 * 256); + } + chap++; + title_max = _max(title_max, chap_max); + chap_max = 0; + i += sample_nb; + cur_sample = next_chap_sample; + if (chap < chap_nb) { + mpc_chap_info * chap_info = mpc_demux_chap(demux, chap); + next_chap_sample = chap_info->sample; + } else + next_chap_sample = mpc_int64_max; } - gain_analyze_samples(left_samples, right_samples, frame.samples, si.channels); - } + chap_max = _max(chap_max, analyze_get_max(sample_buffer + 2 * i, frame.samples - i)); + cur_sample += frame.samples - i; + } + + if (chap_nb > 0) { + chap_gain[chap - 1] = (mpc_uint16_t) (gain_get_chapter() * 256); + chap_peak[chap - 1] = (mpc_uint16_t) (log10(chap_max * (1 << 15)) * 20 * 256); + write_chaps_gain(demux, argv[j], chap_gain, chap_peak); + } + + title_max = _max(title_max, chap_max); + album_max = _max(album_max, title_max); title_gain[j-1] = (mpc_uint16_t) (gain_get_title() * 256); @@ -120,8 +239,8 @@ header_pos[j-1] = si.header_position + 4; - album_max = maxf(album_max, title_max); - mpc_demux_exit(demux); mpc_reader_exit_stdio(&reader); + if (chap_nb > 0) + free(chap_gain); } @@ -129,5 +248,5 @@ album_peak = (mpc_uint16_t) (log10(album_max * (1 << 15)) * 20 * 256); - for( j = 0; j < argc - 1; j++) { + for (j = 0; j < argc - 1; j++) { unsigned char buffer[64]; mpc_bits_reader r; @@ -153,5 +272,5 @@ size = mpc_bits_get_block(&r, &b); - while( memcmp(b.key, "RG", 2) != 0 ) { + while (memcmp(b.key, "RG", 2) != 0 ) { header_pos[j] += b.size + size; fseek(file, header_pos[j], SEEK_SET);