From 96bb5eb255c2be7e9d735be86181fcefe93db4b3 Mon Sep 17 00:00:00 2001 From: max_10 Date: Thu, 28 Dec 2017 12:07:38 +0100 Subject: [PATCH] libeplayer3-arm: Code formatting --- libeplayer3-arm/Makefile.am | 10 ++-- libeplayer3-arm/container/container.c | 2 - libeplayer3-arm/container/flv2mpeg4_ffmpeg.c | 3 - libeplayer3-arm/container/mpeg4p2_ffmpeg.c | 2 - libeplayer3-arm/external/ffmpeg/get_bits.h | 7 +-- libeplayer3-arm/external/ffmpeg/latmenc.h | 1 - .../external/ffmpeg/src/bitstream.c | 2 - libeplayer3-arm/external/ffmpeg/src/latmenc.c | 2 - .../external/flv2mpeg4/src/dcprediction.c | 1 - .../external/flv2mpeg4/src/dcprediction.h | 1 - libeplayer3-arm/external/flv2mpeg4/src/flv.h | 2 - .../external/flv2mpeg4/src/flv2mpeg4.c | 5 -- .../external/flv2mpeg4/src/flvdecoder.c | 2 - libeplayer3-arm/external/flv2mpeg4/src/m4v.h | 2 - .../external/flv2mpeg4/src/m4vencode.c | 1 - libeplayer3-arm/include/bcm_ioctls.h | 7 --- libeplayer3-arm/include/common.h | 1 + libeplayer3-arm/include/output.h | 1 - libeplayer3-arm/include/pes.h | 2 - libeplayer3-arm/include/stm_ioctls.h | 4 -- libeplayer3-arm/include/writer.h | 2 - libeplayer3-arm/manager/audio.c | 22 +++---- libeplayer3-arm/manager/chapter.c | 57 +++++++++---------- libeplayer3-arm/manager/subtitle.c | 2 - libeplayer3-arm/manager/video.c | 42 +------------- libeplayer3-arm/output/linuxdvb_mipsel.c | 2 - libeplayer3-arm/output/linuxdvb_sh4.c | 2 - libeplayer3-arm/output/output_subtitle.c | 2 - libeplayer3-arm/output/writer/common/pes.c | 1 - libeplayer3-arm/output/writer/mipsel/aac.c | 2 +- libeplayer3-arm/output/writer/mipsel/amr.c | 2 - libeplayer3-arm/output/writer/mipsel/divx3.c | 1 - libeplayer3-arm/output/writer/mipsel/mp3.c | 1 - libeplayer3-arm/output/writer/mipsel/pcm.c | 1 - libeplayer3-arm/output/writer/mipsel/vc1.c | 1 - libeplayer3-arm/output/writer/mipsel/vp.c | 2 - libeplayer3-arm/output/writer/mipsel/wma.c | 1 - libeplayer3-arm/output/writer/mipsel/writer.c | 1 - libeplayer3-arm/output/writer/sh4/aac.c | 3 +- libeplayer3-arm/output/writer/sh4/ac3.c | 2 +- libeplayer3-arm/output/writer/sh4/divx.c | 1 - libeplayer3-arm/output/writer/sh4/divx2.c | 1 - libeplayer3-arm/output/writer/sh4/h264.c | 1 - libeplayer3-arm/output/writer/sh4/mp3.c | 1 - libeplayer3-arm/output/writer/sh4/pes.c | 1 - libeplayer3-arm/output/writer/sh4/vc1.c | 4 -- libeplayer3-arm/output/writer/sh4/wma.c | 1 - libeplayer3-arm/output/writer/sh4/wmv.c | 1 - libeplayer3-arm/playback/playback.c | 2 - 49 files changed, 50 insertions(+), 170 deletions(-) diff --git a/libeplayer3-arm/Makefile.am b/libeplayer3-arm/Makefile.am index ec73708..7d133e2 100644 --- a/libeplayer3-arm/Makefile.am +++ b/libeplayer3-arm/Makefile.am @@ -2,11 +2,13 @@ AUTOMAKE_OPTIONS = subdir-objects noinst_LTLIBRARIES = libeplayer3_arm.la -AM_CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -AM_CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -AM_CPPFLAGS += -I$(srcdir)/include -I$(top_srcdir)/include +AM_CFLAGS = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + +AM_CPPFLAGS = -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(srcdir)/external -AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing + +AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing libeplayer3_arm_la_SOURCES = \ container/container.c \ diff --git a/libeplayer3-arm/container/container.c b/libeplayer3-arm/container/container.c index 384a46e..af5e50b 100644 --- a/libeplayer3-arm/container/container.c +++ b/libeplayer3-arm/container/container.c @@ -98,7 +98,6 @@ static int32_t selectContainer(Context_t *context, char *extension) return ret; } - static int Command(void *_context, ContainerCmd_t command, void *argument) { Context_t *context = (Context_t *) _context; @@ -128,7 +127,6 @@ static int Command(void *_context, ContainerCmd_t command, void *argument) return ret; } - ContainerHandler_t ContainerHandler = { "Output", diff --git a/libeplayer3-arm/container/flv2mpeg4_ffmpeg.c b/libeplayer3-arm/container/flv2mpeg4_ffmpeg.c index 6fdb059..968ba56 100644 --- a/libeplayer3-arm/container/flv2mpeg4_ffmpeg.c +++ b/libeplayer3-arm/container/flv2mpeg4_ffmpeg.c @@ -5,7 +5,6 @@ #include "flv2mpeg4/flv2mpeg4.h" - typedef struct { flv2mpeg4_CTX *ctx; @@ -16,7 +15,6 @@ typedef struct Track_t *track; } Flv2Mpeg4Context; - static int flv2mpeg4_context_write_packet_cb(void *usr_data, int keyframe, int pts, const uint8_t *buf, int size) { Flv2Mpeg4Context *ctx = usr_data; @@ -82,4 +80,3 @@ static int flv2mpeg4_write_packet(Context_t *out_ctx, Flv2Mpeg4Context *mpeg4p2_ uint32_t time_ms = (uint32_t)(track->pts / 90); return flv2mpeg4_process_flv_packet(mpeg4p2_ctx->ctx, 0, pkt->data, pkt->size, time_ms); } - diff --git a/libeplayer3-arm/container/mpeg4p2_ffmpeg.c b/libeplayer3-arm/container/mpeg4p2_ffmpeg.c index 288fe86..9a37b9f 100644 --- a/libeplayer3-arm/container/mpeg4p2_ffmpeg.c +++ b/libeplayer3-arm/container/mpeg4p2_ffmpeg.c @@ -14,7 +14,6 @@ typedef struct AVPacket *second_ip_frame; } Mpeg4P2Context; - static void set_packet(AVPacket **pkt_dest, AVPacket *pkt_src) { if (pkt_dest == NULL) @@ -207,4 +206,3 @@ static int mpeg4p2_write_packet(Context_t *ctx, Mpeg4P2Context *mpeg4p2_ctx, Tra } return 0; } - diff --git a/libeplayer3-arm/external/ffmpeg/get_bits.h b/libeplayer3-arm/external/ffmpeg/get_bits.h index 658253f..c84b351 100644 --- a/libeplayer3-arm/external/ffmpeg/get_bits.h +++ b/libeplayer3-arm/external/ffmpeg/get_bits.h @@ -100,11 +100,9 @@ typedef struct GetBitContext unsigned int name ## _index = (gb)->index; \ unsigned int av_unused name ## _cache - #define OPEN_READER(name, gb) OPEN_READER_NOSIZE(name, gb) #define BITS_AVAILABLE(name, gb) 1 - #define CLOSE_READER(name, gb) (gb)->index = name ## _index # ifdef LONG_BITSTREAM_READER @@ -125,7 +123,6 @@ typedef struct GetBitContext #endif - #ifdef BITSTREAM_READER_LE # define UPDATE_CACHE(name, gb) UPDATE_CACHE_LE(name, gb) @@ -142,7 +139,6 @@ typedef struct GetBitContext #define SKIP_COUNTER(name, gb, num) name ## _index += (num) - #define BITS_LEFT(name, gb) ((int)((gb)->size_in_bits - name ## _index)) #define SKIP_BITS(name, gb, num) \ @@ -504,7 +500,6 @@ do { \ SKIP_BITS(name, gb, n); \ } while (0) - static inline int decode012(GetBitContext *gb) { int n; @@ -541,4 +536,4 @@ static inline int skip_1stop_8data_bits(GetBitContext *gb) return 0; } -#endif /* AVCODEC_GET_BITS_H */ \ No newline at end of file +#endif /* AVCODEC_GET_BITS_H */ diff --git a/libeplayer3-arm/external/ffmpeg/latmenc.h b/libeplayer3-arm/external/ffmpeg/latmenc.h index e5d3345..8e6a847 100644 --- a/libeplayer3-arm/external/ffmpeg/latmenc.h +++ b/libeplayer3-arm/external/ffmpeg/latmenc.h @@ -42,4 +42,3 @@ int latmenc_decode_extradata(LATMContext *ctx, uint8_t *buf, int size); int latmenc_write_packet(LATMContext *ctx, uint8_t *data, int size, uint8_t *extradata, int extradata_size); #endif /* AVCODEC_LATMENC_H */ - diff --git a/libeplayer3-arm/external/ffmpeg/src/bitstream.c b/libeplayer3-arm/external/ffmpeg/src/bitstream.c index b91e3e0..4371a7a 100644 --- a/libeplayer3-arm/external/ffmpeg/src/bitstream.c +++ b/libeplayer3-arm/external/ffmpeg/src/bitstream.c @@ -31,7 +31,6 @@ #include #include - void avpriv_align_put_bits(PutBitContext *s) { put_bits(s, s->bit_left & 7, 0); @@ -72,4 +71,3 @@ void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length) } put_bits(pb, bits, AV_RB16(src + 2 * words) >> (16 - bits)); } - diff --git a/libeplayer3-arm/external/ffmpeg/src/latmenc.c b/libeplayer3-arm/external/ffmpeg/src/latmenc.c index 0cf91fa..86a11f4 100644 --- a/libeplayer3-arm/external/ffmpeg/src/latmenc.c +++ b/libeplayer3-arm/external/ffmpeg/src/latmenc.c @@ -38,7 +38,6 @@ #define latmenc_err(fmt, x...) #endif - int latmenc_decode_extradata(LATMContext *ctx, uint8_t *buf, int size) { MPEG4AudioConfig m4ac; @@ -152,4 +151,3 @@ too_large: latmenc_err("LATM packet size larger than maximum size 0x1fff\n"); return AVERROR_INVALIDDATA; } - diff --git a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c b/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c index 66f348f..90e350f 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c +++ b/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.c @@ -25,7 +25,6 @@ #include "dcprediction.h" - // M4V ADDED static const uint8 mpeg4_y_dc_scale_table[32] = { diff --git a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h b/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h index 936b741..456a685 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h +++ b/libeplayer3-arm/external/flv2mpeg4/src/dcprediction.h @@ -40,7 +40,6 @@ typedef struct _M4V_DCPRED int y_dc_scale; int c_dc_scale; - } M4V_DCPRED; ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flv.h b/libeplayer3-arm/external/flv2mpeg4/src/flv.h index e2f08ce..22874b3 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/flv.h +++ b/libeplayer3-arm/external/flv2mpeg4/src/flv.h @@ -65,7 +65,6 @@ typedef struct _PICTURE int width; int height; - #define FLV_I_TYPE 0 #define FLV_P_TYPE 1 @@ -157,5 +156,4 @@ static const int8 rl_inter_run[102] = static const int rl_inter_n = 102; static const int rl_inter_last = 58; - #endif // FLV_H diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c b/libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c index 9839aab..f1cc609 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c +++ b/libeplayer3-arm/external/flv2mpeg4/src/flv2mpeg4.c @@ -41,7 +41,6 @@ typedef struct _CONVCTX M4V_VOL vol; } CONVCTX; - typedef struct { uint8 *out_buf; @@ -65,7 +64,6 @@ static const uint8 ff_mpeg4_c_dc_scale_table[32] = 0, 8, 8, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 20, 21, 22, 23, 24, 25 }; - static void copy_vol(PICTURE *flv_pic, M4V_VOL *vol) { vol->width = flv_pic->width; @@ -284,6 +282,3 @@ void flv2mpeg4_release_ctx(flv2mpeg4_CTX **pub_ctx) free(*pub_ctx); *pub_ctx = NULL; } - - - diff --git a/libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c b/libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c index 2642a28..edfba70 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c +++ b/libeplayer3-arm/external/flv2mpeg4/src/flvdecoder.c @@ -38,7 +38,6 @@ static const uint8 zig_zag_scan[64] = 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63 }; - static const VLCtab vlc_table_intra_MCBPC[] = //: table_size=72 table_allocated=128 bits=6 { {64, -3}, @@ -128,7 +127,6 @@ static const VLCtab vlc_table_rl_inter[] = //: table_size=554 table_allocated=10 {100, 3}, {101, 3}, {8, 1}, {7, 1} }; - static const VLCtab vlc_table_mv[] = //mv_vlc: table_size=538 table_allocated=1024 bits=9 { {512, -3}, {520, -2}, {524, -1}, {526, -1}, {528, -1}, {530, -1}, {532, -1}, {534, -1}, {536, -1}, {10, 9}, diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4v.h b/libeplayer3-arm/external/flv2mpeg4/src/m4v.h index df5fd2e..eddb7dd 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/m4v.h +++ b/libeplayer3-arm/external/flv2mpeg4/src/m4v.h @@ -134,6 +134,4 @@ static const uint8 alternate_vertical_scan[64] = 38, 46, 54, 62, 39, 47, 55, 63, }; - #endif // M4V_H - diff --git a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c b/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c index 8858741..50ba7dd 100644 --- a/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c +++ b/libeplayer3-arm/external/flv2mpeg4/src/m4vencode.c @@ -293,7 +293,6 @@ static void __inline encode_inter_8x8_MCBPC(BW *bw, int cbpc) put_bits(bw, vlce_inter_MCBPC_bits[cbpc + 16], vlce_inter_MCBPC_code[cbpc + 16]); } - // same as H.263 static void __inline encode_cbpy(BW *bw, int cbpy) { diff --git a/libeplayer3-arm/include/bcm_ioctls.h b/libeplayer3-arm/include/bcm_ioctls.h index d52f298..ef118e5 100644 --- a/libeplayer3-arm/include/bcm_ioctls.h +++ b/libeplayer3-arm/include/bcm_ioctls.h @@ -35,7 +35,6 @@ typedef enum CT_VP9 } video_codec_type_t; - typedef enum { STREAMTYPE_UNKNOWN = -1, @@ -57,8 +56,6 @@ typedef enum STREAMTYPE_SPARK = 21, } video_stream_type_t; - - typedef enum { AUDIOTYPE_UNKNOWN = -1, @@ -78,8 +75,4 @@ typedef enum AUDIOTYPE_RAW = 0xf } audio_stream_type_t; - - - #endif /* H_DVB_BCM_H */ - diff --git a/libeplayer3-arm/include/common.h b/libeplayer3-arm/include/common.h index ac26ac0..fa708f3 100644 --- a/libeplayer3-arm/include/common.h +++ b/libeplayer3-arm/include/common.h @@ -26,4 +26,5 @@ typedef struct Context_s } Context_t; int container_ffmpeg_update_tracks(Context_t *context, char *filename, int initial); + #endif diff --git a/libeplayer3-arm/include/output.h b/libeplayer3-arm/include/output.h index ccc0d62..356e5e1 100644 --- a/libeplayer3-arm/include/output.h +++ b/libeplayer3-arm/include/output.h @@ -63,7 +63,6 @@ typedef struct char *type; } SubtitleOut_t; - typedef struct Output_s { char *Name; diff --git a/libeplayer3-arm/include/pes.h b/libeplayer3-arm/include/pes.h index 1b2d019..2026d4f 100644 --- a/libeplayer3-arm/include/pes.h +++ b/libeplayer3-arm/include/pes.h @@ -12,10 +12,8 @@ #define PES_START_CODE_RESERVED_4 0xfd #define PES_VERSION_FAKE_START_CODE 0x31 - #define MAX_PES_PACKET_SIZE (65535) - /* start codes */ #define PCM_PES_START_CODE 0xbd #define PRIVATE_STREAM_1_PES_START_CODE 0xbd diff --git a/libeplayer3-arm/include/stm_ioctls.h b/libeplayer3-arm/include/stm_ioctls.h index fcb19ee..bdcd8dc 100644 --- a/libeplayer3-arm/include/stm_ioctls.h +++ b/libeplayer3-arm/include/stm_ioctls.h @@ -92,7 +92,6 @@ typedef enum VIDEO_ENCODING_PRIVATE } video_encoding_t; - /* * List of possible audio encodings - used to select frame parser and codec. */ @@ -199,7 +198,6 @@ typedef struct dvb_play_info_s typedef dvb_play_info_t video_play_info_t; typedef dvb_play_info_t audio_play_info_t; - typedef enum { #define DVB_OPTION_VALUE_DISABLE 0 @@ -285,7 +283,6 @@ typedef enum // Legacy typo correction #define DVP_OPTION_H264_FORCE_PIC_ORDER_CNT_IGNORE_DPB_DISPLAY_FRAME_ORDERING DVB_OPTION_H264_FORCE_PIC_ORDER_CNT_IGNORE_DPB_DISPLAY_FRAME_ORDERING - typedef dvb_option_t video_option_t; /* Decoder commands */ @@ -296,7 +293,6 @@ typedef dvb_option_t video_option_t; #define VIDEO_CMD_SET_OPTION (4) #define VIDEO_CMD_GET_OPTION (5) - /* Flags for VIDEO_CMD_FREEZE */ #define VIDEO_CMD_FREEZE_TO_BLACK (1 << 0) diff --git a/libeplayer3-arm/include/writer.h b/libeplayer3-arm/include/writer.h index a26205f..ffae2a9 100644 --- a/libeplayer3-arm/include/writer.h +++ b/libeplayer3-arm/include/writer.h @@ -24,8 +24,6 @@ typedef struct unsigned int InfoFlags; } WriterAVCallData_t; - - typedef struct WriterCaps_s { char *name; diff --git a/libeplayer3-arm/manager/audio.c b/libeplayer3-arm/manager/audio.c index b26c06f..c3676af 100644 --- a/libeplayer3-arm/manager/audio.c +++ b/libeplayer3-arm/manager/audio.c @@ -126,23 +126,21 @@ static int ManagerAdd(Context_t *context, Track_t track) return cERR_AUDIO_MGR_NO_ERROR; } -static char **ManagerList(Context_t * context __attribute__ ((unused))) +static char **ManagerList(Context_t *context __attribute__((unused))) { int i = 0, j = 0; char **tracklist = NULL; - audio_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); - - if (Tracks != NULL) { - + if (Tracks != NULL) + { tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1)); - - if (tracklist == NULL) { - audio_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__); + if (tracklist == NULL) + { + audio_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__); return NULL; } - - for (i = 0, j = 0; i < TrackCount; i++, j += 2) { + for (i = 0, j = 0; i < TrackCount; i++, j += 2) + { if (Tracks[i].pending) continue; size_t len = strlen(Tracks[i].Name) + 20; @@ -153,9 +151,7 @@ static char **ManagerList(Context_t * context __attribute__ ((unused))) } tracklist[j] = NULL; } - audio_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, __FUNCTION__, tracklist, j, TrackCount); - return tracklist; } @@ -217,7 +213,6 @@ static int ManagerDel(Context_t *context) return cERR_AUDIO_MGR_NO_ERROR; } - static int Command(void *_context, ManagerCmd_t command, void *argument) { Context_t *context = (Context_t *) _context; @@ -349,7 +344,6 @@ static int Command(void *_context, ManagerCmd_t command, void *argument) return ret; } - struct Manager_s AudioManager = { "Audio", diff --git a/libeplayer3-arm/manager/chapter.c b/libeplayer3-arm/manager/chapter.c index 09adf30..3bf39ae 100644 --- a/libeplayer3-arm/manager/chapter.c +++ b/libeplayer3-arm/manager/chapter.c @@ -195,34 +195,34 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument) switch (command) { - case MANAGER_ADD: - { - Track_t *track = argument; - ret = ManagerAdd(context, *track); - break; - } - case MANAGER_LIST: - { - container_ffmpeg_update_tracks(context, context->playback->uri, 0); - *((char ***) argument) = (char **) ManagerList(context); - break; - } - case MANAGER_DEL: - { - ret = ManagerDel(context); - break; - } - case MANAGER_INIT_UPDATE: - { - int i; - for (i = 0; i < TrackCount; i++) - Tracks[i].pending = 1; - break; - } - default: - chapter_mgr_err("%s::%s ContainerCmd %d not supported!\n", FILENAME, __FUNCTION__, command); - ret = cERR_CHAPTER_MGR_ERROR; - break; + case MANAGER_ADD: + { + Track_t *track = argument; + ret = ManagerAdd(context, *track); + break; + } + case MANAGER_LIST: + { + container_ffmpeg_update_tracks(context, context->playback->uri, 0); + *((char ***) argument) = (char **) ManagerList(context); + break; + } + case MANAGER_DEL: + { + ret = ManagerDel(context); + break; + } + case MANAGER_INIT_UPDATE: + { + int i; + for (i = 0; i < TrackCount; i++) + Tracks[i].pending = 1; + break; + } + default: + chapter_mgr_err("%s::%s ContainerCmd %d not supported!\n", FILENAME, __FUNCTION__, command); + ret = cERR_CHAPTER_MGR_ERROR; + break; } chapter_mgr_printf(10, "%s:%s: returning %d\n", FILENAME, __FUNCTION__, ret); @@ -230,7 +230,6 @@ static int Command(Context_t *context, ManagerCmd_t command, void *argument) return ret; } - struct Manager_s ChapterManager = { "Chapter", diff --git a/libeplayer3-arm/manager/subtitle.c b/libeplayer3-arm/manager/subtitle.c index a47235e..415da59 100644 --- a/libeplayer3-arm/manager/subtitle.c +++ b/libeplayer3-arm/manager/subtitle.c @@ -39,7 +39,6 @@ #define SUBTITLE_MGR_SILENT #endif - #ifdef SUBTITLE_MGR_DEBUG static short debug_level = 20; @@ -326,7 +325,6 @@ static int32_t Command(void *_context, ManagerCmd_t command, void *argument) return ret; } - Manager_t SubtitleManager = { "Subtitle", diff --git a/libeplayer3-arm/manager/video.c b/libeplayer3-arm/manager/video.c index 0449f8d..c84587c 100644 --- a/libeplayer3-arm/manager/video.c +++ b/libeplayer3-arm/manager/video.c @@ -125,41 +125,7 @@ static int ManagerAdd(Context_t *context, Track_t track) return cERR_VIDEO_MGR_NO_ERROR; } -static char **ManagerList(Context_t * context __attribute__ ((unused))) -{ - int i = 0, j = 0; - char **tracklist = NULL; - - video_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); - - if (Tracks != NULL) { - - tracklist = malloc(sizeof(char *) * ((TrackCount * 2) + 1)); - - if (tracklist == NULL) { - video_mgr_err("%s:%s malloc failed\n", FILENAME, __FUNCTION__); - return NULL; - } - - for (i = 0, j = 0; i < TrackCount; i++, j += 2) { - if (Tracks[i].pending) - continue; - size_t len = strlen(Tracks[i].Name) + 20; - char tmp[len]; - snprintf(tmp, len, "%d %s\n", Tracks[i].Id, Tracks[i].Name); - tracklist[j] = strdup(tmp); - tracklist[j + 1] = strdup(Tracks[i].Encoding); - } - tracklist[j] = NULL; - } - - video_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, __FUNCTION__, tracklist, j, TrackCount); - - return tracklist; -} - -#if 0 -static char **ManagerList(Context_t *context __attribute__((unused))) +static char **ManagerList(Context_t * context __attribute__((unused))) { int i = 0, j = 0; char **tracklist = NULL; @@ -181,15 +147,14 @@ static char **ManagerList(Context_t *context __attribute__((unused))) size_t len = strlen(Tracks[i].Name) + 20; char tmp[len]; snprintf(tmp, len, "%d %s\n", Tracks[i].Id, Tracks[i].Name); - tracklist[j] = strdup(tmp); - tracklist[j + 1] = strdup(Tracks[i].Encoding); + tracklist[j] = strdup(tmp); + tracklist[j + 1] = strdup(Tracks[i].Encoding); } tracklist[j] = NULL; } video_mgr_printf(10, "%s::%s return %p (%d - %d)\n", FILENAME, __FUNCTION__, tracklist, j, TrackCount); return tracklist; } -#endif static int ManagerDel(Context_t *context) { @@ -362,7 +327,6 @@ static int Command(void *_context, ManagerCmd_t command, void *argument) return ret; } - struct Manager_s VideoManager = { "Video", diff --git a/libeplayer3-arm/output/linuxdvb_mipsel.c b/libeplayer3-arm/output/linuxdvb_mipsel.c index 224ca53..211ada5 100644 --- a/libeplayer3-arm/output/linuxdvb_mipsel.c +++ b/libeplayer3-arm/output/linuxdvb_mipsel.c @@ -468,7 +468,6 @@ int LinuxDvbAudioMute(Context_t *context __attribute__((unused)), char *flag) return ret; } - int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type) { // unsigned char video = !strcmp("video", type); @@ -566,7 +565,6 @@ int LinuxDvbFastForward(Context_t *context, char *type) } #endif - int LinuxDvbReverse(Context_t *context __attribute__((unused)), char *type __attribute__((unused))) { int ret = cERR_LINUXDVB_NO_ERROR; diff --git a/libeplayer3-arm/output/linuxdvb_sh4.c b/libeplayer3-arm/output/linuxdvb_sh4.c index 1ffb854..7cfba72 100644 --- a/libeplayer3-arm/output/linuxdvb_sh4.c +++ b/libeplayer3-arm/output/linuxdvb_sh4.c @@ -439,7 +439,6 @@ int LinuxDvbAudioMute(Context_t *context __attribute__((unused)), char *flag) return ret; } - int LinuxDvbFlush(Context_t *context __attribute__((unused)), char *type) { unsigned char video = !strcmp("video", type); @@ -540,7 +539,6 @@ int LinuxDvbFastForward(Context_t *context, char *type) } #endif - int LinuxDvbReverse(Context_t *context __attribute__((unused)), char *type __attribute__((unused))) { int ret = cERR_LINUXDVB_NO_ERROR; diff --git a/libeplayer3-arm/output/output_subtitle.c b/libeplayer3-arm/output/output_subtitle.c index a88c4bc..bbe626f 100644 --- a/libeplayer3-arm/output/output_subtitle.c +++ b/libeplayer3-arm/output/output_subtitle.c @@ -84,7 +84,6 @@ Number, Style, Name,, MarginL, MarginR, MarginV, Effect,, Text /* Types */ /* ***************************** */ - /* ***************************** */ /* Varaibles */ /* ***************************** */ @@ -320,7 +319,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument) return ret; } - static char *SubtitleCapabilitis[] = { "subtitle", NULL }; Output_t SubtitleOutput = diff --git a/libeplayer3-arm/output/writer/common/pes.c b/libeplayer3-arm/output/writer/common/pes.c index 93a18ad..fea8dc3 100644 --- a/libeplayer3-arm/output/writer/common/pes.c +++ b/libeplayer3-arm/output/writer/common/pes.c @@ -57,7 +57,6 @@ /* Types */ /* ***************************** */ - /* ***************************** */ /* Varaibles */ /* ***************************** */ diff --git a/libeplayer3-arm/output/writer/mipsel/aac.c b/libeplayer3-arm/output/writer/mipsel/aac.c index 5dc3931..f9f85a6 100644 --- a/libeplayer3-arm/output/writer/mipsel/aac.c +++ b/libeplayer3-arm/output/writer/mipsel/aac.c @@ -371,4 +371,4 @@ struct Writer_s WriterAudioAACPLUS = &writeDataADTS, NULL, &caps_aacplus -}; \ No newline at end of file +}; diff --git a/libeplayer3-arm/output/writer/mipsel/amr.c b/libeplayer3-arm/output/writer/mipsel/amr.c index fc0676a..06ed981 100644 --- a/libeplayer3-arm/output/writer/mipsel/amr.c +++ b/libeplayer3-arm/output/writer/mipsel/amr.c @@ -172,5 +172,3 @@ struct Writer_s WriterAudioAMR = NULL, &caps_amr }; - - diff --git a/libeplayer3-arm/output/writer/mipsel/divx3.c b/libeplayer3-arm/output/writer/mipsel/divx3.c index 20a867a..ca8599c 100644 --- a/libeplayer3-arm/output/writer/mipsel/divx3.c +++ b/libeplayer3-arm/output/writer/mipsel/divx3.c @@ -55,7 +55,6 @@ #define B_GET_BITS(w,e,b) (((w)>>(b))&(((unsigned)(-1))>>((sizeof(unsigned))*8-(e+1-b)))) #define B_SET_BITS(name,v,e,b) (((unsigned)(v))<<(b)) - #ifdef SAM_WITH_DEBUG #define DIVX_DEBUG #else diff --git a/libeplayer3-arm/output/writer/mipsel/mp3.c b/libeplayer3-arm/output/writer/mipsel/mp3.c index 3c9d490..9afb51e 100644 --- a/libeplayer3-arm/output/writer/mipsel/mp3.c +++ b/libeplayer3-arm/output/writer/mipsel/mp3.c @@ -186,4 +186,3 @@ struct Writer_s WriterAudioVORBIS = NULL, &caps_vorbis }; - diff --git a/libeplayer3-arm/output/writer/mipsel/pcm.c b/libeplayer3-arm/output/writer/mipsel/pcm.c index 112c139..29ef0f4 100644 --- a/libeplayer3-arm/output/writer/mipsel/pcm.c +++ b/libeplayer3-arm/output/writer/mipsel/pcm.c @@ -100,7 +100,6 @@ static uint32_t fixed_bufferfilled; /* MISC Functions */ /* ***************************** */ - static int32_t reset() { initialHeader = 1; diff --git a/libeplayer3-arm/output/writer/mipsel/vc1.c b/libeplayer3-arm/output/writer/mipsel/vc1.c index d8bc293..2f543a0 100644 --- a/libeplayer3-arm/output/writer/mipsel/vc1.c +++ b/libeplayer3-arm/output/writer/mipsel/vc1.c @@ -78,7 +78,6 @@ static short debug_level = 10; #define vc1_err(fmt, x...) #endif - /* ***************************** */ /* Types */ /* ***************************** */ diff --git a/libeplayer3-arm/output/writer/mipsel/vp.c b/libeplayer3-arm/output/writer/mipsel/vp.c index eb9f98a..326a7b3 100644 --- a/libeplayer3-arm/output/writer/mipsel/vp.c +++ b/libeplayer3-arm/output/writer/mipsel/vp.c @@ -75,7 +75,6 @@ static short debug_level = 10; #define vp_err(fmt, x...) #endif - /* ***************************** */ /* Types */ /* ***************************** */ @@ -150,7 +149,6 @@ static int writeDataVP89(void *_call) return writeData(_call, 0); } - /* ***************************** */ /* Writer Definition */ /* ***************************** */ diff --git a/libeplayer3-arm/output/writer/mipsel/wma.c b/libeplayer3-arm/output/writer/mipsel/wma.c index 83301a1..c407d60 100644 --- a/libeplayer3-arm/output/writer/mipsel/wma.c +++ b/libeplayer3-arm/output/writer/mipsel/wma.c @@ -182,7 +182,6 @@ struct Writer_s WriterAudioWMAPRO = &capsWMAPRO }; - static WriterCaps_t capsWMA = { "wma", diff --git a/libeplayer3-arm/output/writer/mipsel/writer.c b/libeplayer3-arm/output/writer/mipsel/writer.c index a131b4f..4d5853f 100644 --- a/libeplayer3-arm/output/writer/mipsel/writer.c +++ b/libeplayer3-arm/output/writer/mipsel/writer.c @@ -63,7 +63,6 @@ static Writer_t *AvailableWriter[] = { &WriterAudioAAC, &WriterAudioAACLATM, - &WriterAudioAACLATM, &WriterAudioAACPLUS, &WriterAudioAC3, &WriterAudioEAC3, diff --git a/libeplayer3-arm/output/writer/sh4/aac.c b/libeplayer3-arm/output/writer/sh4/aac.c index 0dd2e9f..0e4f344 100644 --- a/libeplayer3-arm/output/writer/sh4/aac.c +++ b/libeplayer3-arm/output/writer/sh4/aac.c @@ -43,7 +43,6 @@ #include #include "ffmpeg/latmenc.h" - #include "common.h" #include "output.h" #include "debug.h" @@ -369,4 +368,4 @@ struct Writer_s WriterAudioAACPLUS = &writeDataADTS, NULL, &caps_aacplus -}; \ No newline at end of file +}; diff --git a/libeplayer3-arm/output/writer/sh4/ac3.c b/libeplayer3-arm/output/writer/sh4/ac3.c index de2f44b..fccccf9 100644 --- a/libeplayer3-arm/output/writer/sh4/ac3.c +++ b/libeplayer3-arm/output/writer/sh4/ac3.c @@ -162,4 +162,4 @@ struct Writer_s WriterAudioEAC3 = &writeData, NULL, &caps_eac3 -}; \ No newline at end of file +}; diff --git a/libeplayer3-arm/output/writer/sh4/divx.c b/libeplayer3-arm/output/writer/sh4/divx.c index 4f4cdc9..fe67339 100644 --- a/libeplayer3-arm/output/writer/sh4/divx.c +++ b/libeplayer3-arm/output/writer/sh4/divx.c @@ -191,7 +191,6 @@ struct Writer_s WriterVideoMPEG4 = &mpeg4p2_caps }; - struct Writer_s WriterVideoMSCOMP = { &reset, diff --git a/libeplayer3-arm/output/writer/sh4/divx2.c b/libeplayer3-arm/output/writer/sh4/divx2.c index 99bfcc7..8386046 100644 --- a/libeplayer3-arm/output/writer/sh4/divx2.c +++ b/libeplayer3-arm/output/writer/sh4/divx2.c @@ -217,7 +217,6 @@ struct Writer_s WriterVideoMPEG4 = &mpeg4p2_caps }; - struct Writer_s WriterVideoMSCOMP = { &reset, diff --git a/libeplayer3-arm/output/writer/sh4/h264.c b/libeplayer3-arm/output/writer/sh4/h264.c index 75faaa9..ed1e5a8 100644 --- a/libeplayer3-arm/output/writer/sh4/h264.c +++ b/libeplayer3-arm/output/writer/sh4/h264.c @@ -91,7 +91,6 @@ typedef struct avcC_s unsigned char Params[1]; /* {length,params}{length,params}...sequence then picture*/ } avcC_t; - /* ***************************** */ /* Varaibles */ /* ***************************** */ diff --git a/libeplayer3-arm/output/writer/sh4/mp3.c b/libeplayer3-arm/output/writer/sh4/mp3.c index d3f2f4f..3224ad3 100644 --- a/libeplayer3-arm/output/writer/sh4/mp3.c +++ b/libeplayer3-arm/output/writer/sh4/mp3.c @@ -175,4 +175,3 @@ struct Writer_s WriterAudioVORBIS = NULL, &caps_vorbis }; - diff --git a/libeplayer3-arm/output/writer/sh4/pes.c b/libeplayer3-arm/output/writer/sh4/pes.c index 5cc56bb..4a59896 100644 --- a/libeplayer3-arm/output/writer/sh4/pes.c +++ b/libeplayer3-arm/output/writer/sh4/pes.c @@ -54,7 +54,6 @@ /* Types */ /* ***************************** */ - /* ***************************** */ /* Varaibles */ /* ***************************** */ diff --git a/libeplayer3-arm/output/writer/sh4/vc1.c b/libeplayer3-arm/output/writer/sh4/vc1.c index cde188d..d034c2f 100644 --- a/libeplayer3-arm/output/writer/sh4/vc1.c +++ b/libeplayer3-arm/output/writer/sh4/vc1.c @@ -58,7 +58,6 @@ #define METADATA_STRUCT_B_FRAMERATE_START 32 #define METADATA_STRUCT_C_START 8 - #define VC1_SEQUENCE_LAYER_METADATA_START_CODE 0x80 #define VC1_FRAME_START_CODE 0x0d @@ -84,14 +83,12 @@ static short debug_level = 0; #define vc1_err(fmt, x...) #endif - /* ***************************** */ /* Types */ /* ***************************** */ static const unsigned char SequenceLayerStartCode[] = {0x00, 0x00, 0x01, VC1_SEQUENCE_LAYER_METADATA_START_CODE}; - static const unsigned char Metadata[] = { 0x00, 0x00, 0x00, 0xc5, @@ -260,4 +257,3 @@ struct Writer_s WriterVideoVC1 = NULL, &caps }; - diff --git a/libeplayer3-arm/output/writer/sh4/wma.c b/libeplayer3-arm/output/writer/sh4/wma.c index bd577bb..d84ad98 100644 --- a/libeplayer3-arm/output/writer/sh4/wma.c +++ b/libeplayer3-arm/output/writer/sh4/wma.c @@ -171,7 +171,6 @@ struct Writer_s WriterAudioWMAPRO = &capsWMAPRO }; - static WriterCaps_t capsWMA = { "wma", diff --git a/libeplayer3-arm/output/writer/sh4/wmv.c b/libeplayer3-arm/output/writer/sh4/wmv.c index 782d83b..75c6278 100644 --- a/libeplayer3-arm/output/writer/sh4/wmv.c +++ b/libeplayer3-arm/output/writer/sh4/wmv.c @@ -80,7 +80,6 @@ static short debug_level = 0; #define wmv_err(fmt, x...) #endif - /* ***************************** */ /* Types */ /* ***************************** */ diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3-arm/playback/playback.c index 31664ba..7c9f59a 100644 --- a/libeplayer3-arm/playback/playback.c +++ b/libeplayer3-arm/playback/playback.c @@ -685,11 +685,9 @@ static int32_t Command(void *_context, PlaybackCmd_t command, void *argument) break; } default: - { playback_err("PlaybackCmd %d not supported!\n", command); ret = cERR_PLAYBACK_ERROR; break; - } } playback_printf(20, "exiting with value %d\n", ret); return ret;