comparison dec_audio.c @ 5206:2ca5a9bfaa98

allow sh_audio struct to be initialized by demuxer, add parsing of mp4 esds header to mov demuxer, init faad from info from mov header

5205:47259a4f3216

}

int init_audio(sh_audio_t *sh_audio){
int driver=sh_audio->codec->driver;

sh_audio->samplesize=2;
#ifdef WORDS_BIGENDIAN
sh_audio->sample_format=AFMT_S16_BE;
#else
sh_audio->sample_format=AFMT_S16_LE;
#endif
sh_audio->samplerate=0;
//sh_audio->pcm_bswap=0;
sh_audio->o_bps=0;

sh_audio->a_buffer_size=0;
sh_audio->a_buffer=NULL;

sh_audio->a_in_buffer_len=0;

case AFM_AAC: {
  unsigned long faac_samplerate, faac_channels;
  faacDecConfigurationPtr faac_conf;
  faac_hdec = faacDecOpen();

#if 0
  /* Set the default object type and samplerate */
  /* This is useful for RAW AAC files */
  faac_conf = faacDecGetCurrentConfiguration(faac_hdec);
  if(sh_audio->samplerate)
    faac_conf->defSampleRate = sh_audio->samplerate;
  /* XXX: is outputFormat samplesize of compressed data or samplesize of
   * decoded data, maybe upsampled? Also, FAAD support FLOAT output,
   * how do we handle that (FAAD_FMT_FLOAT)? ::atmos
   */
  if(sh_audio->samplesize)
    switch(sh_audio->samplesize){
      case 1: // 8Bit
	mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: 8Bit samplesize not supported by FAAD, assuming 16Bit!\n");
      default:

	break;
      case 4: // 32Bit
	faac_conf->outputFormat = FAAD_FMT_32BIT;
	break;
    }
  faac_conf->defObjectType = LTP; // => MAIN, LC, SSR, LTP available.

  faacDecSetConfiguration(faac_hdec, faac_conf);
#endif

  if(faac_buffer == NULL)

  } else {
    mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", faac_bytesconsumed); // XXX: remove or move to debug!
    mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz  channels: %d\n", faac_samplerate, faac_channels);
    sh_audio->channels = faac_channels;
    sh_audio->samplerate = faac_samplerate;
    sh_audio->i_bps = 128*1000/8; // XXX: HACK!!! There's currently no way to get bitrate from libfaad2! ::atmos
  }  
	    
} break;		
#endif

5206:2ca5a9bfaa98

}

int init_audio(sh_audio_t *sh_audio){
int driver=sh_audio->codec->driver;

if(!sh_audio->samplesize)
  sh_audio->samplesize=2;
if(!sh_audio->sample_format)
#ifdef WORDS_BIGENDIAN
  sh_audio->sample_format=AFMT_S16_BE;
#else
  sh_audio->sample_format=AFMT_S16_LE;
#endif
//sh_audio->samplerate=0;
//sh_audio->pcm_bswap=0;
//sh_audio->o_bps=0;

sh_audio->a_buffer_size=0;
sh_audio->a_buffer=NULL;

sh_audio->a_in_buffer_len=0;

case AFM_AAC: {
  unsigned long faac_samplerate, faac_channels;
  faacDecConfigurationPtr faac_conf;
  faac_hdec = faacDecOpen();

#if 1
  /* Set the default object type and samplerate */
  /* This is useful for RAW AAC files */
  faac_conf = faacDecGetCurrentConfiguration(faac_hdec);
  if(sh_audio->samplerate)
    faac_conf->defSampleRate = sh_audio->samplerate;
   /* XXX: FAAD support FLOAT output, how do we handle
    * that (FAAD_FMT_FLOAT)? ::atmos
    */
  if(sh_audio->samplesize)
    switch(sh_audio->samplesize){
      case 1: // 8Bit
	mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: 8Bit samplesize not supported by FAAD, assuming 16Bit!\n");
      default:

	break;
      case 4: // 32Bit
	faac_conf->outputFormat = FAAD_FMT_32BIT;
	break;
    }
  //faac_conf->defObjectType = LTP; // => MAIN, LC, SSR, LTP available.

  faacDecSetConfiguration(faac_hdec, faac_conf);
#endif

  if(faac_buffer == NULL)

  } else {
    mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", faac_bytesconsumed); // XXX: remove or move to debug!
    mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz  channels: %d\n", faac_samplerate, faac_channels);
    sh_audio->channels = faac_channels;
    sh_audio->samplerate = faac_samplerate;
    if(!sh_audio->i_bps) {
      mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: compressed input bitrate missing, assuming 128kbit/s!\n");
      sh_audio->i_bps = 128*1000/8; // XXX: HACK!!! There's currently no way to get bitrate from libfaad2! ::atmos
    } else 
      mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: got %dkbit/s rate from MP4 header!\n",sh_audio->i_bps*8/1000);
  }  
	    
} break;		
#endif