diff options
| author | Mohamed Tarek <mt@rockbox.org> | 2009-05-24 14:10:51 +0000 |
|---|---|---|
| committer | Mohamed Tarek <mt@rockbox.org> | 2009-05-24 14:10:51 +0000 |
| commit | 45f72e933a06edeedb30ea1299df83b41e5ba07e (patch) | |
| tree | 80f5341e24eea1e3ceb61b4b61ae220e3c7fddad /apps/codecs/libcook | |
| parent | 6af0cfdac008c6d5b5ed06f33cbb2162a1cbaf83 (diff) | |
| download | rockbox-45f72e933a06edeedb30ea1299df83b41e5ba07e.zip rockbox-45f72e933a06edeedb30ea1299df83b41e5ba07e.tar.gz rockbox-45f72e933a06edeedb30ea1299df83b41e5ba07e.tar.bz2 rockbox-45f72e933a06edeedb30ea1299df83b41e5ba07e.tar.xz | |
Move rm.[c/h] from libcook to librm. No functional changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21066 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libcook')
| -rw-r--r-- | apps/codecs/libcook/Makefile.test | 2 | ||||
| -rw-r--r-- | apps/codecs/libcook/cook.h | 2 | ||||
| -rw-r--r-- | apps/codecs/libcook/main.c | 2 | ||||
| -rw-r--r-- | apps/codecs/libcook/rm.c | 563 | ||||
| -rw-r--r-- | apps/codecs/libcook/rm.h | 83 |
5 files changed, 3 insertions, 649 deletions
diff --git a/apps/codecs/libcook/Makefile.test b/apps/codecs/libcook/Makefile.test index a125544..493ab8f 100644 --- a/apps/codecs/libcook/Makefile.test +++ b/apps/codecs/libcook/Makefile.test @@ -1,5 +1,5 @@ CFLAGS = -Wall -O3 -OBJS = main.o bitstream.o cook.o rm.o +OBJS = main.o bitstream.o cook.o ../librm/rm.o cooktest: $(OBJS) gcc -o cooktest $(OBJS) diff --git a/apps/codecs/libcook/cook.h b/apps/codecs/libcook/cook.h index f5da639..ca98207 100644 --- a/apps/codecs/libcook/cook.h +++ b/apps/codecs/libcook/cook.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "bitstream.h" -#include "rm.h" +#include "../librm/rm.h" #include "cookdata_fixpoint.h" typedef struct { diff --git a/apps/codecs/libcook/main.c b/apps/codecs/libcook/main.c index f12e586..87f6584 100644 --- a/apps/codecs/libcook/main.c +++ b/apps/codecs/libcook/main.c @@ -25,7 +25,7 @@ #include <unistd.h> #include <string.h> -#include "rm.h" +#include "../librm/rm.h" #include "cook.h" //#define DUMP_RAW_FRAMES diff --git a/apps/codecs/libcook/rm.c b/apps/codecs/libcook/rm.c deleted file mode 100644 index 86c4378..0000000 --- a/apps/codecs/libcook/rm.c +++ /dev/null @@ -1,563 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 Dave Chapman - * Copyright (C) 2009 Mohamed Tarek - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include <stdio.h> -#include <string.h> -#include <stdint.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> - -#include "rm.h" - - -#if 0 -#define DEBUG -#define DEBUGF printf -#else -#define DEBUGF(...) -#endif - -/* Some Rockbox-like functions (these should be implemented in metadata_common.[ch] */ -static uint8_t get_uint8(uint8_t *buf) -{ - return (uint8_t)buf[0]; -} - -static uint16_t get_uint16be(uint8_t *buf) -{ - return (uint16_t)((buf[0] << 8)|buf[1]); -} - -static uint32_t get_uint32be(uint8_t *buf) -{ - return (uint32_t)((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]); -} - -static int read_uint8(int fd, uint8_t* buf) -{ - unsigned char tmp[1]; - int res; - - res=read(fd, tmp, 1); - *buf = tmp[0]; - return res; -} - -static int read_uint16be(int fd, uint16_t* buf) -{ - unsigned char tmp[2]; - int res; - - res=read(fd, tmp, 2); - *buf = (tmp[0] << 8) | tmp[1]; - return res; -} - -static int read_uint32be(int fd, uint32_t* buf) -{ - unsigned char tmp[4]; - int res; - - res=read(fd, tmp, 4); - *buf = (tmp[0] << 24) | (tmp[1] << 16) | (tmp[2] << 8) | tmp[3]; - return res; -} - -off_t filesize(int fd) -{ - struct stat buf; - - if (fstat(fd,&buf) == -1) { - return -1; - } else { - return buf.st_size; - } -} - -void advance_buffer(uint8_t **buf, int val) -{ - *buf += val; -} - -int read_cook_extradata(int fd, RMContext *rmctx) { - read_uint32be(fd, &rmctx->cook_version); - read_uint16be(fd, &rmctx->samples_pf_pc); - read_uint16be(fd, &rmctx->nb_subbands); - if(rmctx->extradata_size == 16) { - read_uint32be(fd, &rmctx->unused); - read_uint16be(fd, &rmctx->js_subband_start); - read_uint16be(fd, &rmctx->js_vlc_bits); - } - return rmctx->extradata_size; /* for 'skipped' */ -} - -void print_cook_extradata(RMContext *rmctx) { - - printf(" cook_version = 0x%08x\n", rmctx->cook_version); - printf(" samples_per_frame_per_channel = %d\n", rmctx->samples_pf_pc); - printf(" number_of_subbands_in_freq_domain = %d\n", rmctx->nb_subbands); - if(rmctx->extradata_size == 16) { - printf(" joint_stereo_subband_start = %d\n",rmctx->js_subband_start); - printf(" joint_stereo_vlc_bits = %d\n", rmctx->js_vlc_bits); - } -} - - -struct real_object_t -{ - uint32_t fourcc; - uint32_t size; - uint16_t version; -}; - -#define FOURCC(a,b,c,d) (((a)<<24) | ((b) << 16) | ((c) << 8) | (d)) - -static int real_read_object_header(int fd, struct real_object_t* obj) -{ - int n; - - if ((n = read_uint32be(fd, &obj->fourcc)) <= 0) return n; - if ((n = read_uint32be(fd, &obj->size)) <= 0) return n; - if ((n = read_uint16be(fd, &obj->version)) <= 0) return n; - - return 1; -} - -static char* fourcc2str(uint32_t f) -{ - static char res[5]; - - res[0] = (f & 0xff000000) >> 24; - res[1] = (f & 0xff0000) >> 16; - res[2] = (f & 0xff00) >> 8; - res[3] = (f & 0xff); - res[4] = 0; - - return res; -} - -static int read_str(int fd, char* buf) -{ - uint8_t len; - int res; - - res = read(fd, &len, 1); - res = read(fd, buf, len); - buf[len]=0; - - return len+1; -} - -static int real_read_audio_stream_info(int fd, RMContext *rmctx) -{ - int skipped = 0; - uint32_t version; - struct real_object_t obj; - memset(&obj,0,sizeof(obj)); - uint32_t header_size; - uint16_t flavor; - uint32_t coded_framesize; - uint32_t unknown1; - uint32_t unknown2; - uint32_t unknown3; - uint16_t unknown4; - uint16_t unknown5; - uint16_t unknown6; - uint16_t unknown7; - uint32_t unknown8; - uint8_t interleaver_id_length; - uint32_t interleaver_id; - uint8_t fourcc_length; - uint32_t fourcc = 0; - uint8_t unknown9; - uint16_t unknown10; - uint8_t unknown11; - - read_uint32be(fd, &version); - skipped += 4; - - printf(" version=0x%04x\n",((version >> 16) & 0xff)); - if (((version >> 16) & 0xff) == 3) { - /* Very old version */ - } else { - real_read_object_header(fd, &obj); - skipped += 10; - read_uint32be(fd, &header_size); - skipped += 4; - /* obj.size will be filled with an unknown value, replaced with header_size */ - printf(" Object: %s, size: %d bytes, version: 0x%04x\n",fourcc2str(obj.fourcc),header_size,obj.version); - - read_uint16be(fd, &flavor); - read_uint32be(fd, &coded_framesize); - read_uint32be(fd, &unknown1); - read_uint32be(fd, &unknown2); - read_uint32be(fd, &unknown3); - read_uint16be(fd, &rmctx->sub_packet_h); - read_uint16be(fd, &rmctx->block_align); - read_uint16be(fd, &rmctx->sub_packet_size); - read_uint16be(fd, &unknown4); - skipped += 26; - if (((version >> 16) & 0xff) == 5) - { - read_uint16be(fd, &unknown5); - read_uint16be(fd, &unknown6); - read_uint16be(fd, &unknown7); - skipped += 6; - } - read_uint16be(fd, &rmctx->sample_rate); - read_uint32be(fd, &unknown8); - read_uint16be(fd, &rmctx->nb_channels); - skipped += 8; - if (((version >> 16) & 0xff) == 4) - { - read_uint8(fd, &interleaver_id_length); - read_uint32be(fd, &interleaver_id); - read_uint8(fd, &fourcc_length); - read_uint32be(fd, &fourcc); - skipped += 10; - } - if (((version >> 16) & 0xff) == 5) - { - read_uint32be(fd, &interleaver_id); - read_uint32be(fd, &fourcc); - skipped += 8; - } - read_uint8(fd,&unknown9); - read_uint16be(fd,&unknown10); - skipped += 3; - if (((version >> 16) & 0xff) == 5) - { - read_uint8(fd, &unknown11); - skipped += 1; - } - - read_uint32be(fd, &rmctx->extradata_size); - skipped += 4; - if(!strncmp(fourcc2str(fourcc),"cook",4)) - skipped += read_cook_extradata(fd, rmctx); - - - printf(" flavor = %d\n",flavor); - printf(" coded_frame_size = %d\n",coded_framesize); - printf(" sub_packet_h = %d\n",rmctx->sub_packet_h); - printf(" frame_size = %d\n",rmctx->block_align); - printf(" sub_packet_size = %d\n",rmctx->sub_packet_size); - printf(" sample_rate= %d\n",rmctx->sample_rate); - printf(" channels= %d\n",rmctx->nb_channels); - printf(" fourcc = %s\n",fourcc2str(fourcc)); - printf(" codec_extra_data_length = %d\n",rmctx->extradata_size); - printf(" codec_extradata :\n"); - print_cook_extradata(rmctx); - - } - - return skipped; -} - -int real_parse_header(int fd, RMContext *rmctx) -{ - struct real_object_t obj; - memset(&obj,0,sizeof(obj)); - int res; - int skipped; - off_t curpos; - - uint32_t unknown1; - uint32_t unknown2; - - uint32_t max_bitrate; - uint32_t avg_bitrate = 0; - uint32_t max_packet_size; - uint32_t avg_packet_size; - uint32_t packet_count; - uint32_t duration; - uint32_t preroll; - uint32_t index_offset; - uint16_t num_streams; - uint16_t flags = 0; - - uint16_t stream_id; - uint32_t start_time; - char desc[256]; - char mimetype[256]; - uint32_t codec_data_size; - uint32_t v; - - char title[256]; - char author[256]; - char copyright[256]; - char comment[256]; - - uint32_t next_data_off; - uint8_t header_end; - - curpos = lseek(fd, 0, SEEK_SET); - res = real_read_object_header(fd, &obj); - - if (obj.fourcc == FOURCC('.','r','a',0xfd)) - { - /* Very old .ra format - not yet supported */ - return -1; - } - else if (obj.fourcc != FOURCC('.','R','M','F')) - { - return -1; - } - - read_uint32be(fd, &unknown1); - read_uint32be(fd, &unknown2); - - printf("Object: %s, size: %d bytes, version: 0x%04x, pos: %d\n",fourcc2str(obj.fourcc),(int)obj.size,obj.version,(int)curpos); - printf(" unknown1=%d (0x%08x)\n",unknown1,unknown1); - printf(" unknown2=%d (0x%08x)\n",unknown2,unknown2); - - res = real_read_object_header(fd, &obj); - header_end = 0; - while(res) - { - printf("Object: %s, size: %d bytes, version: 0x%04x, pos: %d\n",fourcc2str(obj.fourcc),(int)obj.size,obj.version,(int)curpos); - skipped = 10; - if(obj.fourcc == FOURCC('I','N','D','X')) - break; - switch (obj.fourcc) - { - case FOURCC('P','R','O','P'): /* File properties */ - read_uint32be(fd, &max_bitrate); - read_uint32be(fd, &rmctx->bit_rate); /*avg bitrate*/ - read_uint32be(fd, &max_packet_size); - read_uint32be(fd, &avg_packet_size); - read_uint32be(fd, &packet_count); - read_uint32be(fd, &duration); - read_uint32be(fd, &preroll); - read_uint32be(fd, &index_offset); - read_uint32be(fd, &rmctx->data_offset); - read_uint16be(fd, &num_streams); - read_uint16be(fd, &rmctx->flags); - skipped += 40; - - printf(" max_bitrate = %d\n",max_bitrate); - printf(" avg_bitrate = %d\n",avg_bitrate); - printf(" max_packet_size = %d\n",max_packet_size); - printf(" avg_packet_size = %d\n",avg_packet_size); - printf(" packet_count = %d\n",packet_count); - printf(" duration = %d\n",duration); - printf(" preroll = %d\n",preroll); - printf(" index_offset = %d\n",index_offset); - printf(" data_offset = %d\n",rmctx->data_offset); - printf(" num_streams = %d\n",num_streams); - printf(" flags=0x%04x\n",flags); - break; - - case FOURCC('C','O','N','T'): - /* Four strings - Title, Author, Copyright, Comment */ - skipped += read_str(fd,title); - skipped += read_str(fd,author); - skipped += read_str(fd,copyright); - skipped += read_str(fd,comment); - - printf(" title=\"%s\"\n",title); - printf(" author=\"%s\"\n",author); - printf(" copyright=\"%s\"\n",copyright); - printf(" comment=\"%s\"\n",comment); - break; - - case FOURCC('M','D','P','R'): /* Media properties */ - read_uint16be(fd,&stream_id); - skipped += 2; - read_uint32be(fd,&max_bitrate); - skipped += 4; - read_uint32be(fd,&avg_bitrate); - skipped += 4; - read_uint32be(fd,&max_packet_size); - skipped += 4; - read_uint32be(fd,&avg_packet_size); - skipped += 4; - read_uint32be(fd,&start_time); - skipped += 4; - read_uint32be(fd,&preroll); - skipped += 4; - read_uint32be(fd,&duration); - skipped += 4; - skipped += read_str(fd,desc); - skipped += read_str(fd,mimetype); - read_uint32be(fd,&codec_data_size); - skipped += 4; - //From ffmpeg: codec_pos = url_ftell(pb); - read_uint32be(fd,&v); - skipped += 4; - - printf(" stream_id = 0x%04x\n",stream_id); - printf(" max_bitrate = %d\n",max_bitrate); - printf(" avg_bitrate = %d\n",avg_bitrate); - printf(" max_packet_size = %d\n",max_packet_size); - printf(" avg_packet_size = %d\n",avg_packet_size); - printf(" start_time = %d\n",start_time); - printf(" preroll = %d\n",preroll); - printf(" duration = %d\n",duration); - printf(" desc=\"%s\"\n",desc); - printf(" mimetype=\"%s\"\n",mimetype); - printf(" codec_data_size = %d\n",codec_data_size); - printf(" v=\"%s\"\n", fourcc2str(v)); - - if (v == FOURCC('.','r','a',0xfd)) - { - skipped += real_read_audio_stream_info(fd, rmctx); - } - - break; - - case FOURCC('D','A','T','A'): - - read_uint32be(fd,&rmctx->nb_packets); - skipped += 4; - read_uint32be(fd,&next_data_off); - skipped += 4; - if (!rmctx->nb_packets && (rmctx->flags & 4)) - rmctx->nb_packets = 3600 * 25; - - /*** - * nb_packets correction : - * in some samples, number of packets may not exactly form - * an integer number of scrambling units. This is corrected - * by constructing a partially filled unit out of the few - * remaining samples at the end of decoding. - ***/ - if(rmctx->nb_packets % rmctx->sub_packet_h) - rmctx->nb_packets += rmctx->sub_packet_h - (rmctx->nb_packets % rmctx->sub_packet_h); - - printf(" data_nb_packets = %d\n",rmctx->nb_packets); - printf(" next DATA offset = %d\n",next_data_off); - header_end = 1; - break; - } - if(header_end) break; - curpos = lseek(fd, obj.size - skipped, SEEK_CUR); - res = real_read_object_header(fd, &obj); - } - - - return 0; -} - -void rm_get_packet(int fd,RMContext *rmctx, RMPacket *pkt) -{ - uint8_t unknown,packet_group; - uint16_t x, place; - uint16_t sps = rmctx->sub_packet_size; - uint16_t h = rmctx->sub_packet_h; - uint16_t y = rmctx->sub_packet_cnt; - uint16_t w = rmctx->audio_framesize; - do - { - y = rmctx->sub_packet_cnt; - read_uint16be(fd,&pkt->version); - read_uint16be(fd,&pkt->length); - read_uint16be(fd,&pkt->stream_number); - read_uint32be(fd,&pkt->timestamp); - DEBUGF(" version = %d\n" - " length = %d\n" - " stream = %d\n" - " timestmp= %d\n",pkt->version,pkt->length,pkt->stream_number,pkt->timestamp); - - //getchar(); - if(pkt->version == 0) - { - read_uint8(fd,&packet_group); - read_uint8(fd,&pkt->flags); - } - if(pkt->version == 1) - read_uint8(fd,&unknown); - - if (pkt->flags & 2) /* keyframe */ - y = rmctx->sub_packet_cnt = 0; - if (!y) /* if keyframe update playback elapsed time */ - rmctx->audiotimestamp = pkt->timestamp; - - for(x = 0 ; x < w/sps; x++) - { - place = sps*(h*x+((h+1)/2)*(y&1)+(y>>1)); - read(fd,pkt->data+place, sps); - //DEBUGF("place = %d data[place] = %d\n",place,pkt->data[place]); - } - rmctx->audio_pkt_cnt++; - }while(++(rmctx->sub_packet_cnt) < h); - - //return pkt->data; -} - -/** - * Another version of rm_get_packet which reads from a memory buffer - * instead of readind from a file descriptor. - **/ -void rm_get_packet_membuf(uint8_t **filebuf,RMContext *rmctx, RMPacket *pkt) -{ - uint8_t unknown; - uint16_t x, place; - uint16_t sps = rmctx->sub_packet_size; - uint16_t h = rmctx->sub_packet_h; - uint16_t y = rmctx->sub_packet_cnt; - uint16_t w = rmctx->audio_framesize; - do - { - y = rmctx->sub_packet_cnt; - pkt->version = get_uint16be(*filebuf); - pkt->length = get_uint16be(*filebuf+2); - pkt->stream_number = get_uint16be(*filebuf+4); - pkt->timestamp = get_uint32be(*filebuf+6); - DEBUGF(" version = %d\n" - " length = %d\n" - " stream = %d\n" - " timestamp= %d\n",pkt->version,pkt->length,pkt->stream_number,pkt->timestamp); - - unknown = get_uint8(*filebuf+10); - pkt->flags = get_uint8(*filebuf+11); - - if(pkt->version == 1) - unknown = get_uint8(*filebuf+10); - - if (pkt->flags & 2) /* keyframe */ - y = rmctx->sub_packet_cnt = 0; - if (!y) /* if keyframe update playback elapsed time */ - rmctx->audiotimestamp = pkt->timestamp; - - advance_buffer(filebuf,12); - - for(x = 0 ; x < w/sps; x++) - { - place = sps*(h*x+((h+1)/2)*(y&1)+(y>>1)); - pkt->frames[place/sps] = *filebuf; - advance_buffer(filebuf,sps); - } - rmctx->audio_pkt_cnt++; - }while(++(rmctx->sub_packet_cnt) < h); -} - -#ifdef DEBUG -void dump_rm_context(RMContext *rmctx) -{ - DEBUGF("block_align = %d\n", rmctx->block_align); - DEBUGF("nb_channels = %d\n", rmctx->nb_channels); - DEBUGF("sample_rate = %d\n", rmctx->sample_rate); - DEBUGF("bit_rate = %d\n", rmctx->bit_rate ); -} -#endif diff --git a/apps/codecs/libcook/rm.h b/apps/codecs/libcook/rm.h deleted file mode 100644 index bdd03f3..0000000 --- a/apps/codecs/libcook/rm.h +++ /dev/null @@ -1,83 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2009 Mohamed Tarek - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#ifndef _RM_H -#define _RM_H - -#include <stdio.h> -#include <stdint.h> - -typedef struct rm_packet -{ - uint8_t data[30000]; /* Reordered data. No malloc, hence the size */ - uint8_t *frames[100]; /* Pointers to ordered audio frames in buffer */ - uint16_t version; - uint16_t length; - uint32_t timestamp; - uint16_t stream_number; - uint8_t flags; -}RMPacket; - -typedef struct rm_context -{ - /* Demux Context */ - int old_format; - int current_stream; - int remaining_len; - int audio_stream_num; /*< Stream number for audio packets*/ - int audio_pkt_cnt; /* Output packet counter*/ - - /* Stream Variables */ - uint32_t data_offset; - uint32_t audiotimestamp; /* Audio packet timestamp*/ - uint16_t sub_packet_cnt; /* Subpacket counter, used while reading */ - uint16_t sub_packet_size, sub_packet_h, coded_framesize; /* Descrambling parameters from container */ - uint16_t audio_framesize; /* Audio frame size from container */ - uint16_t sub_packet_lengths[16]; /* Length of each subpacket */ - - /* Codec Context */ - uint16_t block_align; - uint32_t nb_packets; - int frame_number; - uint32_t extradata_size; - uint16_t sample_rate; - uint16_t nb_channels; - uint32_t bit_rate; - uint16_t flags; - - /*cook extradata*/ - uint32_t cook_version; - uint16_t samples_pf_pc; /* samples per frame per channel */ - uint16_t nb_subbands; /* number of subbands in the frequency domain */ - /* extra 8 bytes for stereo data */ - uint32_t unused; - uint16_t js_subband_start; /* joint stereo subband start */ - uint16_t js_vlc_bits; - -} RMContext; - -int open_wav(char* filename); -void close_wav(int fd, RMContext *rmctx); -int real_parse_header(int fd, RMContext *rmctx); -void rm_get_packet(int fd,RMContext *rmctx, RMPacket *pkt); -void rm_get_packet_membuf(uint8_t **filebuf,RMContext *rmctx, RMPacket *pkt); -off_t filesize(int fd); -void advance_buffer(uint8_t **buf, int val); -#endif |