libeplayer3: change extradata handling

This commit is contained in:
martii
2014-04-05 11:05:37 +02:00
parent f217be304a
commit 0895d29e2a
13 changed files with 50 additions and 279 deletions

View File

@@ -54,14 +54,10 @@ typedef struct Track_s {
/* stream from ffmpeg */
AVStream *stream;
/* codec extra data (header or some other stuff) */
uint8_t *extraData;
int extraSize;
#if 0
uint8_t *aacbuf;
unsigned int aacbuflen;
int have_aacheader;
#endif
// int uNoOfChannels;
// int uSampleRate;
// int uBitsPerSample;
// int bLittleEndian;
/* If player2 or the elf do not support decoding of audio codec set this.
* AVCodec is than used for softdecoding and stream will be injected as PCM */

View File

@@ -38,8 +38,10 @@ typedef struct {
uint8_t *data;
unsigned int len;
uint8_t *extradata;
unsigned int extralen;
int uNoOfChannels;
int uSampleRate;
int uBitsPerSample;
int bLittleEndian;
uint64_t pts;

View File

@@ -1,29 +0,0 @@
/*
* pcm helper
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef pcm_h_
#define pcm_h_
typedef struct pcmPrivateData_s {
int uNoOfChannels;
int uSampleRate;
int uBitsPerSample;
int bLittleEndian;
} pcmPrivateData_t;
#endif

View File

@@ -17,8 +17,10 @@ typedef struct {
uint8_t *data;
unsigned int len;
uint64_t Pts;
uint8_t *private_data;
unsigned int private_size;
int uNoOfChannels;
int uSampleRate;
int uBitsPerSample;
int bLittleEndian;
unsigned int FrameRate;
unsigned int FrameScale;
unsigned int Width;
@@ -51,9 +53,9 @@ extern Writer_t WriterAudioMP3;
extern Writer_t WriterAudioMPEGL3;
extern Writer_t WriterAudioAC3;
extern Writer_t WriterAudioEAC3;
extern Writer_t WriterAudioAAC;
//extern Writer_t WriterAudioAAC;
extern Writer_t WriterAudioDTS;
extern Writer_t WriterAudioWMA;
//extern Writer_t WriterAudioWMA;
extern Writer_t WriterAudioFLAC;
extern Writer_t WriterAudioVORBIS;