mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

test aac

Browse Source 
Origin commit data
------------------
Branch: master
Commit: e860372343
Author: max_10 <max_10@gmx.de>
Date: 2014-11-24 (Mon, 24 Nov 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2014-11-24 11:27:53 +01:00
parent 908ce0a6d3
commit fbb9ec6a2a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libeplayer3/input.cpp
View File

@@ -64,10 +64,9 @@ int64_t Input::calcPts(AVStream * stream, int64_t pts)
return INVALID_PTS_VALUE; return INVALID_PTS_VALUE;
pts = av_rescale(90000ll * stream->time_base.num, pts, stream->time_base.den); pts = av_rescale(90000ll * stream->time_base.num, pts, stream->time_base.den);
#if 0
if (avfc->start_time != AV_NOPTS_VALUE) if (avfc->start_time != AV_NOPTS_VALUE)
pts -= av_rescale(90000ll, avfc->start_time, AV_TIME_BASE); pts -= av_rescale(90000ll, avfc->start_time, AV_TIME_BASE);
#endif
if (pts < 0) if (pts < 0)
return INVALID_PTS_VALUE; return INVALID_PTS_VALUE;
@@ -373,6 +372,7 @@ bool Input::ReadSubtitles(const char *filename) {
bool Input::Init(const char *filename) bool Input::Init(const char *filename)
{ {
bool find_info = true;
abortPlayback = false; abortPlayback = false;
av_lockmgr_register(lock_callback); av_lockmgr_register(lock_callback);
#if ENABLE_LOGGING #if ENABLE_LOGGING
@@ -418,7 +418,14 @@ again:
avfc->probesize = 131072; avfc->probesize = 131072;
} }
for (int i = 0; i < avfc->nb_streams; i++) {
if (avfc->streams[i]->codec->codec_id == AV_CODEC_ID_AAC)
find_info = false;
}
if (find_info)
err = avformat_find_stream_info(avfc, NULL); err = avformat_find_stream_info(avfc, NULL);
#if 0
if (averror(err, avformat_find_stream_info)) { if (averror(err, avformat_find_stream_info)) {
avformat_close_input(&avfc); avformat_close_input(&avfc);
if (player->noprobe) { if (player->noprobe) {
@@ -427,6 +434,7 @@ again:
} }
return false; return false;
} }
#endif
bool res = UpdateTracks(); bool res = UpdateTracks();
@@ -658,6 +666,7 @@ bool Input::GetMetadata(std::vector<std::string> &keys, std::vector<std::string>
if (avfc) { if (avfc) {
AVDictionaryEntry *tag = NULL; AVDictionaryEntry *tag = NULL;
if (avfc->metadata) if (avfc->metadata)
while ((tag = av_dict_get(avfc->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) { while ((tag = av_dict_get(avfc->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
keys.push_back(tag->key); keys.push_back(tag->key);