diff --git a/libeplayer3-arm/include/writer.h b/libeplayer3-arm/include/writer.h index ffae2a9..ad667e8 100644 --- a/libeplayer3-arm/include/writer.h +++ b/libeplayer3-arm/include/writer.h @@ -39,7 +39,6 @@ typedef struct Writer_s { int (* reset)(); int (* writeData)(void *); - int (* writeReverseData)(void *); WriterCaps_t *caps; } Writer_t; diff --git a/libeplayer3-arm/output/writer/mipsel/aac.c b/libeplayer3-arm/output/writer/mipsel/aac.c index f9f85a6..93a14fd 100644 --- a/libeplayer3-arm/output/writer/mipsel/aac.c +++ b/libeplayer3-arm/output/writer/mipsel/aac.c @@ -333,7 +333,6 @@ struct Writer_s WriterAudioAAC = { &reset, &writeDataADTS, - NULL, &caps }; @@ -351,7 +350,6 @@ struct Writer_s WriterAudioAACLATM = { &reset, &writeDataLATM, - NULL, &caps_aac_latm }; @@ -369,6 +367,5 @@ struct Writer_s WriterAudioAACPLUS = { &reset, &writeDataADTS, - NULL, &caps_aacplus }; diff --git a/libeplayer3-arm/output/writer/mipsel/ac3.c b/libeplayer3-arm/output/writer/mipsel/ac3.c index 39b7cc7..802f320 100644 --- a/libeplayer3-arm/output/writer/mipsel/ac3.c +++ b/libeplayer3-arm/output/writer/mipsel/ac3.c @@ -147,7 +147,6 @@ struct Writer_s WriterAudioAC3 = { &reset, &writeData, - NULL, &caps_ac3 }; @@ -165,6 +164,5 @@ struct Writer_s WriterAudioEAC3 = { &reset, &writeData, - NULL, &caps_eac3 }; diff --git a/libeplayer3-arm/output/writer/mipsel/amr.c b/libeplayer3-arm/output/writer/mipsel/amr.c index 06ed981..0847ecd 100644 --- a/libeplayer3-arm/output/writer/mipsel/amr.c +++ b/libeplayer3-arm/output/writer/mipsel/amr.c @@ -169,6 +169,5 @@ struct Writer_s WriterAudioAMR = { &reset, &writeData, - NULL, &caps_amr }; diff --git a/libeplayer3-arm/output/writer/mipsel/divx3.c b/libeplayer3-arm/output/writer/mipsel/divx3.c index ca8599c..349f4bc 100644 --- a/libeplayer3-arm/output/writer/mipsel/divx3.c +++ b/libeplayer3-arm/output/writer/mipsel/divx3.c @@ -190,6 +190,5 @@ struct Writer_s WriterVideoDIVX3 = { &reset, &writeData, - NULL, &divix3_caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/dts.c b/libeplayer3-arm/output/writer/mipsel/dts.c index fa5103f..f001441 100644 --- a/libeplayer3-arm/output/writer/mipsel/dts.c +++ b/libeplayer3-arm/output/writer/mipsel/dts.c @@ -173,6 +173,5 @@ struct Writer_s WriterAudioDTS = { &reset, &writeData, - NULL, &caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/h263.c b/libeplayer3-arm/output/writer/mipsel/h263.c index 9e6c32e..bca9f9b 100644 --- a/libeplayer3-arm/output/writer/mipsel/h263.c +++ b/libeplayer3-arm/output/writer/mipsel/h263.c @@ -148,7 +148,6 @@ struct Writer_s WriterVideoH263 = { &reset, &writeData, - NULL, &caps_h263 }; @@ -166,6 +165,5 @@ struct Writer_s WriterVideoFLV = { &reset, &writeData, - NULL, &caps_flv }; diff --git a/libeplayer3-arm/output/writer/mipsel/h264.c b/libeplayer3-arm/output/writer/mipsel/h264.c index 90fe5a1..a01cba1 100644 --- a/libeplayer3-arm/output/writer/mipsel/h264.c +++ b/libeplayer3-arm/output/writer/mipsel/h264.c @@ -413,11 +413,6 @@ static int writeData(void *_call) return len; } -static int writeReverseData(void *_call) -{ - WriterAVCallData_t *call = (WriterAVCallData_t *) _call; - return 0; -} /* ***************************** */ /* Writer Definition */ /* ***************************** */ @@ -436,6 +431,5 @@ struct Writer_s WriterVideoH264 = { &reset, &writeData, - &writeReverseData, &caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/h265.c b/libeplayer3-arm/output/writer/mipsel/h265.c index b0d07b2..d34405f 100644 --- a/libeplayer3-arm/output/writer/mipsel/h265.c +++ b/libeplayer3-arm/output/writer/mipsel/h265.c @@ -282,11 +282,6 @@ static int writeData(void *_call) return len; } -static int writeReverseData(void *_call) -{ - WriterAVCallData_t *call = (WriterAVCallData_t *) _call; - return 0; -} /* ***************************** */ /* Writer Definition */ /* ***************************** */ @@ -305,6 +300,5 @@ struct Writer_s WriterVideoH265 = { &reset, &writeData, - &writeReverseData, &caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/lpcm.c b/libeplayer3-arm/output/writer/mipsel/lpcm.c index 5030177..2fc6cec 100644 --- a/libeplayer3-arm/output/writer/mipsel/lpcm.c +++ b/libeplayer3-arm/output/writer/mipsel/lpcm.c @@ -261,6 +261,5 @@ struct Writer_s WriterAudioLPCM = { &reset, &writeData, /* writeDataLPCM */ - NULL, &caps_lpcm }; diff --git a/libeplayer3-arm/output/writer/mipsel/mp3.c b/libeplayer3-arm/output/writer/mipsel/mp3.c index 9afb51e..5b712bc 100644 --- a/libeplayer3-arm/output/writer/mipsel/mp3.c +++ b/libeplayer3-arm/output/writer/mipsel/mp3.c @@ -147,7 +147,6 @@ struct Writer_s WriterAudioMP3 = { &reset, &writeData, - NULL, &caps_mp3 }; @@ -165,7 +164,6 @@ struct Writer_s WriterAudioMPEGL3 = { &reset, &writeData, - NULL, &caps_mpegl3 }; @@ -183,6 +181,5 @@ struct Writer_s WriterAudioVORBIS = { &reset, &writeData, - NULL, &caps_vorbis }; diff --git a/libeplayer3-arm/output/writer/mipsel/mpeg2.c b/libeplayer3-arm/output/writer/mipsel/mpeg2.c index b15a4db..26706a0 100644 --- a/libeplayer3-arm/output/writer/mipsel/mpeg2.c +++ b/libeplayer3-arm/output/writer/mipsel/mpeg2.c @@ -157,7 +157,6 @@ struct Writer_s WriterVideoMPEG2 = { &reset, &writeData, - NULL, &caps }; @@ -175,6 +174,5 @@ struct Writer_s WriterVideoMPEG1 = { &reset, &writeData, - NULL, &mpg1_caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/mpeg4.c b/libeplayer3-arm/output/writer/mipsel/mpeg4.c index f9f99b3..f5fcc13 100644 --- a/libeplayer3-arm/output/writer/mipsel/mpeg4.c +++ b/libeplayer3-arm/output/writer/mipsel/mpeg4.c @@ -159,6 +159,5 @@ struct Writer_s WriterVideoMPEG4 = { &reset, &writeData, - NULL, &mpeg4p2_caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/pcm.c b/libeplayer3-arm/output/writer/mipsel/pcm.c index 29ef0f4..73c8359 100644 --- a/libeplayer3-arm/output/writer/mipsel/pcm.c +++ b/libeplayer3-arm/output/writer/mipsel/pcm.c @@ -127,7 +127,7 @@ static int32_t writeData(void *_call) return 0; } 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; uint32_t size = call->len; 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 block_align = 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 LE = 0; switch (codecID) @@ -288,7 +288,6 @@ struct Writer_s WriterAudioPCM = { &reset, &writeData, - NULL, &caps_pcm }; @@ -306,6 +305,5 @@ struct Writer_s WriterAudioIPCM = { &reset, &writeData, /* writeDataIPCM */ - NULL, &caps_ipcm }; diff --git a/libeplayer3-arm/output/writer/mipsel/vc1.c b/libeplayer3-arm/output/writer/mipsel/vc1.c index 2f543a0..33eeab8 100644 --- a/libeplayer3-arm/output/writer/mipsel/vc1.c +++ b/libeplayer3-arm/output/writer/mipsel/vc1.c @@ -194,6 +194,5 @@ struct Writer_s WriterVideoVC1 = { &reset, &writeData, - NULL, &caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/vp.c b/libeplayer3-arm/output/writer/mipsel/vp.c index 326a7b3..3a4533b 100644 --- a/libeplayer3-arm/output/writer/mipsel/vp.c +++ b/libeplayer3-arm/output/writer/mipsel/vp.c @@ -167,7 +167,6 @@ struct Writer_s WriterVideoVP6 = { &reset, &writeDataVP6, - NULL, &capsVP6 }; @@ -185,7 +184,6 @@ struct Writer_s WriterVideoVP8 = { &reset, &writeDataVP89, - NULL, &capsVP8 }; @@ -203,7 +201,6 @@ struct Writer_s WriterVideoVP9 = { &reset, &writeDataVP89, - NULL, &capsVP9 }; @@ -221,6 +218,5 @@ struct Writer_s WriterVideoSPARK = { &reset, &writeDataVP89, - NULL, &capsSPARK }; diff --git a/libeplayer3-arm/output/writer/mipsel/wma.c b/libeplayer3-arm/output/writer/mipsel/wma.c index c407d60..1c43ee0 100644 --- a/libeplayer3-arm/output/writer/mipsel/wma.c +++ b/libeplayer3-arm/output/writer/mipsel/wma.c @@ -161,7 +161,7 @@ static int writeData(void *_call) } /* ***************************** */ -/* Writer Definition */ +/* Writer Definition */ /* ***************************** */ static WriterCaps_t capsWMAPRO = @@ -178,7 +178,6 @@ struct Writer_s WriterAudioWMAPRO = { &reset, &writeData, - NULL, &capsWMAPRO }; @@ -196,6 +195,5 @@ struct Writer_s WriterAudioWMA = { &reset, &writeData, - NULL, &capsWMA }; diff --git a/libeplayer3-arm/output/writer/mipsel/wmv.c b/libeplayer3-arm/output/writer/mipsel/wmv.c index e9b7053..6cf8da1 100644 --- a/libeplayer3-arm/output/writer/mipsel/wmv.c +++ b/libeplayer3-arm/output/writer/mipsel/wmv.c @@ -20,7 +20,7 @@ */ /* ***************************** */ -/* Includes */ +/* Includes */ /* ***************************** */ #include @@ -50,7 +50,7 @@ #include "writer.h" /* ***************************** */ -/* Makros/Constants */ +/* Makros/Constants */ /* ***************************** */ #define WMV_FRAME_START_CODE 0x0d @@ -79,7 +79,7 @@ static short debug_level = 10; #endif /* ***************************** */ -/* Types */ +/* Types */ /* ***************************** */ static const uint8_t Vc1FrameStartCode[] = {0, 0, 1, WMV_FRAME_START_CODE}; @@ -201,6 +201,5 @@ struct Writer_s WriterVideoWMV = { &reset, &writeData, - NULL, &caps }; diff --git a/libeplayer3-arm/output/writer/mipsel/writer.c b/libeplayer3-arm/output/writer/mipsel/writer.c index 4d5853f..de99006 100644 --- a/libeplayer3-arm/output/writer/mipsel/writer.c +++ b/libeplayer3-arm/output/writer/mipsel/writer.c @@ -22,6 +22,7 @@ /* ***************************** */ /* Includes */ /* ***************************** */ + #include #include #include diff --git a/libeplayer3-arm/output/writer/sh4/aac.c b/libeplayer3-arm/output/writer/sh4/aac.c index 0e4f344..8617e74 100644 --- a/libeplayer3-arm/output/writer/sh4/aac.c +++ b/libeplayer3-arm/output/writer/sh4/aac.c @@ -330,7 +330,6 @@ struct Writer_s WriterAudioAAC = { &reset, &writeDataADTS, - NULL, &caps }; @@ -348,7 +347,6 @@ struct Writer_s WriterAudioAACLATM = { &reset, &writeDataLATM, - NULL, &caps_aac_latm }; @@ -366,6 +364,5 @@ struct Writer_s WriterAudioAACPLUS = { &reset, &writeDataADTS, - NULL, &caps_aacplus }; diff --git a/libeplayer3-arm/output/writer/sh4/ac3.c b/libeplayer3-arm/output/writer/sh4/ac3.c index fccccf9..6214b65 100644 --- a/libeplayer3-arm/output/writer/sh4/ac3.c +++ b/libeplayer3-arm/output/writer/sh4/ac3.c @@ -142,7 +142,6 @@ struct Writer_s WriterAudioAC3 = { &reset, &writeData, - NULL, &caps_ac3 }; @@ -160,6 +159,5 @@ struct Writer_s WriterAudioEAC3 = { &reset, &writeData, - NULL, &caps_eac3 }; diff --git a/libeplayer3-arm/output/writer/sh4/divx.c b/libeplayer3-arm/output/writer/sh4/divx.c index fe67339..f0c2013 100644 --- a/libeplayer3-arm/output/writer/sh4/divx.c +++ b/libeplayer3-arm/output/writer/sh4/divx.c @@ -187,7 +187,6 @@ struct Writer_s WriterVideoMPEG4 = { &reset, &writeData, - NULL, &mpeg4p2_caps }; @@ -195,7 +194,6 @@ struct Writer_s WriterVideoMSCOMP = { &reset, &writeData, - NULL, &mpeg4p2_caps }; @@ -213,7 +211,6 @@ struct Writer_s WriterVideoFOURCC = { &reset, &writeData, - NULL, &fourcc_caps }; @@ -231,6 +228,5 @@ struct Writer_s WriterVideoDIVX = { &reset, &writeData, - NULL, &divx_caps }; diff --git a/libeplayer3-arm/output/writer/sh4/divx2.c b/libeplayer3-arm/output/writer/sh4/divx2.c index 8386046..c928058 100644 --- a/libeplayer3-arm/output/writer/sh4/divx2.c +++ b/libeplayer3-arm/output/writer/sh4/divx2.c @@ -213,7 +213,6 @@ struct Writer_s WriterVideoMPEG4 = { &reset, &writeData, - NULL, &mpeg4p2_caps }; @@ -221,7 +220,6 @@ struct Writer_s WriterVideoMSCOMP = { &reset, &writeData, - NULL, &mpeg4p2_caps }; @@ -239,7 +237,6 @@ struct Writer_s WriterVideoFOURCC = { &reset, &writeData, - NULL, &fourcc_caps }; @@ -257,6 +254,5 @@ struct Writer_s WriterVideoDIVX = { &reset, &writeData, - NULL, &divx_caps }; diff --git a/libeplayer3-arm/output/writer/sh4/dts.c b/libeplayer3-arm/output/writer/sh4/dts.c index 514bd7a..64b5862 100644 --- a/libeplayer3-arm/output/writer/sh4/dts.c +++ b/libeplayer3-arm/output/writer/sh4/dts.c @@ -171,6 +171,5 @@ struct Writer_s WriterAudioDTS = { &reset, &writeData, - NULL, &caps }; diff --git a/libeplayer3-arm/output/writer/sh4/h263.c b/libeplayer3-arm/output/writer/sh4/h263.c index 4f86fa9..4c56341 100644 --- a/libeplayer3-arm/output/writer/sh4/h263.c +++ b/libeplayer3-arm/output/writer/sh4/h263.c @@ -150,7 +150,6 @@ struct Writer_s WriterVideoH263 = { &reset, &writeData, - NULL, &caps_h263 }; @@ -168,6 +167,5 @@ struct Writer_s WriterVideoFLV = { &reset, &writeData, - NULL, &caps_flv }; diff --git a/libeplayer3-arm/output/writer/sh4/h264.c b/libeplayer3-arm/output/writer/sh4/h264.c index ed1e5a8..ffaf118 100644 --- a/libeplayer3-arm/output/writer/sh4/h264.c +++ b/libeplayer3-arm/output/writer/sh4/h264.c @@ -105,6 +105,7 @@ static int avc3 = 0; /* ***************************** */ /* MISC Functions */ /* ***************************** */ + // 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) { @@ -434,28 +435,6 @@ static int32_t writeData(void *_call) 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 */ /* ***************************** */ @@ -474,6 +453,5 @@ struct Writer_s WriterVideoH264 = { &reset, &writeData, - &writeReverseData, &caps }; diff --git a/libeplayer3-arm/output/writer/sh4/mp3.c b/libeplayer3-arm/output/writer/sh4/mp3.c index 3224ad3..d2edf18 100644 --- a/libeplayer3-arm/output/writer/sh4/mp3.c +++ b/libeplayer3-arm/output/writer/sh4/mp3.c @@ -140,7 +140,6 @@ struct Writer_s WriterAudioMP3 = { &reset, &writeData, - NULL, &caps_mp3 }; @@ -156,7 +155,6 @@ struct Writer_s WriterAudioMPEGL3 = { &reset, &writeData, - NULL, &caps_mpegl3 }; @@ -172,6 +170,5 @@ struct Writer_s WriterAudioVORBIS = { &reset, &writeData, - NULL, &caps_vorbis }; diff --git a/libeplayer3-arm/output/writer/sh4/mpeg2.c b/libeplayer3-arm/output/writer/sh4/mpeg2.c index 123f9dc..d501a8f 100644 --- a/libeplayer3-arm/output/writer/sh4/mpeg2.c +++ b/libeplayer3-arm/output/writer/sh4/mpeg2.c @@ -158,7 +158,6 @@ struct Writer_s WriterVideoMPEG2 = { &reset, &writeData, - NULL, &caps }; @@ -176,6 +175,5 @@ struct Writer_s WriterVideoMPEGH264 = { &reset, &writeData, - NULL, &h264_caps }; diff --git a/libeplayer3-arm/output/writer/sh4/pcm.c b/libeplayer3-arm/output/writer/sh4/pcm.c index 14710ae..796e052 100644 --- a/libeplayer3-arm/output/writer/sh4/pcm.c +++ b/libeplayer3-arm/output/writer/sh4/pcm.c @@ -333,7 +333,6 @@ struct Writer_s WriterAudioPCM = { &reset, &writeData, - NULL, &caps_pcm }; @@ -349,6 +348,5 @@ struct Writer_s WriterAudioIPCM = { &reset, &writeData, - NULL, &caps_ipcm }; diff --git a/libeplayer3-arm/output/writer/sh4/vc1.c b/libeplayer3-arm/output/writer/sh4/vc1.c index d034c2f..3f874a1 100644 --- a/libeplayer3-arm/output/writer/sh4/vc1.c +++ b/libeplayer3-arm/output/writer/sh4/vc1.c @@ -84,7 +84,7 @@ static short debug_level = 0; #endif /* ***************************** */ -/* Types */ +/* Types */ /* ***************************** */ 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 = @@ -254,6 +254,5 @@ struct Writer_s WriterVideoVC1 = { &reset, &writeData, - NULL, &caps }; diff --git a/libeplayer3-arm/output/writer/sh4/vorbis.c b/libeplayer3-arm/output/writer/sh4/vorbis.c index 34d8a82..6e10217 100644 --- a/libeplayer3-arm/output/writer/sh4/vorbis.c +++ b/libeplayer3-arm/output/writer/sh4/vorbis.c @@ -141,6 +141,5 @@ struct Writer_s WriterAudioVORBIS = { &reset, &writeData, - NULL, &caps_vorbis }; diff --git a/libeplayer3-arm/output/writer/sh4/wma.c b/libeplayer3-arm/output/writer/sh4/wma.c index d84ad98..aa1ae54 100644 --- a/libeplayer3-arm/output/writer/sh4/wma.c +++ b/libeplayer3-arm/output/writer/sh4/wma.c @@ -150,7 +150,7 @@ static int writeData(void *_call) } /* ***************************** */ -/* Writer Definition */ +/* Writer Definition */ /* ***************************** */ static WriterCaps_t capsWMAPRO = @@ -167,7 +167,6 @@ struct Writer_s WriterAudioWMAPRO = { &reset, &writeData, - NULL, &capsWMAPRO }; @@ -185,6 +184,5 @@ struct Writer_s WriterAudioWMA = { &reset, &writeData, - NULL, &capsWMA }; diff --git a/libeplayer3-arm/output/writer/sh4/wmv.c b/libeplayer3-arm/output/writer/sh4/wmv.c index 75c6278..6e2325e 100644 --- a/libeplayer3-arm/output/writer/sh4/wmv.c +++ b/libeplayer3-arm/output/writer/sh4/wmv.c @@ -248,6 +248,5 @@ struct Writer_s WriterVideoWMV = { &reset, &writeData, - NULL, &caps };