armbox eplayer: remove writeReverseData (unused)

This commit is contained in:
max_10
2018-01-04 00:56:28 +01:00
committed by Thilo Graf
parent d2bb71dcab
commit e6c29f2545
33 changed files with 11 additions and 100 deletions

View File

@@ -39,7 +39,6 @@ typedef struct Writer_s
{ {
int (* reset)(); int (* reset)();
int (* writeData)(void *); int (* writeData)(void *);
int (* writeReverseData)(void *);
WriterCaps_t *caps; WriterCaps_t *caps;
} Writer_t; } Writer_t;

View File

@@ -333,7 +333,6 @@ struct Writer_s WriterAudioAAC =
{ {
&reset, &reset,
&writeDataADTS, &writeDataADTS,
NULL,
&caps &caps
}; };
@@ -351,7 +350,6 @@ struct Writer_s WriterAudioAACLATM =
{ {
&reset, &reset,
&writeDataLATM, &writeDataLATM,
NULL,
&caps_aac_latm &caps_aac_latm
}; };
@@ -369,6 +367,5 @@ struct Writer_s WriterAudioAACPLUS =
{ {
&reset, &reset,
&writeDataADTS, &writeDataADTS,
NULL,
&caps_aacplus &caps_aacplus
}; };

View File

@@ -147,7 +147,6 @@ struct Writer_s WriterAudioAC3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_ac3 &caps_ac3
}; };
@@ -165,6 +164,5 @@ struct Writer_s WriterAudioEAC3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_eac3 &caps_eac3
}; };

View File

@@ -169,6 +169,5 @@ struct Writer_s WriterAudioAMR =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_amr &caps_amr
}; };

View File

@@ -190,6 +190,5 @@ struct Writer_s WriterVideoDIVX3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&divix3_caps &divix3_caps
}; };

View File

@@ -173,6 +173,5 @@ struct Writer_s WriterAudioDTS =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };

View File

@@ -148,7 +148,6 @@ struct Writer_s WriterVideoH263 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_h263 &caps_h263
}; };
@@ -166,6 +165,5 @@ struct Writer_s WriterVideoFLV =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_flv &caps_flv
}; };

View File

@@ -413,11 +413,6 @@ static int writeData(void *_call)
return len; return len;
} }
static int writeReverseData(void *_call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
return 0;
}
/* ***************************** */ /* ***************************** */
/* Writer Definition */ /* Writer Definition */
/* ***************************** */ /* ***************************** */
@@ -436,6 +431,5 @@ struct Writer_s WriterVideoH264 =
{ {
&reset, &reset,
&writeData, &writeData,
&writeReverseData,
&caps &caps
}; };

View File

@@ -282,11 +282,6 @@ static int writeData(void *_call)
return len; return len;
} }
static int writeReverseData(void *_call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
return 0;
}
/* ***************************** */ /* ***************************** */
/* Writer Definition */ /* Writer Definition */
/* ***************************** */ /* ***************************** */
@@ -305,6 +300,5 @@ struct Writer_s WriterVideoH265 =
{ {
&reset, &reset,
&writeData, &writeData,
&writeReverseData,
&caps &caps
}; };

View File

@@ -261,6 +261,5 @@ struct Writer_s WriterAudioLPCM =
{ {
&reset, &reset,
&writeData, /* writeDataLPCM */ &writeData, /* writeDataLPCM */
NULL,
&caps_lpcm &caps_lpcm
}; };

View File

@@ -147,7 +147,6 @@ struct Writer_s WriterAudioMP3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_mp3 &caps_mp3
}; };
@@ -165,7 +164,6 @@ struct Writer_s WriterAudioMPEGL3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_mpegl3 &caps_mpegl3
}; };
@@ -183,6 +181,5 @@ struct Writer_s WriterAudioVORBIS =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_vorbis &caps_vorbis
}; };

View File

@@ -157,7 +157,6 @@ struct Writer_s WriterVideoMPEG2 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };
@@ -175,6 +174,5 @@ struct Writer_s WriterVideoMPEG1 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&mpg1_caps &mpg1_caps
}; };

