Gentoo Attachment #50096 for bug #61528

View | Details | Raw Unified
Collapse All | Expand All

(-) faad2/include/faad.h (-15 / +15 lines)

Lines 114-120	Link Here

    /* Audio Specific Info */

    /* Audio Specific Info */

    unsigned char objectTypeIndex;

    unsigned char objectTypeIndex;

    unsigned char samplingFrequencyIndex;

    unsigned char samplingFrequencyIndex;

    unsigned long samplingFrequency;

    unsigned int samplingFrequency;

    unsigned char channelsConfiguration;

    unsigned char channelsConfiguration;

    /* GA Specific Info */

    /* GA Specific Info */

Lines 134-140	Link Here

typedef struct faacDecConfiguration

typedef struct faacDecConfiguration

    unsigned char defObjectType;

    unsigned char defObjectType;

    unsigned long defSampleRate;

    unsigned int defSampleRate;

    unsigned char outputFormat;

    unsigned char outputFormat;

    unsigned char downMatrix;

    unsigned char downMatrix;

    unsigned char useOldADTSFormat;

    unsigned char useOldADTSFormat;

Lines 143-153	Link Here

typedef struct faacDecFrameInfo

typedef struct faacDecFrameInfo

    unsigned long bytesconsumed;

    unsigned int bytesconsumed;

    unsigned long samples;

    unsigned int samples;

    unsigned char channels;

    unsigned char channels;

    unsigned char error;

    unsigned char error;

    unsigned long samplerate;

    unsigned int samplerate;

    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */

    /* SBR: 0: off, 1: on; upsample, 2: on; downsampled, 3: off; upsampled */

    unsigned char sbr;

    unsigned char sbr;

Lines 168-174	Link Here

char* FAADAPI faacDecGetErrorMessage(unsigned char errcode);

char* FAADAPI faacDecGetErrorMessage(unsigned char errcode);

unsigned long FAADAPI faacDecGetCapabilities(void);

unsigned int FAADAPI faacDecGetCapabilities(void);

faacDecHandle FAADAPI faacDecOpen(void);

faacDecHandle FAADAPI faacDecOpen(void);

Lines 178-209	Link Here

                                    faacDecConfigurationPtr config);

                                    faacDecConfigurationPtr config);

/* Init the library based on info from the AAC file (ADTS/ADIF) */

/* Init the library based on info from the AAC file (ADTS/ADIF) */

long FAADAPI faacDecInit(faacDecHandle hDecoder,

int FAADAPI faacDecInit(faacDecHandle hDecoder,

                        unsigned char *buffer,

                        unsigned char *buffer,

                        unsigned long buffer_size,

                        unsigned int buffer_size,

                        unsigned long *samplerate,

                        unsigned int *samplerate,

                        unsigned char *channels);

                        unsigned char *channels);

/* Init the library using a DecoderSpecificInfo */

/* Init the library using a DecoderSpecificInfo */

char FAADAPI faacDecInit2(faacDecHandle hDecoder, unsigned char *pBuffer,

char FAADAPI faacDecInit2(faacDecHandle hDecoder, unsigned char *pBuffer,

                         unsigned long SizeOfDecoderSpecificInfo,

                         unsigned int SizeOfDecoderSpecificInfo,

                         unsigned long *samplerate, unsigned char *channels);

                         unsigned int *samplerate, unsigned char *channels);

/* Init the library for DRM */

/* Init the library for DRM */

char FAADAPI faacDecInitDRM(faacDecHandle hDecoder, unsigned long samplerate,

char FAADAPI faacDecInitDRM(faacDecHandle hDecoder, unsigned int samplerate,

                            unsigned char channels);

                            unsigned char channels);

void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, long frame);

void FAADAPI faacDecPostSeekReset(faacDecHandle hDecoder, int frame);

void FAADAPI faacDecClose(faacDecHandle hDecoder);

void FAADAPI faacDecClose(faacDecHandle hDecoder);

void* FAADAPI faacDecDecode(faacDecHandle hDecoder,

void* FAADAPI faacDecDecode(faacDecHandle hDecoder,

                            faacDecFrameInfo *hInfo,

                            faacDecFrameInfo *hInfo,

                            unsigned char *buffer,

                            unsigned char *buffer,

                            unsigned long buffer_size);

                            unsigned int buffer_size);

char FAADAPI AudioSpecificConfig(unsigned char *pBuffer,

char FAADAPI AudioSpecificConfig(unsigned char *pBuffer,

                                 unsigned long buffer_size,

                                 unsigned int buffer_size,

                                 mp4AudioSpecificConfig *mp4ASC);

                                 mp4AudioSpecificConfig *mp4ASC);

