Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#10424 - [wav codec] wav codec supports some ADPCM formats

Attached to Project: Rockbox
Opened by Yoshihisa Uchida (Uchida) - Friday, 10 July 2009, 14:45 GMT+2
Last edited by Maurus Cuelenaere (mcuelenaere) - Saturday, 20 February 2010, 13:04 GMT+2
Task Type Patches
Category Codecs
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

wav codec supports the following ADPCM formats:
- Microsoft ADPCM
- Dialogic Oki ADPCM
- Yamaha ADPCM

It is necessary to apply the patch of  FS#10422 ,  FS#10423 .
   rb_adpcms.patch (23.7 KiB) 
 codecs/libpcms/SOURCES              |    3 
 codecs/libpcms/dialogic_oki_adpcm.c |  138 ++++++++++++++++++++++++
 codecs/libpcms/ms_adpcm.c           |  193 ++++++++++++++++++++++++++++++++++
 codecs/libpcms/pcm_common.h         |    5 
 codecs/libpcms/support_formats.h    |    9 +
 codecs/libpcms/yamaha_adpcm.c       |  204 ++++++++++++++++++++++++++++++++++++
 codecs/wav.c                        |    8 +
 metadata/wave.c                     |   96 ++++++++++++++--
 8 files changed, 640 insertions(+), 16 deletions(-)

This task depends upon

Closed by  Maurus Cuelenaere (mcuelenaere)
Saturday, 20 February 2010, 13:04 GMT+2
Reason for closing:  Accepted
Additional comments about closing:  In r24782.
Comment by alex wallis (alexwallis646) - Tuesday, 14 July 2009, 16:32 GMT+2
this task appears to depend on other tasks according to the description, so perhaps this should also be made a dependency of them.
Comment by alex wallis (alexwallis646) - Tuesday, 14 July 2009, 23:31 GMT+2
this patch will not apply, I have applied fs #10422 and fs #10423.
Comment by Yoshihisa Uchida (Uchida) - Thursday, 16 July 2009, 16:11 GMT+2
In my build environment, these patches apply success.

Please tell me the error message when the patch is applied.

My build environment
OS
Linux
Windows Vista + Cygwin

Source
r21903
Comment by alex wallis (alexwallis646) - Thursday, 16 July 2009, 16:48 GMT+2
Hi. for fs #10432 the error when the patch is applied is
patching file apps/codecs/codecs.make
Hunk #1 FAILED at 78.
1 out of 1 hunk FAILED -- rejects in file apps/codecs/codecs.make

that is the only file that has a problem.

The same error appears to happen on fs#10433.

I am running the latest svn code. It does have some patches on, but none of them touch the files yours do. I did try applying only your patches and still got problems.
Comment by MichaelGiacomelli (saratoga) - Tuesday, 21 July 2009, 21:16 GMT+2
Hi, I emailed you last month about your patches to the email in your contact info. Did you get my email?
Comment by Yoshihisa Uchida (Uchida) - Saturday, 06 February 2010, 10:13 GMT+2
I am not good at anything by the current illness. Because I had recovered from the illness at last, I can restart this correction.
Please wait for a new patch for a while.
Comment by Yoshihisa Uchida (Uchida) - Tuesday, 16 February 2010, 10:12 GMT+2
new patch applied.

changes:
- sync r24691
- seek process corrects.
- I corrected to seek to dialogic oki adpcm, non block header yamaha adpcm format wave file.
(Because the definition of get_seek_pos() had been changed, I changed all wave formats.)
- I changed 'chunksize' value for all wave formats.
- I changed set_formats(). (fmtops does not used.)

   rb_adpcms_2.patch (55.5 KiB) 
 codecs/aiff.c                      |   52 ++++++-
 codecs/libpcm/SOURCES              |    4 
 codecs/libpcm/adpcm_seek.c         |  101 +++++++++++++++
 codecs/libpcm/adpcm_seek.h         |   39 +++++
 codecs/libpcm/dialogic_oki_adpcm.c |  183 +++++++++++++++++++++++++++
 codecs/libpcm/dvi_adpcm.c          |   33 +---
 codecs/libpcm/ieee_float.c         |   29 ++--
 codecs/libpcm/itut_g711.c          |   44 ++----
 codecs/libpcm/linear_pcm.c         |   39 ++---
 codecs/libpcm/ms_adpcm.c           |  166 +++++++++++++++++++++++++
 codecs/libpcm/pcm_common.h         |   77 ++++++++++-
 codecs/libpcm/support_formats.h    |   13 +
 codecs/libpcm/yamaha_adpcm.c       |  245 +++++++++++++++++++++++++++++++++++++
 codecs/wav.c                       |  118 ++++++++++++++++-
 metadata/wave.c                    |  128 +++++++++++++++----
 15 files changed, 1136 insertions(+), 135 deletions(-)

Comment by Yoshihisa Uchida (Uchida) - Saturday, 20 February 2010, 11:02 GMT+2
I commit this patch (see r24782) but I cannot close my task.
please close this task.
Comment by Maurus Cuelenaere (mcuelenaere) - Saturday, 20 February 2010, 13:04 GMT+2
> but I cannot close my task

Please ask for Flyspray developer rights in IRC.

Loading...