View File

@@ -159,6 +159,5 @@ struct Writer_s WriterVideoMPEG4 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&mpeg4p2_caps &mpeg4p2_caps
}; };

View File

@@ -127,7 +127,7 @@ static int32_t writeData(void *_call)
return 0; return 0;
} }
static uint8_t PesHeader[PES_MAX_HEADER_SIZE + 22]; static uint8_t PesHeader[PES_MAX_HEADER_SIZE + 22];
pcmPrivateData_t *pcmPrivateData = (pcmPrivateData_t *)call->private_data; pcmPrivateData_t *pcmPrivateData = (pcmPrivateData_t *)call->private_data;
uint8_t *buffer = call->data; uint8_t *buffer = call->data;
uint32_t size = call->len; uint32_t size = call->len;
if (pcmPrivateData->bResampling || NULL == fixed_buffer) if (pcmPrivateData->bResampling || NULL == fixed_buffer)
@@ -147,7 +147,7 @@ static int32_t writeData(void *_call)
int32_t channels = (uint8_t) pcmPrivateData->channels; int32_t channels = (uint8_t) pcmPrivateData->channels;
int32_t block_align = 0; int32_t block_align = 0;
int32_t byterate = 0; int32_t byterate = 0;
uint32_t codecID = (uint32_t)pcmPrivateData->ffmpeg_codec_id; uint32_t codecID = (uint32_t)pcmPrivateData->ffmpeg_codec_id;
uint8_t dataPrecision = 0; uint8_t dataPrecision = 0;
uint8_t LE = 0; uint8_t LE = 0;
switch (codecID) switch (codecID)
@@ -288,7 +288,6 @@ struct Writer_s WriterAudioPCM =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_pcm &caps_pcm
}; };
@@ -306,6 +305,5 @@ struct Writer_s WriterAudioIPCM =
{ {
&reset, &reset,
&writeData, /* writeDataIPCM */ &writeData, /* writeDataIPCM */
NULL,
&caps_ipcm &caps_ipcm
}; };

View File

@@ -194,6 +194,5 @@ struct Writer_s WriterVideoVC1 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };

View File

@@ -167,7 +167,6 @@ struct Writer_s WriterVideoVP6 =
{ {
&reset, &reset,
&writeDataVP6, &writeDataVP6,
NULL,
&capsVP6 &capsVP6
}; };
@@ -185,7 +184,6 @@ struct Writer_s WriterVideoVP8 =
{ {
&reset, &reset,
&writeDataVP89, &writeDataVP89,
NULL,
&capsVP8 &capsVP8
}; };
@@ -203,7 +201,6 @@ struct Writer_s WriterVideoVP9 =
{ {
&reset, &reset,
&writeDataVP89, &writeDataVP89,
NULL,
&capsVP9 &capsVP9
}; };
@@ -221,6 +218,5 @@ struct Writer_s WriterVideoSPARK =
{ {
&reset, &reset,
&writeDataVP89, &writeDataVP89,
NULL,
&capsSPARK &capsSPARK
}; };

View File

@@ -161,7 +161,7 @@ static int writeData(void *_call)
} }
/* ***************************** */ /* ***************************** */
/* Writer Definition */ /* Writer Definition */
/* ***************************** */ /* ***************************** */
static WriterCaps_t capsWMAPRO = static WriterCaps_t capsWMAPRO =
@@ -178,7 +178,6 @@ struct Writer_s WriterAudioWMAPRO =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&capsWMAPRO &capsWMAPRO
}; };
@@ -196,6 +195,5 @@ struct Writer_s WriterAudioWMA =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&capsWMA &capsWMA
}; };

View File