#ifdef _WIN32

#ifdef _WIN32

(-) faad2/libfaad/common.h (+15 lines)

Lines 193-204	Link Here

# include <strings.h>

# include <strings.h>

#endif

#endif

#if HAVE_INTTYPES_H

#if HAVE_INTTYPES_H

#warning "Using HAVE_INTTYPES_H"

# include <inttypes.h>

# include <inttypes.h>

#else

#else

# if HAVE_STDINT_H

# if HAVE_STDINT_H

#warning "Using HAVE_STDINT_H"

#  include <stdint.h>

#  include <stdint.h>

# else

# else

/* we need these... */

/* we need these... */

#ifdef __x86_64__

#warning "Using AMD64 definitions"

typedef unsigned long uint64_t;

typedef unsigned int  uint32_t;

typedef unsigned short uint16_t;

typedef unsigned char uint8_t;

typedef long int64_t;

typedef int int32_t;

typedef short int16_t;

typedef char int8_t;

#else

#warning "Using 32-bit definitions"

typedef unsigned long long uint64_t;

typedef unsigned long long uint64_t;

typedef unsigned long uint32_t;

typedef unsigned long uint32_t;

typedef unsigned short uint16_t;

typedef unsigned short uint16_t;

Lines 207-212	Link Here

typedef long int32_t;

typedef long int32_t;

typedef short int16_t;

typedef short int16_t;

typedef char int8_t;

typedef char int8_t;

#endif

# endif

# endif

#endif

#endif

#if HAVE_UNISTD_H

#if HAVE_UNISTD_H

(-) faad2/plugins/mpeg4ip/aa_file.cpp (-1 / +3 lines)

Lines 22-27	Link Here

 * aa_file.cpp - create media structure for aac files

 * aa_file.cpp - create media structure for aac files

*/

*/

#define __STDC_LIMIT_MACROS

#include <stdint.h>

#include "faad2.h"

#include "faad2.h"

