Mercurial > mplayer.hg
comparison libfaad2/structs.h @ 18141:59b6fa5b4201
Update to faad2 cvs 20040915+MPlayer fixes
Patch by me and Emanuele Giaquinta
author | rtognimp |
---|---|
date | Tue, 18 Apr 2006 19:39:34 +0000 |
parents | b4378a6f87a6 |
children | 69a4d646e55d |
comparison
equal
deleted
inserted
replaced
18140:e371c7e18402 | 18141:59b6fa5b4201 |
---|---|
20 ** forbidden. | 20 ** forbidden. |
21 ** | 21 ** |
22 ** Commercial non-GPL licensing of this software is possible. | 22 ** Commercial non-GPL licensing of this software is possible. |
23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. | 23 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. |
24 ** | 24 ** |
25 ** $Id: structs.h,v 1.39 2004/05/17 10:18:03 menno Exp $ | 25 ** $Id: structs.h,v 1.42 2004/09/08 09:43:11 gcp Exp $ |
26 **/ | 26 **/ |
27 | 27 |
28 #ifndef __STRUCTS_H__ | 28 #ifndef __STRUCTS_H__ |
29 #define __STRUCTS_H__ | 29 #define __STRUCTS_H__ |
30 | 30 |
74 mdct_info *mdct1024; | 74 mdct_info *mdct1024; |
75 #endif | 75 #endif |
76 mdct_info *mdct2048; | 76 mdct_info *mdct2048; |
77 #ifdef PROFILE | 77 #ifdef PROFILE |
78 int64_t cycles; | 78 int64_t cycles; |
79 #endif | |
80 #ifdef USE_SSE | |
81 void (*if_func)(void *a, uint8_t b, uint8_t c, uint8_t d, real_t *e, real_t *f, uint8_t g, uint16_t h); | |
82 #endif | 79 #endif |
83 } fb_info; | 80 } fb_info; |
84 | 81 |
85 typedef struct | 82 typedef struct |
86 { | 83 { |
364 /*uint8_t*/ unsigned char num_front_channels; | 361 /*uint8_t*/ unsigned char num_front_channels; |
365 /*uint8_t*/ unsigned char num_side_channels; | 362 /*uint8_t*/ unsigned char num_side_channels; |
366 /*uint8_t*/ unsigned char num_back_channels; | 363 /*uint8_t*/ unsigned char num_back_channels; |
367 /*uint8_t*/ unsigned char num_lfe_channels; | 364 /*uint8_t*/ unsigned char num_lfe_channels; |
368 /*uint8_t*/ unsigned char channel_position[MAX_CHANNELS]; | 365 /*uint8_t*/ unsigned char channel_position[MAX_CHANNELS]; |
366 | |
367 /* PS: 0: off, 1: on */ | |
368 /*uint8_t*/ unsigned char ps; | |
369 } NeAACDecFrameInfo; | 369 } NeAACDecFrameInfo; |
370 | 370 |
371 typedef struct | 371 typedef struct |
372 { | 372 { |
373 uint8_t adts_header_present; | 373 uint8_t adts_header_present; |
429 | 429 |
430 sbr_info *sbr[MAX_SYNTAX_ELEMENTS]; | 430 sbr_info *sbr[MAX_SYNTAX_ELEMENTS]; |
431 #endif | 431 #endif |
432 #if (defined(PS_DEC) || defined(DRM_PS)) | 432 #if (defined(PS_DEC) || defined(DRM_PS)) |
433 uint8_t ps_used[MAX_SYNTAX_ELEMENTS]; | 433 uint8_t ps_used[MAX_SYNTAX_ELEMENTS]; |
434 uint8_t ps_used_global; | |
434 #endif | 435 #endif |
435 | 436 |
436 #ifdef SSR_DEC | 437 #ifdef SSR_DEC |
437 real_t *ssr_overlap[MAX_CHANNELS]; | 438 real_t *ssr_overlap[MAX_CHANNELS]; |
438 real_t *prev_fmd[MAX_CHANNELS]; | 439 real_t *prev_fmd[MAX_CHANNELS]; |
452 uint8_t element_id[MAX_CHANNELS]; | 453 uint8_t element_id[MAX_CHANNELS]; |
453 uint8_t internal_channel[MAX_CHANNELS]; | 454 uint8_t internal_channel[MAX_CHANNELS]; |
454 | 455 |
455 /* Configuration data */ | 456 /* Configuration data */ |
456 NeAACDecConfiguration config; | 457 NeAACDecConfiguration config; |
457 | |
458 #ifdef USE_SSE | |
459 void (*apply_sf_func)(void *a, void *b, void *c, uint16_t d); | |
460 #endif | |
461 | 458 |
462 #ifdef PROFILE | 459 #ifdef PROFILE |
463 int64_t cycles; | 460 int64_t cycles; |
464 int64_t spectral_cycles; | 461 int64_t spectral_cycles; |
465 int64_t output_cycles; | 462 int64_t output_cycles; |