mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 15:33:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3-arm: Code formatting

Browse Source
This commit is contained in:
max_10
2018-01-17 21:00:50 +01:00
committed by Thilo Graf
parent 5ccdc663b2
commit 8fe7fd7a3c
42 changed files with 261 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libeplayer3-arm/container/buff_ffmpeg.c
View File

@@ -103,8 +103,7 @@ static void update_finish_timeout()
/* On some STBs PTS readed from decoder is invalid after seek or at start /* On some STBs PTS readed from decoder is invalid after seek or at start
* this is the reason for additional validation when we what to close immediately * this is the reason for additional validation when we what to close immediately
*/ */
if (!progressive_playback && 0 == ret && currPts >= maxInjectedPts && if (!progressive_playback && 0 == ret && currPts >= maxInjectedPts && ((currPts - maxInjectedPts) / 90000) < 2)
((currPts - maxInjectedPts) / 90000) < 2)
{ {
/* close immediately /* close immediately
*/ */

20
libeplayer3-arm/container/container_ffmpeg.c
View File

@@ -1261,8 +1261,7 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, int
avContextTab[AVIdx]->interrupt_callback.callback = interrupt_cb; avContextTab[AVIdx]->interrupt_callback.callback = interrupt_cb;
avContextTab[AVIdx]->interrupt_callback.opaque = context->playback; avContextTab[AVIdx]->interrupt_callback.opaque = context->playback;
#ifdef SAM_CUSTOM_IO #ifdef SAM_CUSTOM_IO
if (0 == strstr(filename, "://") || if (0 == strstr(filename, "://") || 0 == strncmp(filename, "file://", 7))
0 == strncmp(filename, "file://", 7))
{ {
AVIOContext *avio_ctx = container_ffmpeg_get_avio_context(filename, 4096); AVIOContext *avio_ctx = container_ffmpeg_get_avio_context(filename, 4096);
if (avio_ctx) if (avio_ctx)
@@ -1334,8 +1333,7 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, int
* unless uri contain param wich can be understandable * unless uri contain param wich can be understandable
* only by librtmp * only by librtmp
*/ */
if (strstr(filename, " token=") || if (strstr(filename, " token=") || strstr(filename, " jtv="))
strstr(filename, " jtv="))
{ {
rtmpProtoImplType = RTMP_LIBRTMP; rtmpProtoImplType = RTMP_LIBRTMP;
} }
@@ -1479,8 +1477,7 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, int
} }
} }
} }
else if (0 == strncmp(filename, "http://", 7) || else if (0 == strncmp(filename, "http://", 7) || 0 == strncmp(filename, "https://", 8))
0 == strncmp(filename, "https://", 8))
{ {
av_dict_set(&avio_opts, "timeout", "20000000", 0); //20sec av_dict_set(&avio_opts, "timeout", "20000000", 0); //20sec
av_dict_set(&avio_opts, "reconnect", "1", 0); av_dict_set(&avio_opts, "reconnect", "1", 0);
@@ -1532,8 +1529,7 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, int
if (avContextTab[AVIdx] != NULL && avContextTab[AVIdx]->pb != NULL && !context->playback->isTSLiveMode) if (avContextTab[AVIdx] != NULL && avContextTab[AVIdx]->pb != NULL && !context->playback->isTSLiveMode)
{ {
ffmpeg_real_read_org = avContextTab[AVIdx]->pb->read_packet; ffmpeg_real_read_org = avContextTab[AVIdx]->pb->read_packet;
if (0 == AVIdx && strstr(filename, "://") != 0 && if (0 == AVIdx && strstr(filename, "://") != 0 && strncmp(filename, "file://", 7) != 0)
strncmp(filename, "file://", 7) != 0)
{ {
if (ffmpeg_buf_size > 0 && ffmpeg_buf_size > FILLBUFDIFF + FILLBUFPAKET) if (ffmpeg_buf_size > 0 && ffmpeg_buf_size > FILLBUFDIFF + FILLBUFPAKET)
{ {
@@ -1961,10 +1957,10 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32
} }
*/ */
} }
else if (get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAV1 else if (get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAV1 ||
|| get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAV2 get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAV2 ||
|| get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAPRO get_codecpar(stream)->codec_id == AV_CODEC_ID_WMAPRO ||
|| get_codecpar(stream)->codec_id == AV_CODEC_ID_WMALOSSLESS) //if (get_codecpar(stream)->extradata_size > 0) get_codecpar(stream)->codec_id == AV_CODEC_ID_WMALOSSLESS) //if (get_codecpar(stream)->extradata_size > 0)
{ {
ffmpeg_printf(10, "Create WMA ExtraData\n"); ffmpeg_printf(10, "Create WMA ExtraData\n");
uint16_t channels = get_codecpar(stream)->channels; uint16_t channels = get_codecpar(stream)->channels;

3
libeplayer3-arm/external/ffmpeg/src/bitstream.c vendored
View File

@@ -36,8 +36,7 @@ void avpriv_align_put_bits(PutBitContext *s)
put_bits(s, s->bit_left & 7, 0); put_bits(s, s->bit_left & 7, 0);
} }
void avpriv_put_string(PutBitContext *pb, const char *string, void avpriv_put_string(PutBitContext *pb, const char *string, int terminate_string)
int terminate_string)
{ {
while (*string) while (*string)
{ {

2
libeplayer3-arm/include/manager.h
View File

@@ -86,7 +86,6 @@ typedef struct TrackDescription_s
int32_t aspect_ratio_num; int32_t aspect_ratio_num;
int32_t aspect_ratio_den; int32_t aspect_ratio_den;
int progressive; int progressive;
} TrackDescription_t; } TrackDescription_t;
typedef struct Manager_s typedef struct Manager_s
@@ -94,7 +93,6 @@ typedef struct Manager_s
char *Name; char *Name;
int (* Command)(/*Context_t*/void *, ManagerCmd_t, void *); int (* Command)(/*Context_t*/void *, ManagerCmd_t, void *);
char **Capabilities; char **Capabilities;
} Manager_t; } Manager_t;
typedef struct ManagerHandler_s typedef struct ManagerHandler_s

2
libeplayer3-arm/include/output.h
View File

@@ -2,6 +2,7 @@
#define OUTPUT_H_ #define OUTPUT_H_
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
typedef enum typedef enum
{ {
@@ -69,7 +70,6 @@ typedef struct Output_s
int32_t (* Command)(/*Context_t*/void *, OutputCmd_t, void *); int32_t (* Command)(/*Context_t*/void *, OutputCmd_t, void *);
int32_t (* Write)(/*Context_t*/void *, void *privateData); int32_t (* Write)(/*Context_t*/void *, void *privateData);
char **Capabilities; char **Capabilities;
} Output_t; } Output_t;
extern Output_t LinuxDvbOutput; extern Output_t LinuxDvbOutput;

23
libeplayer3-arm/include/playback.h
View File

@@ -3,7 +3,28 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h> #include <stdint.h>
typedef enum {PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PAUSE, PLAYBACK_CONTINUE, PLAYBACK_FLUSH, PLAYBACK_TERM, PLAYBACK_FASTFORWARD, PLAYBACK_SEEK, PLAYBACK_SEEK_ABS, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT, PLAYBACK_METADATA} PlaybackCmd_t; typedef enum {
PLAYBACK_OPEN,
PLAYBACK_CLOSE,
PLAYBACK_PLAY,
PLAYBACK_STOP,
PLAYBACK_PAUSE,
PLAYBACK_CONTINUE,
PLAYBACK_FLUSH,
PLAYBACK_TERM,
PLAYBACK_FASTFORWARD,
PLAYBACK_SEEK,
PLAYBACK_SEEK_ABS,
PLAYBACK_PTS,
PLAYBACK_LENGTH,
PLAYBACK_SWITCH_AUDIO,
PLAYBACK_SWITCH_SUBTITLE,
PLAYBACK_INFO,
PLAYBACK_SLOWMOTION,
PLAYBACK_FASTBACKWARD,
PLAYBACK_GET_FRAME_COUNT,
PLAYBACK_METADATA
} PlaybackCmd_t;
typedef struct PlaybackHandler_s typedef struct PlaybackHandler_s
{ {

4
libeplayer3-arm/main/exteplayer.c
View File

@@ -119,8 +119,7 @@ static void *TermThreadFun(void *arg)
FD_SET(g_pfd[0], &readfds); FD_SET(g_pfd[0], &readfds);
FD_SET(fd, &readfds); FD_SET(fd, &readfds);
nfds = fd > g_pfd[0] ? fd + 1 : g_pfd[0] + 1; nfds = fd > g_pfd[0] ? fd + 1 : g_pfd[0] + 1;
while (select(nfds, &readfds, NULL, NULL, NULL) == -1 while (select(nfds, &readfds, NULL, NULL, NULL) == -1 && errno == EINTR)
&& errno == EINTR)
{ {
/* Restart if interrupted by signal */ /* Restart if interrupted by signal */
continue; continue;
@@ -475,6 +474,7 @@ static int HandleTracks(const Manager_t *ptrManager, const PlaybackCmd_t playbac
return commandRetVal; return commandRetVal;
} }
#endif #endif
static void UpdateVideoTrack() static void UpdateVideoTrack()
{ {
HandleTracks(g_player->manager->video, (PlaybackCmd_t) - 1, "vc"); HandleTracks(g_player->manager->video, (PlaybackCmd_t) - 1, "vc");

1
libeplayer3-arm/output/writer/mipsel/divx3.c
View File

@@ -106,6 +106,7 @@ static uint8_t brcm_divx311_sequence_header[] =
/* ***************************** */ /* ***************************** */
/* MISC Functions */ /* MISC Functions */
/* ***************************** */ /* ***************************** */
static int reset() static int reset()
{ {
initialHeader = 1; initialHeader = 1;

1
libeplayer3-arm/output/writer/mipsel/h263.c
View File

@@ -69,6 +69,7 @@ if (debug_level >= level) printf("[%s:%s] " fmt, __FILE__, __FUNCTION__, ## x);
#else #else
#define h263_err(fmt, x...) #define h263_err(fmt, x...)
#endif #endif
/* ***************************** */ /* ***************************** */
/* Types */ /* Types */
/* ***************************** */ /* ***************************** */

3
libeplayer3-arm/output/writer/mipsel/pcm.c
View File

@@ -266,8 +266,7 @@ static int32_t writeData(void *_call)
iov[1].iov_len = fixed_buffersize; iov[1].iov_len = fixed_buffersize;
writev_with_retry(call->fd, iov, 2); writev_with_retry(call->fd, iov, 2);
fixed_buffertimestamp += fixed_bufferduration; fixed_buffertimestamp += fixed_bufferduration;
int g_fd_dump = open("/hdd/lpcm/ffmpeg.pes", O_CREAT | int g_fd_dump = open("/hdd/lpcm/ffmpeg.pes", O_CREAT | O_RDWR | O_APPEND, S_IRUSR | S_IWUSR);
O_RDWR | O_APPEND, S_IRUSR | S_IWUSR);
writev_with_retry(g_fd_dump, iov, 2); writev_with_retry(g_fd_dump, iov, 2);
close(g_fd_dump); close(g_fd_dump);
} }

5
libeplayer3-arm/output/writer/mipsel/vc1.c
View File

@@ -100,6 +100,7 @@ static video_codec_data_t videocodecdata = {0, 0};
/* ***************************** */ /* ***************************** */
/* MISC Functions */ /* MISC Functions */
/* ***************************** */ /* ***************************** */
static int reset() static int reset()
{ {
initialHeader = 1; initialHeader = 1;
@@ -153,8 +154,8 @@ static int writeData(void *_call)
} }
} }
uint8_t needFrameStartCode = 0; uint8_t needFrameStartCode = 0;
if (sizeof(Vc1FrameStartCode) >= call->len if (sizeof(Vc1FrameStartCode) >= call->len ||
|| memcmp(call->data, Vc1FrameStartCode, sizeof(Vc1FrameStartCode)) != 0) memcmp(call->data, Vc1FrameStartCode, sizeof(Vc1FrameStartCode)) != 0)
{ {
needFrameStartCode = 1; needFrameStartCode = 1;
PacketLength += sizeof(Vc1FrameStartCode); PacketLength += sizeof(Vc1FrameStartCode);

5
libeplayer3-arm/output/writer/mipsel/wmv.c
View File

@@ -98,6 +98,7 @@ static video_codec_data_t videocodecdata = {0, 0};
/* ***************************** */ /* ***************************** */
/* MISC Functions */ /* MISC Functions */
/* ***************************** */ /* ***************************** */
static int reset() static int reset()
{ {
initialHeader = 1; initialHeader = 1;
@@ -159,8 +160,8 @@ static int writeData(void *_call)
} }
} }
uint8_t needFrameStartCode = 0; uint8_t needFrameStartCode = 0;
if (sizeof(Vc1FrameStartCode) >= call->len if (sizeof(Vc1FrameStartCode) >= call->len ||
|| memcmp(call->data, Vc1FrameStartCode, sizeof(Vc1FrameStartCode)) != 0) memcmp(call->data, Vc1FrameStartCode, sizeof(Vc1FrameStartCode)) != 0)
{ {
needFrameStartCode = 1; needFrameStartCode = 1;
PacketLength += sizeof(Vc1FrameStartCode); PacketLength += sizeof(Vc1FrameStartCode);

1
libeplayer3-arm/output/writer/mipsel/writer.c
View File

@@ -99,6 +99,7 @@ static Writer_t *AvailableWriter[] =
/* ***************************** */ /* ***************************** */
/* Functions */ /* Functions */
/* ***************************** */ /* ***************************** */
ssize_t write_with_retry(int fd, const void *buf, size_t size) ssize_t write_with_retry(int fd, const void *buf, size_t size)
{ {
ssize_t ret; ssize_t ret;

1
libeplayer3-arm/output/writer/sh4/h264.c
View File

@@ -52,6 +52,7 @@
/* ***************************** */ /* ***************************** */
/* Makros/Constants */ /* Makros/Constants */
/* ***************************** */ /* ***************************** */
#ifdef SAM_WITH_DEBUG #ifdef SAM_WITH_DEBUG
#define H264_DEBUG #define H264_DEBUG
#else #else

2
libeplayer3-arm/output/writer/sh4/vc1.c
View File

@@ -103,7 +103,7 @@ static const unsigned char Metadata[] =
}; };
/* ***************************** */ /* ***************************** */
/* Varaibles */ /* Variables */
/* ***************************** */ /* ***************************** */
static int initialHeader = 1; static int initialHeader = 1;

3
libeplayer3-arm/output/writer/sh4/wmv.c
View File

@@ -207,8 +207,7 @@ static int writeData(void *_call)
{ {
unsigned int PesLength; unsigned int PesLength;
unsigned int PrivateHeaderLength; unsigned int PrivateHeaderLength;
PrivateHeaderLength = InsertVideoPrivateDataHeader(&PesHeader[HeaderLength], PrivateHeaderLength = InsertVideoPrivateDataHeader(&PesHeader[HeaderLength], call->len);
call->len);
/* Update PesLength */ /* Update PesLength */
PesLength = PesHeader[PES_LENGTH_BYTE_0] + PesLength = PesHeader[PES_LENGTH_BYTE_0] +
(PesHeader[PES_LENGTH_BYTE_1] << 8) + PrivateHeaderLength; (PesHeader[PES_LENGTH_BYTE_1] << 8) + PrivateHeaderLength;

9
libeplayer3-arm/playback/playback.c
View File

@@ -175,9 +175,9 @@ static int PlaybackOpen(Context_t *context, PlayFiles_t *pFiles)
return cERR_PLAYBACK_ERROR; return cERR_PLAYBACK_ERROR;
} }
pFiles->szFirstFile = context->playback->uri; pFiles->szFirstFile = context->playback->uri;
if ((context->container->Command(context, CONTAINER_ADD, extension) < 0) if ((context->container->Command(context, CONTAINER_ADD, extension) < 0) ||
|| (!context->container->selectedContainer) (!context->container->selectedContainer) ||
|| (context->container->selectedContainer->Command(context, CONTAINER_INIT, pFiles) < 0)) (context->container->selectedContainer->Command(context, CONTAINER_INIT, pFiles) < 0))
{ {
playback_err("CONTAINER_ADD failed\n"); playback_err("CONTAINER_ADD failed\n");
return cERR_PLAYBACK_ERROR; return cERR_PLAYBACK_ERROR;
@@ -440,7 +440,8 @@ static int PlaybackFastBackward(Context_t *context, int *speed)
int32_t ret = cERR_PLAYBACK_NO_ERROR; int32_t ret = cERR_PLAYBACK_NO_ERROR;
playback_printf(10, "speed = %d\n", *speed); playback_printf(10, "speed = %d\n", *speed);
/* Audio only reverse play not supported */ /* Audio only reverse play not supported */
if (context->playback->isVideo && !context->playback->isForwarding && (!context->playback->isPaused || context->playback->isPlaying)) if (context->playback->isVideo && !context->playback->isForwarding &&
(!context->playback->isPaused || context->playback->isPlaying))
{ {
if ((*speed > 0) || (*speed < cMaxSpeed_fr)) if ((*speed > 0) || (*speed < cMaxSpeed_fr))
{ {