@@ -20,7 +20,7 @@
*/ */
/* ***************************** */ /* ***************************** */
/* Includes */ /* Includes */
/* ***************************** */ /* ***************************** */
#include <stdio.h> #include <stdio.h>
@@ -50,7 +50,7 @@
#include "writer.h" #include "writer.h"
/* ***************************** */ /* ***************************** */
/* Makros/Constants */ /* Makros/Constants */
/* ***************************** */ /* ***************************** */
#define WMV_FRAME_START_CODE 0x0d #define WMV_FRAME_START_CODE 0x0d
@@ -79,7 +79,7 @@ static short debug_level = 10;
#endif #endif
/* ***************************** */ /* ***************************** */
/* Types */ /* Types */
/* ***************************** */ /* ***************************** */
static const uint8_t Vc1FrameStartCode[] = {0, 0, 1, WMV_FRAME_START_CODE}; static const uint8_t Vc1FrameStartCode[] = {0, 0, 1, WMV_FRAME_START_CODE};
@@ -201,6 +201,5 @@ struct Writer_s WriterVideoWMV =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };

View File

@@ -22,6 +22,7 @@
/* ***************************** */ /* ***************************** */
/* Includes */ /* Includes */
/* ***************************** */ /* ***************************** */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>

View File

@@ -330,7 +330,6 @@ struct Writer_s WriterAudioAAC =
{ {
&reset, &reset,
&writeDataADTS, &writeDataADTS,
NULL,
&caps &caps
}; };
@@ -348,7 +347,6 @@ struct Writer_s WriterAudioAACLATM =
{ {
&reset, &reset,
&writeDataLATM, &writeDataLATM,
NULL,
&caps_aac_latm &caps_aac_latm
}; };
@@ -366,6 +364,5 @@ struct Writer_s WriterAudioAACPLUS =
{ {
&reset, &reset,
&writeDataADTS, &writeDataADTS,
NULL,
&caps_aacplus &caps_aacplus
}; };

View File

@@ -142,7 +142,6 @@ struct Writer_s WriterAudioAC3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_ac3 &caps_ac3
}; };
@@ -160,6 +159,5 @@ struct Writer_s WriterAudioEAC3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_eac3 &caps_eac3
}; };

View File

@@ -187,7 +187,6 @@ struct Writer_s WriterVideoMPEG4 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&mpeg4p2_caps &mpeg4p2_caps
}; };
@@ -195,7 +194,6 @@ struct Writer_s WriterVideoMSCOMP =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&mpeg4p2_caps &mpeg4p2_caps
}; };
@@ -213,7 +211,6 @@ struct Writer_s WriterVideoFOURCC =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&fourcc_caps &fourcc_caps
}; };
@@ -231,6 +228,5 @@ struct Writer_s WriterVideoDIVX =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&divx_caps &divx_caps
}; };

View File

@@ -213,7 +213,6 @@ struct Writer_s WriterVideoMPEG4 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&mpeg4p2_caps &mpeg4p2_caps
}; };
@@ -221,7 +220,6 @@ struct Writer_s WriterVideoMSCOMP =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&mpeg4p2_caps &mpeg4p2_caps
}; };
@@ -239,7 +237,6 @@ struct Writer_s WriterVideoFOURCC =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&fourcc_caps &fourcc_caps
}; };
@@ -257,6 +254,5 @@ struct Writer_s WriterVideoDIVX =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&divx_caps &divx_caps
}; };

View File

@@ -171,6 +171,5 @@ struct Writer_s WriterAudioDTS =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };

View File

@@ -150,7 +150,6 @@ struct Writer_s WriterVideoH263 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_h263 &caps_h263
}; };
@@ -168,6 +167,5 @@ struct Writer_s WriterVideoFLV =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_flv &caps_flv
}; };

View File

