From 0fc91c1479b898178f9d91c1aaea3611a8d0d30a Mon Sep 17 00:00:00 2001 From: martii Date: Fri, 21 Mar 2014 23:27:37 +0100 Subject: [PATCH] cleanup Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c3278d9c3eed7992435e67a48f0d52a52855789b Author: martii Date: 2014-03-21 (Fri, 21 Mar 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- generic-pc/playback.h | 1 - libeplayer3/include/aac.h | 27 +++++++++++++-------------- libeplayer3/include/misc.h | 4 ---- libeplayer3/include/output.h | 5 ----- libeplayer3/include/playback.h | 5 +---- libeplayer3/include/writer.h | 2 -- libeplayer3/output/writer/writer.c | 19 ------------------- libeplayer3/playback/playback.c | 11 ----------- libspark/playback_libeplayer3.cpp | 10 ---------- libspark/playback_libeplayer3.h | 1 - 10 files changed, 14 insertions(+), 71 deletions(-) diff --git a/generic-pc/playback.h b/generic-pc/playback.h index 7690144..b3d8d0d 100644 --- a/generic-pc/playback.h +++ b/generic-pc/playback.h @@ -45,7 +45,6 @@ class cPlayback void GetChapters(std::vector &positions, std::vector &titles); void GetMetadata(std::vector &keys, std::vector &values); // - cPlayback(int num = 0); ~cPlayback(); }; diff --git a/libeplayer3/include/aac.h b/libeplayer3/include/aac.h index ce4f85e..5d8a572 100644 --- a/libeplayer3/include/aac.h +++ b/libeplayer3/include/aac.h @@ -26,32 +26,31 @@ static inline int aac_get_sample_rate_index(uint32_t sample_rate) { if (96000 <= sample_rate) return 0; - else if (88200 <= sample_rate) + if (88200 <= sample_rate) return 1; - else if (64000 <= sample_rate) + if (64000 <= sample_rate) return 2; - else if (48000 <= sample_rate) + if (48000 <= sample_rate) return 3; - else if (44100 <= sample_rate) + if (44100 <= sample_rate) return 4; - else if (32000 <= sample_rate) + if (32000 <= sample_rate) return 5; - else if (24000 <= sample_rate) + if (24000 <= sample_rate) return 6; - else if (22050 <= sample_rate) + if (22050 <= sample_rate) return 7; - else if (16000 <= sample_rate) + if (16000 <= sample_rate) return 8; - else if (12000 <= sample_rate) + if (12000 <= sample_rate) return 9; - else if (11025 <= sample_rate) + if (11025 <= sample_rate) return 10; - else if (8000 <= sample_rate) + if (8000 <= sample_rate) return 11; - else if (7350 <= sample_rate) + if (7350 <= sample_rate) return 12; - else - return 13; + return 13; } #endif diff --git a/libeplayer3/include/misc.h b/libeplayer3/include/misc.h index 0235229..c1d868c 100644 --- a/libeplayer3/include/misc.h +++ b/libeplayer3/include/misc.h @@ -21,10 +21,6 @@ typedef struct BitPacker_s { #define INVALID_PTS_VALUE 0x200000000ull -/* subtitle hacks ->for file subtitles */ -#define TEXTSRTOFFSET 100 -#define TEXTSSAOFFSET 200 - /* ***************************** */ /* Prototypes */ /* ***************************** */ diff --git a/libeplayer3/include/output.h b/libeplayer3/include/output.h index 098db39..53e8684 100644 --- a/libeplayer3/include/output.h +++ b/libeplayer3/include/output.h @@ -25,11 +25,6 @@ typedef enum { OUTPUT_REVERSE, OUTPUT_DISCONTINUITY_REVERSE, OUTPUT_GET_FRAME_COUNT, -/* fixme: e2 */ - OUTPUT_SUBTITLE_REGISTER_FUNCTION = 222, - OUTPUT_SUBTITLE_REGISTER_BUFFER = 223, - OUTPUT_GET_SUBTITLE_OUTPUT, - OUTPUT_SET_SUBTITLE_OUTPUT } OutputCmd_t; typedef struct { diff --git a/libeplayer3/include/playback.h b/libeplayer3/include/playback.h index 1bfeec9..53c44b6 100644 --- a/libeplayer3/include/playback.h +++ b/libeplayer3/include/playback.h @@ -8,9 +8,7 @@ typedef enum { PLAYBACK_OPEN, PLAYBACK_CLOSE, PLAYBACK_PLAY, PLAYBACK_STOP, PLAYBACK_PTS, PLAYBACK_LENGTH, PLAYBACK_SWITCH_AUDIO, PLAYBACK_SWITCH_SUBTITLE, PLAYBACK_INFO, PLAYBACK_METADATA, PLAYBACK_SLOWMOTION, PLAYBACK_FASTBACKWARD, PLAYBACK_GET_FRAME_COUNT, - PLAYBACK_SWITCH_TELETEXT, PLAYBACK_SWITCH_DVBSUBTITLE, - PLAYBACK_FRAMEBUFFER_LOCK, - PLAYBACK_FRAMEBUFFER_UNLOCK + PLAYBACK_SWITCH_TELETEXT } PlaybackCmd_t; typedef struct PlaybackHandler_s { @@ -37,7 +35,6 @@ typedef struct PlaybackHandler_s { unsigned char isSubtitle; unsigned char isDvbSubtitle; unsigned char isTeletext; - unsigned char mayWriteToFramebuffer; unsigned char abortRequested; unsigned char abortPlayback; diff --git a/libeplayer3/include/writer.h b/libeplayer3/include/writer.h index d80524c..4e71654 100644 --- a/libeplayer3/include/writer.h +++ b/libeplayer3/include/writer.h @@ -58,12 +58,10 @@ extern Writer_t WriterVideoH263; extern Writer_t WriterVideoFLV; extern Writer_t WriterVideoVC1; extern Writer_t WriterPipe; -extern Writer_t WriterDVBSubtitle; Writer_t *getWriter(char *encoding); Writer_t *getDefaultVideoWriter(); Writer_t *getDefaultAudioWriter(); -Writer_t *getDefaultFramebufferWriter(); #endif diff --git a/libeplayer3/output/writer/writer.c b/libeplayer3/output/writer/writer.c index 4b98557..67bf891 100644 --- a/libeplayer3/output/writer/writer.c +++ b/libeplayer3/output/writer/writer.c @@ -144,22 +144,3 @@ Writer_t *getDefaultAudioWriter() return NULL; } - -Writer_t *getDefaultFramebufferWriter() -{ - int i; - - for (i = 0; AvailableWriter[i] != NULL; i++) { - writer_printf(10, "%s\n", AvailableWriter[i]->caps->textEncoding); - if (strcmp(AvailableWriter[i]->caps->textEncoding, "framebuffer") - == 0) { - writer_printf(50, "%s: found writer \"%s\"\n", __func__, - AvailableWriter[i]->caps->name); - return AvailableWriter[i]; - } - } - - writer_printf(1, "%s: no writer found\n", __func__); - - return NULL; -} diff --git a/libeplayer3/playback/playback.c b/libeplayer3/playback/playback.c index 5c8cdd0..3d92379 100644 --- a/libeplayer3/playback/playback.c +++ b/libeplayer3/playback/playback.c @@ -864,16 +864,6 @@ static int Command(void *_context, PlaybackCmd_t command, void *argument) ret = PlaybackSwitchTeletext(context, (int *) argument); break; } - case PLAYBACK_FRAMEBUFFER_LOCK:{ - context->playback->mayWriteToFramebuffer = 0; - ret = cERR_PLAYBACK_NO_ERROR; - break; - } - case PLAYBACK_FRAMEBUFFER_UNLOCK:{ - context->playback->mayWriteToFramebuffer = 1; - ret = cERR_PLAYBACK_NO_ERROR; - break; - } default: playback_err("PlaybackCmd %d not supported!\n", command); ret = cERR_PLAYBACK_ERROR; @@ -905,7 +895,6 @@ PlaybackHandler_t PlaybackHandler = { 0, 0, 0, - 1, 0, 0, &Command, diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index 7aa9bd9..ba720c8 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -688,16 +688,6 @@ cPlayback::~cPlayback() printf("%s:%s\n", FILENAME, __FUNCTION__); } -void cPlayback::SuspendSubtitle(bool b) -{ - if (player && player->playback) { - if (b) - player->playback->Command(player, PLAYBACK_FRAMEBUFFER_LOCK, 0); - else - player->playback->Command(player, PLAYBACK_FRAMEBUFFER_UNLOCK, 0); - } -} - void cPlayback::RequestAbort() { if (player && player->playback) { player->playback->abortRequested = 1; diff --git a/libspark/playback_libeplayer3.h b/libspark/playback_libeplayer3.h index b34500f..ec60d90 100644 --- a/libspark/playback_libeplayer3.h +++ b/libspark/playback_libeplayer3.h @@ -33,7 +33,6 @@ class cPlayback int GetAPid(void) { return mAudioStream; } int GetSubtitlePid(void) { return mSubtitleStream; } int GetTeletextPid(void); - void SuspendSubtitle(bool); bool SetSpeed(int speed); bool GetSpeed(int &speed) const; bool GetPosition(int &position, int &duration);