Fix musepack bitrate display
Thanks to Paul Seropian (paranoos) git-svn-id: https://svn.musicpd.org/mpd/trunk@3421 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
		| @@ -201,6 +201,8 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc, | |||||||
| 			dc->seek = 0; | 			dc->seek = 0; | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
|  | 		vbrUpdateAcc = 0; | ||||||
|  | 		vbrUpdateBits = 0; | ||||||
| 		ret = mpc_decoder_decode(&decoder, sample_buffer, | 		ret = mpc_decoder_decode(&decoder, sample_buffer, | ||||||
| 				         &vbrUpdateAcc, &vbrUpdateBits); | 				         &vbrUpdateAcc, &vbrUpdateBits); | ||||||
|  |  | ||||||
| @@ -226,7 +228,7 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc, | |||||||
|  |  | ||||||
| 				bitRate = vbrUpdateBits *  | 				bitRate = vbrUpdateBits *  | ||||||
| 					  dc->audioFormat.sampleRate /  | 					  dc->audioFormat.sampleRate /  | ||||||
| 					  (MPC_CHUNK_SIZE); | 					  1152 / 1000; | ||||||
| 				 | 				 | ||||||
| 				sendDataToOutputBuffer(cb, inStream, dc,  | 				sendDataToOutputBuffer(cb, inStream, dc,  | ||||||
| 						inStream->seekable,   | 						inStream->seekable,   | ||||||
| @@ -248,8 +250,7 @@ static int mpc_decode(OutputBuffer * cb, DecoderControl * dc, | |||||||
| 	if(!dc->stop && chunkpos > 0) { | 	if(!dc->stop && chunkpos > 0) { | ||||||
|                 time = ((float)samplePos) / dc->audioFormat.sampleRate; |                 time = ((float)samplePos) / dc->audioFormat.sampleRate; | ||||||
|  |  | ||||||
| 		bitRate = vbrUpdateBits * dc->audioFormat.sampleRate / | 		bitRate = vbrUpdateBits * dc->audioFormat.sampleRate / 1152 / 1000; | ||||||
| 			  chunkpos; |  | ||||||
|  |  | ||||||
| 		sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable, | 		sendDataToOutputBuffer(cb, NULL, dc, inStream->seekable, | ||||||
| 				       chunk, chunkpos, time, bitRate,  | 				       chunk, chunkpos, time, bitRate,  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Eric Wong
					Eric Wong