codec_data_t *aac_file_check (lib_message_func_t message,

codec_data_t *aac_file_check (lib_message_func_t message,

                  const char *name,

                  const char *name,

Lines 56-62	Link Here

                 aac->m_buffer_size_max,

                 aac->m_buffer_size_max,

                 aac->m_ifile);

                 aac->m_ifile);

  unsigned long freq;

  unsigned int freq;

  unsigned char chans;

  unsigned char chans;

  faacDecInit(aac->m_info, (unsigned char *)aac->m_buffer,

  faacDecInit(aac->m_info, (unsigned char *)aac->m_buffer,

(-) faad2/plugins/mpeg4ip/faad2.cpp (-5 / +12 lines)

Lines 18-23	Link Here

**

**

** $Id: faad2.cpp,v 1.2 2004/01/05 14:05:12 menno Exp $

** $Id: faad2.cpp,v 1.2 2004/01/05 14:05:12 menno Exp $

**/

**/

#define __STDC_LIMIT_MACROS

#include <stdint.h>

#ifndef UINT32_MAX

#error "stdint.h didn't define UINT32_MAX, wtf?"

#endif

#include "faad2.h"

#include "faad2.h"

#include <mpeg4_audio_config.h>

#include <mpeg4_audio_config.h>

#include <mpeg4_sdp.h>

#include <mpeg4_sdp.h>

Lines 76-82	Link Here

  aac->m_info = faacDecOpen();

  aac->m_info = faacDecOpen();

  unsigned long srate;

  unsigned int srate;

  unsigned char chan;

  unsigned char chan;

  if ((userdata == NULL && fmtp == NULL) ||

  if ((userdata == NULL && fmtp == NULL) ||

      (faacDecInit2(aac->m_info,

      (faacDecInit2(aac->m_info,

Lines 156-162	Link Here

               void *userdata)

               void *userdata)

  aac_codec_t *aac = (aac_codec_t *)ptr;

  aac_codec_t *aac = (aac_codec_t *)ptr;

  unsigned long bytes_consummed;

  unsigned int bytes_consummed;

  int bits = -1;

  int bits = -1;

  //  struct timezone tz;

  //  struct timezone tz;

Lines 188-194	Link Here

     * If not initialized, do so.

     * If not initialized, do so.

*/

*/

    abort();

    abort();

    unsigned long freq;

    unsigned int freq;

    unsigned char chans;

    unsigned char chans;

    faacDecInit(aac->m_info,

    faacDecInit(aac->m_info,

Lines 202-208	Link Here

  uint8_t *buff;

  uint8_t *buff;

  unsigned long samples;

  unsigned int samples;

  bytes_consummed = buflen;

  bytes_consummed = buflen;

  //aa_message(LOG_DEBUG, aaclib, "decoding %d bits", buflen * 8);

  //aa_message(LOG_DEBUG, aaclib, "decoding %d bits", buflen * 8);

  faacDecFrameInfo frame_info;

  faacDecFrameInfo frame_info;

Lines 237-243	Link Here

      aac->m_vft->audio_configure(aac->m_ifptr,

      aac->m_vft->audio_configure(aac->m_ifptr,

                  aac->m_freq,

                  aac->m_freq,

                  aac->m_chans,

                  aac->m_chans,

                  AUDIO_S16SYS,

                  AUDIO_FMT_S16,

                  aac->m_output_frame_size);

                  aac->m_output_frame_size);

      uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);

      uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);

      aac->m_audio_inited = 1;

      aac->m_audio_inited = 1;

(-) faad2/plugins/xmms/src/libmp4.c (-8 / +12 lines)

Lines 22-27	Link Here

#define MP4_ABOUT	"Written by ciberfred"

#define MP4_ABOUT	"Written by ciberfred"

#define BUFFER_SIZE	FAAD_MIN_STREAMSIZE*64

#define BUFFER_SIZE	FAAD_MIN_STREAMSIZE*64

void getMP4info(char* file);

int  getAACTrack(MP4FileHandle file);

static void	mp4_init(void);

static void	mp4_init(void);

static void	mp4_about(void);

static void	mp4_about(void);

static void	mp4_play(char *);

static void	mp4_play(char *);

Lines 112-122	Link Here

    gchar*	extention;

    gchar*	extention;

    extention = strrchr(filename, '.');

    extention = strrchr(filename, '.');

    if (extention &&

    if (extention &&(

	!strcasecmp(extention, ".mp4") ||	// official extention

	!strcasecmp(extention, ".mp4") ||	// official extention

	!strcasecmp(extention, ".m4a") ||	// Apple mp4 extention

	!strcasecmp(extention, ".m4a") ||	// Apple mp4 extention

	!strcasecmp(extention, ".aac")		// old MPEG2/4-AAC extention

	!strcasecmp(extention, ".aac")		// old MPEG2/4-AAC extention

){

)){

      return (1);

      return (1);

Lines 202-212	Link Here

      faacDecHandle	decoder;

      faacDecHandle	decoder;

      unsigned char	*buffer	= NULL;

      unsigned char	*buffer	= NULL;

      guint		bufferSize = 0;

      guint		bufferSize = 0;

      gulong		samplerate;

      guint		samplerate;

      guchar		channels;

      guchar		channels;

      guint		avgBitrate;

      guint		avgBitrate;

      MP4Duration	duration;

      MP4Duration	duration;

      gulong		msDuration;

      guint		msDuration;

      MP4SampleId	numSamples;

      MP4SampleId	numSamples;

      MP4SampleId	sampleID = 1;

      MP4SampleId	sampleID = 1;

Lines 329-338	Link Here

    FILE		*file = NULL;

    FILE		*file = NULL;

    faacDecHandle	decoder = 0;

    faacDecHandle	decoder = 0;

    guchar		*buffer = 0;

    guchar		*buffer = 0;

    gulong		bufferconsumed = 0;

    guint		bufferconsumed = 0;

    gulong		samplerate = 0;

    guint		samplerate = 0;

    guchar		channels;

    guchar		channels;

    gulong		buffervalid = 0;

    guint		buffervalid = 0;

    TitleInput*		input;

    TitleInput*		input;

    gchar		*temp = g_strdup(args);

    gchar		*temp = g_strdup(args);

    gchar		*ext  = strrchr(temp, '.');

    gchar		*ext  = strrchr(temp, '.');

Lines 424-430	Link Here

    while(bPlaying && buffervalid > 0){

    while(bPlaying && buffervalid > 0){

      faacDecFrameInfo	finfo;

      faacDecFrameInfo	finfo;

      unsigned long	samplesdecoded;

      unsigned int	samplesdecoded;

      char*		sample_buffer = NULL;

      char*		sample_buffer = NULL;

/*

/*

	if(bSeek && seekPosition!=-1){

	if(bSeek && seekPosition!=-1){

Attachment #50096: amd64 patch for faad2's inconsistent headers and misc nastiness for bug #61528