Mercurial > audlegacy-plugins
changeset 739:9480fdc511f1 trunk
[svn] - do not pass a buffered FD to the decoding thread, just use it for
determining whether or not the stream is ADTS.
| author | nenolod |
|---|---|
| date | Tue, 27 Feb 2007 04:19:56 -0800 |
| parents | 6ea974a229a8 |
| children | 6ae04ca57bc1 |
| files | ChangeLog src/aac/src/libmp4.c |
| diffstat | 2 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 27 04:17:49 2007 -0800 +++ b/ChangeLog Tue Feb 27 04:19:56 2007 -0800 @@ -1,3 +1,15 @@ +2007-02-27 12:17:49 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> + revision [1574] + - add read/write support for TLEN frame. + + trunk/src/madplug/TODO | 3 ++- + trunk/src/madplug/decoder.c | 26 +++++++++++++++++++++----- + trunk/src/madplug/fileinfo.c | 5 +++++ + trunk/src/madplug/input.c | 16 +++++++++++++++- + trunk/src/madplug/plugin.c | 25 ++++++++++++++++++++----- + 5 files changed, 63 insertions(+), 12 deletions(-) + + 2007-02-27 11:45:34 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1572] - use vfs_buffered_file_new_from_uri for probing.
--- a/src/aac/src/libmp4.c Tue Feb 27 04:17:49 2007 -0800 +++ b/src/aac/src/libmp4.c Tue Feb 27 04:19:56 2007 -0800 @@ -829,9 +829,6 @@ char *filename = playback->filename; mp4fh = vfs_buffered_file_new_from_uri(filename); - mp4cb->read = mp4_read_callback; - mp4cb->seek = mp4_seek_callback; - mp4cb->user_data = mp4fh; g_static_mutex_lock(&mutex); seekPosition= -1; @@ -842,7 +839,13 @@ g_thread_exit(NULL); ret = parse_aac_stream(mp4fh); - vfs_rewind(mp4fh); + vfs_fclose(mp4fh); + + mp4fh = vfs_fopen(filename, "rb"); + mp4cb->read = mp4_read_callback; + mp4cb->seek = mp4_seek_callback; + mp4cb->user_data = mp4fh; + mp4file= mp4ff_open_read(mp4cb); if( ret == TRUE ) {