From 6f4294219e2ec8f0190a84020aa67dfe969ebb66 Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Sat, 18 Jul 2009 00:29:19 +0000 Subject: Generic codec-extradata parsing, in preparation for addition of AAC/RM. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21941 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/librm/rm.c | 31 ++++++++----------------------- apps/codecs/librm/rm.h | 16 ++++++---------- 2 files changed, 14 insertions(+), 33 deletions(-) (limited to 'apps/codecs/librm') diff --git a/apps/codecs/librm/rm.c b/apps/codecs/librm/rm.c index bfad7e8b36..c9c40986ba 100644 --- a/apps/codecs/librm/rm.c +++ b/apps/codecs/librm/rm.c @@ -95,27 +95,14 @@ static int read_uint32be(int fd, uint32_t* buf) } - -static 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' */ -} - static void print_cook_extradata(RMContext *rmctx) { - DEBUGF(" cook_version = 0x%08x\n", rmctx->cook_version); - DEBUGF(" samples_per_frame_per_channel = %d\n", rmctx->samples_pf_pc); - DEBUGF(" number_of_subbands_in_freq_domain = %d\n", rmctx->nb_subbands); - if(rmctx->extradata_size == 16) { - DEBUGF(" joint_stereo_subband_start = %d\n",rmctx->js_subband_start); - DEBUGF(" joint_stereo_vlc_bits = %d\n", rmctx->js_vlc_bits); + DEBUGF(" cook_version = 0x%08x\n", get_uint32be(rmctx->codec_extradata)); + DEBUGF(" samples_per_frame_per_channel = %d\n", get_uint16be(&rmctx->codec_extradata[4])); + DEBUGF(" number_of_subbands_in_freq_domain = %d\n", get_uint16be(&rmctx->codec_extradata[6])); + if(rmctx->extradata_size == 16) { + DEBUGF(" joint_stereo_subband_start = %d\n",get_uint16be(&rmctx->codec_extradata[12])); + DEBUGF(" joint_stereo_vlc_bits = %d\n", get_uint16be(&rmctx->codec_extradata[14])); } } @@ -250,10 +237,8 @@ static int real_read_audio_stream_info(int fd, RMContext *rmctx) read_uint32be(fd, &rmctx->extradata_size); skipped += 4; - if(!strncmp(fourcc2str(fourcc),"cook",4)){ - skipped += read_cook_extradata(fd, rmctx); - rmctx->codec_type = cook; - } + read(fd, rmctx->codec_extradata, rmctx->extradata_size); + skipped += rmctx->extradata_size; DEBUGF(" flavor = %d\n",flavor); diff --git a/apps/codecs/librm/rm.h b/apps/codecs/librm/rm.h index a0c386e824..ee72c1fc04 100644 --- a/apps/codecs/librm/rm.h +++ b/apps/codecs/librm/rm.h @@ -24,7 +24,9 @@ #include #include -enum codecs{cook}; +#define MAX_EXTRADATA_SIZE 16 + +enum codecs{cook, aac}; typedef struct rm_packet { uint8_t *frames[100]; /* Pointers to ordered audio frames in buffer */ @@ -62,20 +64,14 @@ typedef struct rm_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 joint-stereo data */ - uint32_t unused; - uint16_t js_subband_start; /* joint stereo subband start */ - uint16_t js_vlc_bits; + /*codec extradata*/ + uint32_t extradata_size; + uint8_t codec_extradata[MAX_EXTRADATA_SIZE]; } RMContext; -- cgit v1.2.3