@@ -105,6 +105,7 @@ static int avc3 = 0;
/* ***************************** */ /* ***************************** */
/* MISC Functions */ /* MISC Functions */
/* ***************************** */ /* ***************************** */
// Please see: https://bugzilla.mozilla.org/show_bug.cgi?id=1105771 // Please see: https://bugzilla.mozilla.org/show_bug.cgi?id=1105771
static int32_t UpdateExtraData(uint8_t **ppExtraData, uint32_t *pExtraDataSize, uint8_t *pData, uint32_t dataSize) static int32_t UpdateExtraData(uint8_t **ppExtraData, uint32_t *pExtraDataSize, uint8_t *pData, uint32_t dataSize)
{ {
@@ -434,28 +435,6 @@ static int32_t writeData(void *_call)
return len; return len;
} }
static int writeReverseData(void *_call)
{
WriterAVCallData_t *call = (WriterAVCallData_t *) _call;
h264_printf(10, "\n");
if (call == NULL)
{
h264_err("call data is NULL...\n");
return 0;
}
h264_printf(10, "VideoPts %lld\n", call->Pts);
if ((call->data == NULL) || (call->len <= 0))
{
h264_err("NULL Data. ignoring...\n");
return 0;
}
if (call->fd < 0)
{
h264_err("file pointer < 0. ignoring ...\n");
return 0;
}
return 0;
}
/* ***************************** */ /* ***************************** */
/* Writer Definition */ /* Writer Definition */
/* ***************************** */ /* ***************************** */
@@ -474,6 +453,5 @@ struct Writer_s WriterVideoH264 =
{ {
&reset, &reset,
&writeData, &writeData,
&writeReverseData,
&caps &caps
}; };

View File

@@ -140,7 +140,6 @@ struct Writer_s WriterAudioMP3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_mp3 &caps_mp3
}; };
@@ -156,7 +155,6 @@ struct Writer_s WriterAudioMPEGL3 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_mpegl3 &caps_mpegl3
}; };
@@ -172,6 +170,5 @@ struct Writer_s WriterAudioVORBIS =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_vorbis &caps_vorbis
}; };

View File

@@ -158,7 +158,6 @@ struct Writer_s WriterVideoMPEG2 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };
@@ -176,6 +175,5 @@ struct Writer_s WriterVideoMPEGH264 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&h264_caps &h264_caps
}; };

View File

@@ -333,7 +333,6 @@ struct Writer_s WriterAudioPCM =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_pcm &caps_pcm
}; };
@@ -349,6 +348,5 @@ struct Writer_s WriterAudioIPCM =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_ipcm &caps_ipcm
}; };

View File

@@ -84,7 +84,7 @@ static short debug_level = 0;
#endif #endif
/* ***************************** */ /* ***************************** */
/* Types */ /* Types */
/* ***************************** */ /* ***************************** */
static const unsigned char SequenceLayerStartCode[] = {0x00, 0x00, 0x01, VC1_SEQUENCE_LAYER_METADATA_START_CODE}; static const unsigned char SequenceLayerStartCode[] = {0x00, 0x00, 0x01, VC1_SEQUENCE_LAYER_METADATA_START_CODE};
@@ -237,7 +237,7 @@ static int writeData(void *_call)
} }
/* ***************************** */ /* ***************************** */
/* Writer Definition */ /* Writer Definition */
/* ***************************** */ /* ***************************** */
static WriterCaps_t caps = static WriterCaps_t caps =
@@ -254,6 +254,5 @@ struct Writer_s WriterVideoVC1 =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };

View File

@@ -141,6 +141,5 @@ struct Writer_s WriterAudioVORBIS =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps_vorbis &caps_vorbis
}; };

View File

@@ -150,7 +150,7 @@ static int writeData(void *_call)
} }
/* ***************************** */ /* ***************************** */
/* Writer Definition */ /* Writer Definition */
/* ***************************** */ /* ***************************** */
static WriterCaps_t capsWMAPRO = static WriterCaps_t capsWMAPRO =
@@ -167,7 +167,6 @@ struct Writer_s WriterAudioWMAPRO =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&capsWMAPRO &capsWMAPRO
}; };
@@ -185,6 +184,5 @@ struct Writer_s WriterAudioWMA =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&capsWMA &capsWMA
}; };

View File

@@ -248,6 +248,5 @@ struct Writer_s WriterVideoWMV =
{ {
&reset, &reset,
&writeData, &writeData,
NULL,
&caps &caps
}; };