diff options
Diffstat (limited to 'apps/codecs/librm')
-rw-r--r-- | apps/codecs/librm/rm.c | 4 | ||||
-rw-r--r-- | apps/codecs/librm/rm.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/librm/rm.c b/apps/codecs/librm/rm.c index a48fb51cc6..c802a0c5a9 100644 --- a/apps/codecs/librm/rm.c +++ b/apps/codecs/librm/rm.c | |||
@@ -529,7 +529,7 @@ int rm_get_packet(uint8_t **src,RMContext *rmctx, RMPacket *pkt) | |||
529 | 529 | ||
530 | advance_buffer(src,12); | 530 | advance_buffer(src,12); |
531 | consumed += 12; | 531 | consumed += 12; |
532 | if (rmctx->codec_type == cook) { | 532 | if (rmctx->codec_type == CODEC_COOK) { |
533 | for(x = 0 ; x < w/sps; x++) | 533 | for(x = 0 ; x < w/sps; x++) |
534 | { | 534 | { |
535 | place = sps*(h*x+((h+1)/2)*(y&1)+(y>>1)); | 535 | place = sps*(h*x+((h+1)/2)*(y&1)+(y>>1)); |
@@ -538,7 +538,7 @@ int rm_get_packet(uint8_t **src,RMContext *rmctx, RMPacket *pkt) | |||
538 | consumed += sps; | 538 | consumed += sps; |
539 | } | 539 | } |
540 | } | 540 | } |
541 | else if (rmctx->codec_type == aac) { | 541 | else if (rmctx->codec_type == CODEC_AAC) { |
542 | rmctx->sub_packet_cnt = (get_uint16be(*src) & 0xf0) >> 4; | 542 | rmctx->sub_packet_cnt = (get_uint16be(*src) & 0xf0) >> 4; |
543 | advance_buffer(src, 2); | 543 | advance_buffer(src, 2); |
544 | consumed += 2; | 544 | consumed += 2; |
diff --git a/apps/codecs/librm/rm.h b/apps/codecs/librm/rm.h index ee72c1fc04..cd59cffc55 100644 --- a/apps/codecs/librm/rm.h +++ b/apps/codecs/librm/rm.h | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #define MAX_EXTRADATA_SIZE 16 | 27 | #define MAX_EXTRADATA_SIZE 16 |
28 | 28 | ||
29 | enum codecs{cook, aac}; | 29 | enum codecs{CODEC_COOK, CODEC_AAC}; |
30 | typedef struct rm_packet | 30 | typedef struct rm_packet |
31 | { | 31 | { |
32 | uint8_t *frames[100]; /* Pointers to ordered audio frames in buffer */ | 32 | uint8_t *frames[100]; /* Pointers to ordered audio frames in buffer */ |